January 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r3990 - ac3/ac3_decoder.c dvbmuxer/mpegenc.c dvbmuxer/mpegtsenc.c eac3/ac3dec.c mxf/mxf.c mxf/mxf.h mxf/mxfdec.c
by diego 19 Jan '09

19 Jan '09

Author: diego Date: Mon Jan 19 16:55:47 2009 New Revision: 3990 Log: cosmetics: Remove pointless period after copyright statement non-sentences. Modified: ac3/ac3_decoder.c dvbmuxer/mpegenc.c dvbmuxer/mpegtsenc.c eac3/ac3dec.c mxf/mxf.c mxf/mxf.h mxf/mxfdec.c Modified: ac3/ac3_decoder.c ============================================================================== --- ac3/ac3_decoder.c Sat Jan 17 20:10:23 2009 (r3989) +++ ac3/ac3_decoder.c Mon Jan 19 16:55:47 2009 (r3990) @@ -13,7 +13,7 @@ * * Thanks Makoto Matsumoto and Takuji Nishimura for the Mersenne Twister. * - * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com). + * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com) * Something is wrong up on cloud # 9! * * This file is part of FFmpeg. Modified: dvbmuxer/mpegenc.c ============================================================================== --- dvbmuxer/mpegenc.c Sat Jan 17 20:10:23 2009 (r3989) +++ dvbmuxer/mpegenc.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MPEG1/2 muxer - * Copyright (c) 2000, 2001, 2002 Fabrice Bellard. + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard * * This file is part of FFmpeg. * Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c Sat Jan 17 20:10:23 2009 (r3989) +++ dvbmuxer/mpegtsenc.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MPEG2 transport stream (aka DVB) muxer - * Copyright (c) 2003 Fabrice Bellard. + * Copyright (c) 2003 Fabrice Bellard * * This file is part of FFmpeg. * Modified: eac3/ac3dec.c ============================================================================== --- eac3/ac3dec.c Sat Jan 17 20:10:23 2009 (r3989) +++ eac3/ac3dec.c Mon Jan 19 16:55:47 2009 (r3990) @@ -3,7 +3,7 @@ * This code was developed as part of Google Summer of Code 2006. * E-AC-3 support was added as part of Google Summer of Code 2007. * - * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com). + * Copyright (c) 2006 Kartikey Mahendra BHATT (bhattkm at gmail dot com) * Copyright (c) 2007-2008 Bartlomiej Wolowiec <bartek.wolowiec(a)gmail.com> * Copyright (c) 2007 Justin Ruggles <justin.ruggles(a)gmail.com> * Modified: mxf/mxf.c ============================================================================== --- mxf/mxf.c Sat Jan 17 20:10:23 2009 (r3989) +++ mxf/mxf.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MXF - * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>. + * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * * This file is part of FFmpeg. * Modified: mxf/mxf.h ============================================================================== --- mxf/mxf.h Sat Jan 17 20:10:23 2009 (r3989) +++ mxf/mxf.h Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MXF - * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>. + * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * * This file is part of FFmpeg. * Modified: mxf/mxfdec.c ============================================================================== --- mxf/mxfdec.c Sat Jan 17 20:10:23 2009 (r3989) +++ mxf/mxfdec.c Mon Jan 19 16:55:47 2009 (r3990) @@ -1,6 +1,6 @@ /* * MXF demuxer. - * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>. + * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * * This file is part of FFmpeg. *

1 0

[soc]: r3989 - in wmapro: wma3data.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 20:10:23 2009 New Revision: 3989 Log: use FF_WMA3_HUFF_VECi_SIZE defines instead of hardcoded numbers Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 19:43:47 2009 (r3988) +++ wmapro/wma3data.h Sat Jan 17 20:10:23 2009 (r3989) @@ -534,7 +534,7 @@ static const uint8_t ff_wma3_vec1_huffbi }; -static const uint16_t ff_wma3_symbol_to_vec4[] = { +static const uint16_t ff_wma3_symbol_to_vec4[FF_WMA3_HUFF_VEC4_SIZE] = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 32, 33, 34, 35, 48, 49, 50, 64, 65, 80, 256, 257, 258, 259, 260, 272, 273, 274, 275, @@ -547,11 +547,11 @@ static const uint16_t ff_wma3_symbol_to_ 5120, 8192, 8193, 8194, 8195, 8208, 8209, 8210, 8224, 8225, 8240, 8448, 8449, 8450, 8464, 8465, 8480, 8704, 8705, 8720, 8960, 12288, 12289, 12290, 12304, 12305, 12320, 12544, 12545, 12560, - 12800, 16384, 16385, 16400, 16640, 20480, 0, 0, + 12800, 16384, 16385, 16400, 16640, 20480, 0, }; -static const uint8_t ff_wma3_symbol_to_vec2[] = { +static const uint8_t ff_wma3_symbol_to_vec2[FF_WMA3_HUFF_VEC2_SIZE] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, @@ -561,8 +561,7 @@ static const uint8_t ff_wma3_symbol_to_v 105, 112, 113, 114, 115, 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133, 134, 135, 144, 145, 146, 147, 148, 149, 150, 160, 161, 162, 163, 164, 165, 176, 177, 178, 179, 180, 192, 193, 194, 195, 208, 209, 210, 224, 225, - 240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 240, 0, }; /** @} */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 19:43:47 2009 (r3988) +++ wmapro/wma3dec.c Sat Jan 17 20:10:23 2009 (r3989) @@ -742,16 +742,16 @@ static inline void wma_get_vec4(WMA3Deco idx = get_vlc2(s->getbit, s->vec4_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC4_MAXBITS+VLCBITS-1)/VLCBITS)); - if ( idx == 126 ) + if ( idx == FF_WMA3_HUFF_VEC4_SIZE - 1 ) { while(i < 4){ idx = get_vlc2(s->getbit, s->vec2_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC2_MAXBITS+VLCBITS-1)/VLCBITS)); - if ( idx == 136 ){ + if ( idx == FF_WMA3_HUFF_VEC2_SIZE - 1 ){ vals[i] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS)); - if(vals[i] == 100) + if(vals[i] == FF_WMA3_HUFF_VEC1_SIZE - 1) vals[i] += wma_get_large_val(s); vals[i+1] = get_vlc2(s->getbit, s->vec1_vlc.table, VLCBITS, ((FF_WMA3_HUFF_VEC1_MAXBITS+VLCBITS-1)/VLCBITS)); - if(vals[i+1] == 100) + if(vals[i+1] == FF_WMA3_HUFF_VEC1_SIZE - 1) vals[i+1] += wma_get_large_val(s); }else{ vals[i] = (ff_wma3_symbol_to_vec2[idx] >> 4) & 0xF;

1 0

[soc]: r3988 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:43:47 2009 New Revision: 3988 Log: reorganized WMA3ChannelGroup and WMA3ChannelCtx a bit Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:23:14 2009 (r3987) +++ wmapro/wma3.h Sat Jan 17 19:43:47 2009 (r3988) @@ -37,48 +37,46 @@ #define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) /** - *@brief decoder context for a single channel + * @brief decoder context for a single channel */ typedef struct { - int prev_block_len; - uint8_t transmit_coefs; - uint8_t num_subframes; //< number of subframes for the current channel - uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples - uint16_t subframe_offset[MAX_SUBFRAMES]; - uint16_t channel_len; //< channel len in samples - uint16_t decoded_samples; //< number of samples that have been processed already - uint8_t cur_subframe; - uint8_t grouped; //< true if the channel is contained in a channel group - - DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< MAX_COEF - - int scale_factors[MAX_BANDS]; //< initial scale factor values - int resampled_scale_factors[MAX_BANDS]; //< resampled scale factors from the previous block - //< can be used in case no new scale factors are transmitted - - int reuse_sf; //< reuse scale factors from a previous subframe - int transmit_sf; - int scale_factor_step; - int quant_step_modifier; - int max_scale_factor; - int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted - DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); - + int prev_block_len; //< length of the previous block + uint8_t transmit_coefs; //< transmit coefficients + uint8_t num_subframes; //< number of subframes + uint16_t subframe_len[MAX_SUBFRAMES]; //< subframe len in samples + uint16_t subframe_offset[MAX_SUBFRAMES]; //< subframe position + uint8_t cur_subframe; //< subframe index + uint16_t channel_len; //< channel len in samples + uint16_t decoded_samples; //< already processed samples + uint8_t grouped; //< channel is part of a group + int quant_step_modifier; + int transmit_sf; //< transmit scale factors + int reuse_sf; //< share sfs between subframes + int scale_factor_step; //< scaling step + int max_scale_factor; //< maximum scale factor + int scale_factors[MAX_BANDS]; //< scale factor values + int resampled_scale_factors[MAX_BANDS]; //< scale factors from a previous block + int scale_factor_block_len; //< sf reference block len + DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< decode buffer + DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); //< output buffer } WMA3ChannelCtx; +/** + * @brief channel group for channel transformations + */ typedef struct { - int nb_channels; - int no_rotation; //< controls the type of the transform - int transform; //< also controls the type of the transform - char transform_band[MAX_BANDS]; //< controls if the transform is enabled for a certain band - char rotation_offset[MAX_CHANNELS * MAX_CHANNELS]; - char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? + int nb_channels; + int no_rotation; //< controls the type of the transform + int transform; //< also controls the type of the transform + char transform_band[MAX_BANDS]; //< controls if the transform is enabled for a certain band + char rotation_offset[MAX_CHANNELS * MAX_CHANNELS]; + char positive[MAX_CHANNELS * MAX_CHANNELS]; //< fixme for what are these numbers used? float decorrelation_matrix[MAX_CHANNELS*MAX_CHANNELS]; - char use_channel[MAX_CHANNELS]; + char use_channel[MAX_CHANNELS]; } WMA3ChannelGroup; /** - *@brief main decoder context + * @brief main decoder context */ typedef struct WMA3DecodeContext { /** generic decoder variables */

1 0

[soc]: r3987 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:23:14 2009 New Revision: 3987 Log: fixed comment Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:21:26 2009 (r3986) +++ wmapro/wma3.h Sat Jan 17 19:23:14 2009 (r3987) @@ -30,7 +30,7 @@ #define MAX_SUBFRAMES 32 //< max number of subframes per channel #define MAX_BANDS 29 //< max number of scale factor bands -/* size of blocks defines taken from wma.h*/ +/* size of block defines taken from wma.h*/ #define BLOCK_MIN_BITS 7 #define BLOCK_MAX_BITS 12 #define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS)

1 0

[soc]: r3986 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:21:26 2009 New Revision: 3986 Log: use BLOCK_MAX_SIZE for the buffer declarations Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:19:09 2009 (r3985) +++ wmapro/wma3.h Sat Jan 17 19:21:26 2009 (r3986) @@ -50,7 +50,7 @@ typedef struct { uint8_t cur_subframe; uint8_t grouped; //< true if the channel is contained in a channel group - DECLARE_ALIGNED_16(float, coeffs[4096]); //< MAX_COEF + DECLARE_ALIGNED_16(float, coeffs[BLOCK_MAX_SIZE]); //< MAX_COEF int scale_factors[MAX_BANDS]; //< initial scale factor values int resampled_scale_factors[MAX_BANDS]; //< resampled scale factors from the previous block @@ -62,7 +62,7 @@ typedef struct { int quant_step_modifier; int max_scale_factor; int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted - DECLARE_ALIGNED_16(float, out[8192]); + DECLARE_ALIGNED_16(float, out[2*BLOCK_MAX_SIZE]); } WMA3ChannelCtx;

1 0

[soc]: r3985 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:19:09 2009 New Revision: 3985 Log: moved VLCBITS and SCALEVLCBITS to wma3dec.c Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:17:47 2009 (r3984) +++ wmapro/wma3.h Sat Jan 17 19:19:09 2009 (r3985) @@ -30,9 +30,6 @@ #define MAX_SUBFRAMES 32 //< max number of subframes per channel #define MAX_BANDS 29 //< max number of scale factor bands -#define VLCBITS 9 -#define SCALEVLCBITS 8 - /* size of blocks defines taken from wma.h*/ #define BLOCK_MIN_BITS 7 #define BLOCK_MAX_BITS 12 Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 19:17:47 2009 (r3984) +++ wmapro/wma3dec.c Sat Jan 17 19:19:09 2009 (r3985) @@ -26,6 +26,10 @@ #undef NDEBUG #include <assert.h> +#define VLCBITS 9 +#define SCALEVLCBITS 8 + + unsigned int bitstreamcounter; /**

1 0

[soc]: r3984 - wmapro/wma3.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:17:47 2009 New Revision: 3984 Log: aligned the defines Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 19:11:52 2009 (r3983) +++ wmapro/wma3.h Sat Jan 17 19:17:47 2009 (r3984) @@ -26,18 +26,18 @@ #include "wma3data.h" #include "dsputil.h" -#define MAX_CHANNELS 8 //< max number of handled channels -#define MAX_SUBFRAMES 32 //< max number of subframes per channel -#define MAX_BANDS 29 //< max number of scale factor bands -#define VLCBITS 9 +#define MAX_CHANNELS 8 //< max number of handled channels +#define MAX_SUBFRAMES 32 //< max number of subframes per channel +#define MAX_BANDS 29 //< max number of scale factor bands -#define SCALEVLCBITS 8 +#define VLCBITS 9 +#define SCALEVLCBITS 8 /* size of blocks defines taken from wma.h*/ -#define BLOCK_MIN_BITS 7 -#define BLOCK_MAX_BITS 12 -#define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS) -#define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) +#define BLOCK_MIN_BITS 7 +#define BLOCK_MAX_BITS 12 +#define BLOCK_MAX_SIZE (1 << BLOCK_MAX_BITS) +#define BLOCK_NB_SIZES (BLOCK_MAX_BITS - BLOCK_MIN_BITS + 1) /** *@brief decoder context for a single channel

1 0

[soc]: r3983 - wmapro/wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 19:11:52 2009 New Revision: 3983 Log: catch out of memory errors during default decorrelation matrix setup Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:49:46 2009 (r3982) +++ wmapro/wma3dec.c Sat Jan 17 19:11:52 2009 (r3983) @@ -328,13 +328,23 @@ static av_cold int wma3_decode_init(AVCo s->subwoofer_cutoff = s->subwoofer_cutoffs[0]; - //FIXME - /** init stuff for the postprocxform */ + /** set up decorrelation matrices */ s->def_decorrelation_mat = av_mallocz(sizeof(int) * (s->nb_channels + 1)); + if(!s->def_decorrelation_mat){ + av_log(avctx, AV_LOG_ERROR, "failed to allocate decorrelation matrix\n"); + wma3_decode_end(avctx); + return -1; + } + s->def_decorrelation_mat[0] = 0; for(i=1;i<=s->nb_channels;i++){ const float* tab = ff_wma3_default_decorrelation_matrices; s->def_decorrelation_mat[i] = av_mallocz(sizeof(float) * i); + if(!s->def_decorrelation_mat[i]){ + av_log(avctx, AV_LOG_ERROR, "failed to setup decorrelation mat\n"); + wma3_decode_end(avctx); + return -1; + } switch(i){ case 1: s->def_decorrelation_mat[i][0] = &tab[0];

1 0

[soc]: r3982 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:49:46 2009 New Revision: 3982 Log: renamed default_decorrelation_matrix to def_decorrelation_mat Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:39:51 2009 (r3981) +++ wmapro/wma3.h Sat Jan 17 18:49:46 2009 (r3982) @@ -107,7 +107,7 @@ typedef struct WMA3DecodeContext { uint16_t log2_frame_size; //< frame size int8_t nb_channels; //< number of channels int8_t lfe_channel; //< lfe channel index - const float*** default_decorrelation_matrix; + const float*** def_decorrelation_mat; //< default decorrelation matrix uint8_t allow_subframes; //< frames may contain subframes uint8_t max_num_subframes; //< maximum number of subframes int8_t num_possible_block_sizes; //< nb of supported block sizes Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:39:51 2009 (r3981) +++ wmapro/wma3dec.c Sat Jan 17 18:49:46 2009 (r3982) @@ -102,10 +102,10 @@ static av_cold int wma3_decode_end(AVCod av_free(s->subwoofer_cutoffs); av_free(s->sf_offsets); - if(s->default_decorrelation_matrix){ + if(s->def_decorrelation_mat){ for(i=1;i<=s->nb_channels;i++) - av_free(s->default_decorrelation_matrix[i]); - av_free(s->default_decorrelation_matrix); + av_free(s->def_decorrelation_mat[i]); + av_free(s->def_decorrelation_mat); } free_vlc(&s->sf_vlc); @@ -330,44 +330,44 @@ static av_cold int wma3_decode_init(AVCo //FIXME /** init stuff for the postprocxform */ - s->default_decorrelation_matrix = av_mallocz(sizeof(int) * (s->nb_channels + 1)); - s->default_decorrelation_matrix[0] = 0; + s->def_decorrelation_mat = av_mallocz(sizeof(int) * (s->nb_channels + 1)); + s->def_decorrelation_mat[0] = 0; for(i=1;i<=s->nb_channels;i++){ const float* tab = ff_wma3_default_decorrelation_matrices; - s->default_decorrelation_matrix[i] = av_mallocz(sizeof(float) * i); + s->def_decorrelation_mat[i] = av_mallocz(sizeof(float) * i); switch(i){ case 1: - s->default_decorrelation_matrix[i][0] = &tab[0]; + s->def_decorrelation_mat[i][0] = &tab[0]; break; case 2: - s->default_decorrelation_matrix[i][0] = &tab[1]; - s->default_decorrelation_matrix[i][1] = &tab[3]; + s->def_decorrelation_mat[i][0] = &tab[1]; + s->def_decorrelation_mat[i][1] = &tab[3]; break; case 3: - s->default_decorrelation_matrix[i][0] = &tab[5]; - s->default_decorrelation_matrix[i][1] = &tab[8]; - s->default_decorrelation_matrix[i][2] = &tab[11]; + s->def_decorrelation_mat[i][0] = &tab[5]; + s->def_decorrelation_mat[i][1] = &tab[8]; + s->def_decorrelation_mat[i][2] = &tab[11]; break; case 4: - s->default_decorrelation_matrix[i][0] = &tab[14]; - s->default_decorrelation_matrix[i][1] = &tab[18]; - s->default_decorrelation_matrix[i][2] = &tab[22]; - s->default_decorrelation_matrix[i][3] = &tab[26]; + s->def_decorrelation_mat[i][0] = &tab[14]; + s->def_decorrelation_mat[i][1] = &tab[18]; + s->def_decorrelation_mat[i][2] = &tab[22]; + s->def_decorrelation_mat[i][3] = &tab[26]; break; case 5: - s->default_decorrelation_matrix[i][0] = &tab[30]; - s->default_decorrelation_matrix[i][1] = &tab[35]; - s->default_decorrelation_matrix[i][2] = &tab[40]; - s->default_decorrelation_matrix[i][3] = &tab[45]; - s->default_decorrelation_matrix[i][4] = &tab[50]; + s->def_decorrelation_mat[i][0] = &tab[30]; + s->def_decorrelation_mat[i][1] = &tab[35]; + s->def_decorrelation_mat[i][2] = &tab[40]; + s->def_decorrelation_mat[i][3] = &tab[45]; + s->def_decorrelation_mat[i][4] = &tab[50]; break; case 6: - s->default_decorrelation_matrix[i][0] = &tab[55]; - s->default_decorrelation_matrix[i][1] = &tab[61]; - s->default_decorrelation_matrix[i][2] = &tab[67]; - s->default_decorrelation_matrix[i][3] = &tab[73]; - s->default_decorrelation_matrix[i][4] = &tab[79]; - s->default_decorrelation_matrix[i][5] = &tab[85]; + s->def_decorrelation_mat[i][0] = &tab[55]; + s->def_decorrelation_mat[i][1] = &tab[61]; + s->def_decorrelation_mat[i][2] = &tab[67]; + s->def_decorrelation_mat[i][3] = &tab[73]; + s->def_decorrelation_mat[i][4] = &tab[79]; + s->def_decorrelation_mat[i][5] = &tab[85]; break; } } @@ -653,7 +653,7 @@ static int wma_decode_channel_transform( for(x = 0; x < chgroup->nb_channels ; x++){ int y; for(y=0;y< chgroup->nb_channels ;y++){ - chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = s->default_decorrelation_matrix[chgroup->nb_channels][x][y]; + chgroup->decorrelation_matrix[y + x * chgroup->nb_channels] = s->def_decorrelation_mat[chgroup->nb_channels][x][y]; } } }

1 0

[soc]: r3981 - in wmapro: wma3.h wma3dec.c
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:39:51 2009 New Revision: 3981 Log: renamed bitreservoir buffer and size so that it is clear that it contains packet data Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:32:06 2009 (r3980) +++ wmapro/wma3.h Sat Jan 17 18:39:51 2009 (r3981) @@ -119,8 +119,8 @@ typedef struct WMA3DecodeContext { /** packet decode state */ uint8_t packet_sequence_number; //< current packet number - int prev_frame_bit_size; //< saved number of bits - uint8_t* prev_frame; //< prev frame data + int prev_packet_bit_size; //< saved number of bits + uint8_t* prev_packet_data; //< prev frame data uint8_t bit5; //< padding bit? (CBR files) uint8_t bit6; uint8_t packet_loss; //< set in case of bitstream error Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:32:06 2009 (r3980) +++ wmapro/wma3dec.c Sat Jan 17 18:39:51 2009 (r3981) @@ -96,7 +96,7 @@ static av_cold int wma3_decode_end(AVCod WMA3DecodeContext *s = avctx->priv_data; int i; - av_free(s->prev_frame); + av_free(s->prev_packet_data); av_free(s->num_sfb); av_free(s->sfb_offsets); av_free(s->subwoofer_cutoffs); @@ -1475,16 +1475,16 @@ static int remaining_bits(WMA3DecodeCont */ static void save_bits(WMA3DecodeContext *s,int len) { - int buflen = (s->prev_frame_bit_size + len + 8) / 8; - int bit_offset = s->prev_frame_bit_size % 8; - int pos = (s->prev_frame_bit_size - bit_offset) / 8; - s->prev_frame_bit_size += len; + int buflen = (s->prev_packet_bit_size + len + 8) / 8; + int bit_offset = s->prev_packet_bit_size % 8; + int pos = (s->prev_packet_bit_size - bit_offset) / 8; + s->prev_packet_bit_size += len; if(len <= 0) return; /** increase length if needed */ - s->prev_frame = av_realloc(s->prev_frame,buflen + + s->prev_packet_data = av_realloc(s->prev_packet_data,buflen + FF_INPUT_BUFFER_PADDING_SIZE); /** byte align prev_frame buffer */ @@ -1492,20 +1492,20 @@ static void save_bits(WMA3DecodeContext int missing = 8 - bit_offset; if(len < missing) missing = len; - s->prev_frame[pos++] |= + s->prev_packet_data[pos++] |= get_bits(&s->gb, missing) << (8 - bit_offset - missing); len -= missing; } /** copy full bytes */ while(len > 7){ - s->prev_frame[pos++] = get_bits(&s->gb,8); + s->prev_packet_data[pos++] = get_bits(&s->gb,8); len -= 8; } /** copy remaining bits */ if(len > 0) - s->prev_frame[pos++] = get_bits(&s->gb,len) << (8 - len); + s->prev_packet_data[pos++] = get_bits(&s->gb,len) << (8 - len); } /** @@ -1559,21 +1559,22 @@ static int wma3_decode_packet(AVCodecCon previous packet to create a full frame */ save_bits(s,num_bits_prev_frame); av_log(avctx, AV_LOG_DEBUG, "accumulated %x bits of frame data\n", - s->prev_frame_bit_size); + s->prev_packet_bit_size); /** decode the cross packet frame if it is valid */ if(!s->packet_loss){ GetBitContext gb_prev; - init_get_bits(&gb_prev, s->prev_frame, s->prev_frame_bit_size); + init_get_bits(&gb_prev, s->prev_packet_data, + s->prev_packet_bit_size); wma_decode_frame(s,&gb_prev); } - }else if(s->prev_frame_bit_size){ + }else if(s->prev_packet_bit_size){ av_log(avctx, AV_LOG_ERROR, "ignoring %x previously saved bits\n", - s->prev_frame_bit_size); + s->prev_packet_bit_size); } /** reset prev frame buffer */ - s->prev_frame_bit_size = 0; + s->prev_packet_bit_size = 0; s->packet_loss = 0; /** decode the rest of the packet */ while(more_frames && remaining_bits(s) > s->log2_frame_size){

1 0