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

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:32:06 2009 New Revision: 3980 Log: renamed wma_channel_group to WMA3ChannelGroup Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:29:29 2009 (r3979) +++ wmapro/wma3.h Sat Jan 17 18:32:06 2009 (r3980) @@ -78,7 +78,7 @@ typedef struct { 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]; -} wma_channel_group; +} WMA3ChannelGroup; /** *@brief main decoder context @@ -148,8 +148,8 @@ typedef struct WMA3DecodeContext { int quant_step; int esc_len; - int nb_chgroups; //< number of channel groups - wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information + uint8_t nb_chgroups; //< number of channel groups + WMA3ChannelGroup chgroup[MAX_CHANNELS]; //< channel group information WMA3ChannelCtx channel[MAX_CHANNELS]; //< per channel data } WMA3DecodeContext; Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:29:29 2009 (r3979) +++ wmapro/wma3dec.c Sat Jan 17 18:32:06 2009 (r3980) @@ -590,7 +590,7 @@ static int wma_decode_channel_transform( } for(s->nb_chgroups = 0; remaining_channels && s->nb_chgroups < s->channels_for_cur_subframe;s->nb_chgroups++){ - wma_channel_group* chgroup = &s->chgroup[s->nb_chgroups]; + WMA3ChannelGroup* chgroup = &s->chgroup[s->nb_chgroups]; chgroup->nb_channels = 0; chgroup->no_rotation = 0; chgroup->transform = 0; @@ -939,7 +939,7 @@ static int wma_decode_scale_factors(WMA3 return 1; } -static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, wma_channel_group* chgroup) +static void wma_calc_decorrelation_matrix(WMA3DecodeContext *s, WMA3ChannelGroup* chgroup) { int i; int offset = 0;

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:29:29 2009 New Revision: 3979 Log: renamed wma_channel to WMA3ChannelCtx Modified: wmapro/wma3.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 18:23:03 2009 (r3978) +++ wmapro/wma3.h Sat Jan 17 18:29:29 2009 (r3979) @@ -67,7 +67,7 @@ typedef struct { int scale_factor_block_len; //< block len of the frame for which the scale factors were transmitted DECLARE_ALIGNED_16(float, out[8192]); -} wma_channel; +} WMA3ChannelCtx; typedef struct { int nb_channels; @@ -151,7 +151,7 @@ typedef struct WMA3DecodeContext { int nb_chgroups; //< number of channel groups wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information - wma_channel channel[MAX_CHANNELS]; //< per channel data + WMA3ChannelCtx channel[MAX_CHANNELS]; //< per channel data } WMA3DecodeContext; #endif /* AVCODEC_WMA3_H */ Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 18:23:03 2009 (r3978) +++ wmapro/wma3dec.c Sat Jan 17 18:29:29 2009 (r3979) @@ -516,7 +516,7 @@ static int wma_decode_tilehdr(WMA3Decode return -1; } for(c=0; c<s->nb_channels;c++){ - wma_channel* chan = &s->channel[c]; + WMA3ChannelCtx* chan = &s->channel[c]; if(chan->num_subframes > 32){ av_log(s->avctx, AV_LOG_ERROR, "broken frame: num subframes %i\n", @@ -769,7 +769,7 @@ static int decode_coeffs(WMA3DecodeConte int vlctable; VLC* vlc; int vlcmax; - wma_channel* ci = &s->channel[c]; + WMA3ChannelCtx* ci = &s->channel[c]; int rl_mode = 0; int cur_coeff = 0; int last_write = 0;

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 18:23:03 2009 New Revision: 3978 Log: rearranged WMA3DecodeContext Modified: wmapro/wma3.h Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 16:56:55 2009 (r3977) +++ wmapro/wma3.h Sat Jan 17 18:23:03 2009 (r3978) @@ -84,79 +84,74 @@ typedef struct { *@brief main decoder context */ typedef struct WMA3DecodeContext { - int16_t* samples; //< current samplebuffer pointer - int16_t* samples_end; //< maximum samplebuffer pointer - int skip_frame; //< do not output the current frame - DSPContext dsp; - - int num_possible_block_sizes; //< number of possible block sizes - int* num_sfb; //< number of scale factor bands for every block size - int* sfb_offsets; //< scale factor band offsets - int* sf_offsets; //< matrix to find the correct scale factor - int* subwoofer_cutoffs; //< subwoofer cutoff values for every block - int subwoofer_cutoff; //< current subwoofer cutoff value - int subframe_len; //< current subframe length - int nb_chgroups; //< number of channel groups for the current subframe - wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information - - int lfe_channel; - int negative_quantstep; - int quant_step; - int channels_for_cur_subframe; - int channel_indices_for_cur_subframe[MAX_CHANNELS]; - const float*** default_decorrelation_matrix; - int esc_len; - - GetBitContext* getbit; - MDCTContext mdct_ctx[BLOCK_NB_SIZES]; - float *windows[BLOCK_NB_SIZES]; - - int cValidBarkBand; - int* rgiBarkIndex; - - VLC sf_vlc; - VLC vec4_vlc; - VLC vec2_vlc; - VLC vec1_vlc; - VLC coef_vlc[2]; - VLC sf_rl_vlc; - int coef_max[2]; - - int parsed_all_subframes; + /** generic decoder variables */ AVCodecContext* avctx; //< codec context for av_log - GetBitContext gb; //< getbitcontext for the packet - int buf_bit_size; //< buffer size in bits - - /** packet info */ - uint8_t packet_sequence_number; //< current packet number - uint8_t bit5; //< padding bit? (CBR files) - uint8_t bit6; - uint8_t packet_loss; //< set in case of bitstream error + DSPContext dsp; + MDCTContext mdct_ctx[BLOCK_NB_SIZES]; //< mdct context per block size + float* windows[BLOCK_NB_SIZES]; //< window per block size + VLC sf_vlc; //< scale factor dpcm vlc + VLC sf_rl_vlc; //< scale factor run length vlc + VLC vec4_vlc; //< 4 coefs per symbol + VLC vec2_vlc; //< 2 coefs per symbol + VLC vec1_vlc; //< 1 coef per symbol + VLC coef_vlc[2]; //< coef run length vlc codes + int coef_max[2]; //< max length of vlc codes - /** stream info */ - uint16_t samples_per_frame; //< number of outputed samples - uint16_t log2_frame_size; //< frame size + /** frame size dependant frame information (set during init) */ uint8_t lossless; //< lossless mode - uint8_t no_tiling; //< frames are split in subframes - int8_t nb_channels; //< number of channels - wma_channel channel[MAX_CHANNELS]; //< per channel data - - /** extradata */ unsigned int decode_flags; //< used compression features - uint8_t sample_bit_depth; //< bits per sample - - /** general frame info */ - unsigned int frame_num; //< current frame number uint8_t len_prefix; //< frame is prefixed with its len + uint8_t dynamic_range_compression;//< frame contains drc data + uint8_t sample_bit_depth; //< bits per sample + uint16_t samples_per_frame; //< number of outputed samples + 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; 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 uint16_t min_samples_per_subframe; //< minimum samples per subframe - uint8_t dynamic_range_compression;//< frame contains drc data - uint8_t drc_gain; //< gain for the drc tool + int* num_sfb; //< scale factor bands per block size + int* sfb_offsets; //< scale factor band offsets + int* sf_offsets; //< scale factor resample matrix + int* subwoofer_cutoffs; //< subwoofer cutoff values - /** buffered frame data */ + /** 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 + uint8_t bit5; //< padding bit? (CBR files) + uint8_t bit6; + uint8_t packet_loss; //< set in case of bitstream error + uint8_t negative_quantstep; //< packet loss due to negative quant step + + /** frame decode state */ + unsigned int frame_num; //< current frame number + GetBitContext* getbit; + GetBitContext gb; //< getbitcontext for the packet + int buf_bit_size; //< buffer size in bits + int16_t* samples; //< current samplebuffer pointer + int16_t* samples_end; //< maximum samplebuffer pointer + uint8_t drc_gain; //< gain for the drc tool + uint8_t no_tiling; //< frames contain subframes + int skip_frame; //< skip output step + int parsed_all_subframes; //< all subframes decoded? + + /** subframe/block decode state */ + int subframe_len; //< current subframe length + int channels_for_cur_subframe; + int channel_indices_for_cur_subframe[MAX_CHANNELS]; + int subwoofer_cutoff; //< subwoofer cutoff value + int cValidBarkBand; + int* rgiBarkIndex; + int quant_step; + int esc_len; + + int nb_chgroups; //< number of channel groups + wma_channel_group chgroup[MAX_CHANNELS]; //< channel group information + + wma_channel channel[MAX_CHANNELS]; //< per channel data } WMA3DecodeContext; #endif /* AVCODEC_WMA3_H */

1 0

[soc]: r3976 - wmapro/wma3data.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 16:29:58 2009 New Revision: 3976 Log: added doxygen comments to wma3data.h Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 15:42:53 2009 (r3975) +++ wmapro/wma3data.h Sat Jan 17 16:29:58 2009 (r3976) @@ -20,10 +20,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file wma3data.h + * @brief tables for wmapro decoding + */ + #ifndef AVCODEC_WMA3DATA_H #define AVCODEC_WMA3DATA_H -/* Bark frequencies */ +/** + * @brief frequencies to divide the frequency spectrum into scale factor bands + */ static const uint16_t ff_wma3_critical_freq[] = { 100, 200, 300, 400, 510, 630, 770, 920, 1080, 1270, 1480, 1720, 2000, 2320, @@ -32,6 +39,10 @@ static const uint16_t ff_wma3_critical_f }; +/** + * @name huffman tables for dpcm coded scale factors + * @{ + */ #define FF_WMA3_HUFF_SCALE_SIZE 121 #define FF_WMA3_HUFF_SCALE_MAXBITS 19 static const uint32_t ff_wma3_scale_huffcodes[FF_WMA3_HUFF_SCALE_SIZE] = { @@ -71,8 +82,13 @@ static const uint8_t ff_wma3_scale_huffb 19, 19, 19, 19, 19, 19, 19, 19, 19, }; +/** @} */ +/** + * @name huffman, run and level tables for run length coded scale factors + * @{ + */ #define FF_WMA3_HUFF_SCALE_RL_SIZE 120 #define FF_WMA3_HUFF_SCALE_RL_MAXBITS 21 static const uint32_t ff_wma3_scale_rl_huffcodes[FF_WMA3_HUFF_SCALE_RL_SIZE] = { @@ -137,8 +153,13 @@ static const uint8_t ff_wma3_scale_rl_le 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 8, 8, 9, 9, }; +/** @} */ +/** + * @name huffman, run and level codes for run length coded coefficients + * @{ + */ #define FF_WMA3_HUFF_COEF0_SIZE 272 #define FF_WMA3_HUFF_COEF0_MAXBITS 21 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { @@ -385,8 +406,13 @@ static const uint8_t ff_wma3_coef1_level 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, 47, 48, 48, 49, 49, 50, 51, 52, }; +/** @} */ +/** + * @name huffman and vector lookup tables for vector coded coefficients + * @{ + */ #define FF_WMA3_HUFF_VEC4_SIZE 127 #define FF_WMA3_HUFF_VEC4_MAXBITS 14 static const uint32_t ff_wma3_vec4_huffcodes[FF_WMA3_HUFF_VEC4_SIZE] = { @@ -538,8 +564,12 @@ static const uint8_t ff_wma3_symbol_to_v 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, }; +/** @} */ +/** + * @brief decorrelation matrix for multichannel streams + **/ static const float ff_wma3_default_decorrelation_matrices[] = { 1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406,

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 15:42:53 2009 New Revision: 3975 Log: fixed sizes of the run and level tables Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:50:36 2009 (r3974) +++ wmapro/wma3data.h Sat Jan 17 15:42:53 2009 (r3975) @@ -118,24 +118,24 @@ static const uint8_t ff_wma3_scale_rl_hu }; -static const uint8_t ff_wma3_scale_rl_run[] = { - 0, 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, 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, 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, - 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, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0, 1, - 0, 1, 0, 1, +static const uint8_t ff_wma3_scale_rl_run[FF_WMA3_HUFF_SCALE_RL_SIZE] = { + 0, 0, 0, 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, 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, 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, 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, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 0, 1, 0, 1, 0, 1, }; -static const uint8_t ff_wma3_scale_rl_level[] = { - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, +static const uint8_t ff_wma3_scale_rl_level[FF_WMA3_HUFF_SCALE_RL_SIZE] = { + 0, 0, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, - 8, 8, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 7, 7, 8, 8, 9, 9, }; @@ -305,31 +305,31 @@ static const uint8_t ff_wma3_coef1_huffb }; -static const uint8_t ff_wma3_coef0_run[] = { - 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 0, 1, 2, 3, +static const uint8_t ff_wma3_coef0_run[FF_WMA3_HUFF_COEF0_SIZE] = { + 0, 0, 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, + 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 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, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 18, 19, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, + 2, 3, 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 0, 0, + 1, 0, 1, 0, 1, 0, }; -static const uint8_t ff_wma3_coef0_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +static const uint8_t ff_wma3_coef0_level[FF_WMA3_HUFF_COEF0_SIZE] = { + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -339,53 +339,51 @@ static const uint8_t ff_wma3_coef0_level 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, - 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, - 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, - 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, - 26, 27, 27, 28, 0, 0, + 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, + 5, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, + 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, + 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, + 25, 26, 26, 27, 27, 28, }; -static const uint8_t ff_wma3_coef1_run[] = { - 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, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 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, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, +static const uint8_t ff_wma3_coef1_run[FF_WMA3_HUFF_COEF1_SIZE] = { + 0, 0, 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, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 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, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, + 2, 3, 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, }; -static const uint8_t ff_wma3_coef1_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +static const uint8_t ff_wma3_coef1_level[FF_WMA3_HUFF_COEF1_SIZE] = { + 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, - 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, - 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, - 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, - 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, - 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, - 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, + 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, + 4, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, + 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, + 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, + 28, 29, 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, + 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, + 46, 47, 47, 48, 48, 49, 49, 50, 51, 52, }; Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 14:50:36 2009 (r3974) +++ wmapro/wma3dec.c Sat Jan 17 15:42:53 2009 (r3975) @@ -815,8 +815,8 @@ static int decode_coeffs(WMA3DecodeConte cur_coeff += get_bits(s->getbit,2) + 1; } }else{ - cur_coeff += run[idx - 2]; - val = level[idx - 2]; + cur_coeff += run[idx]; + val = level[idx]; } mask = get_bits(s->getbit,1) - 1; ci->coeffs[cur_coeff] = (val^mask) - mask; @@ -913,8 +913,8 @@ static int wma_decode_scale_factors(WMA3 }else if(idx == 1){ break; }else{ - skip = ff_wma3_scale_rl_run[idx-2]; - level_mask = ff_wma3_scale_rl_level[idx-2]; + skip = ff_wma3_scale_rl_run[idx]; + level_mask = ff_wma3_scale_rl_level[idx]; val = get_bits(gb,1)-1; }

1 0

[soc]: r3974 - wmapro/wma3data.h
by faust3 17 Jan '09

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:50:36 2009 New Revision: 3974 Log: rearranged tables Modified: wmapro/wma3data.h Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:40:11 2009 (r3973) +++ wmapro/wma3data.h Sat Jan 17 14:50:36 2009 (r3974) @@ -139,85 +139,6 @@ static const uint8_t ff_wma3_scale_rl_le }; -#define FF_WMA3_HUFF_COEF1_SIZE 244 -#define FF_WMA3_HUFF_COEF1_MAXBITS 22 -static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { - 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, - 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, - 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, - 0x00034D, 0x0003F2, 0x0004BD, 0x0005D7, 0x00062A, 0x00068B, 0x000693, - 0x000797, 0x00097D, 0x000BAB, 0x000C52, 0x000C5E, 0x000D21, 0x000D20, - 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, 0x0018AC, 0x0018A7, - 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, 0x0025E6, - 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, - 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, - 0x003F73, 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, - 0x00628A, 0x0062D4, 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, - 0x007E87, 0x007EEA, 0x00794E, 0x00699D, 0x007967, 0x00699F, 0x0062DB, - 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, 0x00C537, 0x00C5AB, 0x00D233, - 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, 0x00FDC8, 0x00D23C, - 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, 0x00003E, - 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, - 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, - 0x007EE5, 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, - 0x018A6D, 0x01A67B, 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, - 0x00003D, 0x000128, 0x0003C7, 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, - 0x00691F, 0x007E79, 0x000013, 0x0000BB, 0x00034E, 0x000D14, 0x0025FD, - 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, 0x000308, 0x0012F2, - 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, 0x000C25, - 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, - 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, - 0x000346, 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, - 0x00C511, 0x00062C, 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, - 0x0007E9, 0x018A21, 0x00097E, 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, - 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, 0x03F3C2, 0x000FCD, 0x0348CB, - 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, 0x04BE40, 0x0018B7, - 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, 0x0BAD62, - 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, - 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, - 0x003F41, 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, - 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, -}; - -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { - 9, 7, 2, 3, 4, 4, 5, - 6, 6, 7, 7, 8, 8, 8, - 9, 9, 9, 9, 10, 10, 10, - 10, 10, 11, 11, 11, 11, 11, - 11, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 14, - 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 15, 15, - 14, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, - 15, 15, 16, 16, 16, 16, 16, - 16, 16, 16, 17, 16, 16, 16, - 16, 16, 16, 16, 3, 5, 6, - 8, 9, 10, 11, 12, 12, 13, - 13, 14, 14, 15, 15, 15, 15, - 15, 16, 16, 16, 16, 16, 17, - 17, 17, 17, 18, 17, 17, 4, - 6, 9, 10, 12, 13, 14, 14, - 15, 15, 5, 8, 10, 12, 14, - 15, 6, 9, 11, 6, 10, 13, - 7, 10, 14, 7, 11, 8, 12, - 8, 12, 8, 13, 9, 13, 9, - 14, 9, 14, 10, 14, 10, 15, - 10, 15, 10, 15, 10, 15, 11, - 16, 11, 16, 11, 16, 11, 16, - 11, 17, 12, 17, 12, 17, 12, - 18, 12, 18, 12, 18, 12, 18, - 13, 19, 13, 18, 13, 19, 13, - 19, 13, 20, 13, 18, 13, 20, - 13, 20, 14, 19, 14, 21, 14, - 19, 14, 20, 14, 21, 14, 19, - 14, 20, 14, 21, 15, 21, 14, - 21, 15, 22, 15, 22, 15, -}; - - #define FF_WMA3_HUFF_COEF0_SIZE 272 #define FF_WMA3_HUFF_COEF0_MAXBITS 21 static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { @@ -305,6 +226,169 @@ static const uint8_t ff_wma3_coef0_huffb }; +#define FF_WMA3_HUFF_COEF1_SIZE 244 +#define FF_WMA3_HUFF_COEF1_MAXBITS 22 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { + 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, + 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, + 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, + 0x00034D, 0x0003F2, 0x0004BD, 0x0005D7, 0x00062A, 0x00068B, 0x000693, + 0x000797, 0x00097D, 0x000BAB, 0x000C52, 0x000C5E, 0x000D21, 0x000D20, + 0x000F1A, 0x000FCE, 0x000FD1, 0x0012F1, 0x001759, 0x0018AC, 0x0018A7, + 0x0018BF, 0x001A2B, 0x001E52, 0x001E50, 0x001E31, 0x001FB8, 0x0025E6, + 0x0025E7, 0x002EB4, 0x002EB7, 0x003169, 0x00315B, 0x00317C, 0x00316C, + 0x0034CA, 0x00348D, 0x003F40, 0x003CA2, 0x003F76, 0x004BC3, 0x004BE5, + 0x003F73, 0x004BF8, 0x004BF9, 0x006131, 0x00628B, 0x006289, 0x0062DA, + 0x00628A, 0x0062D4, 0x006997, 0x0062B4, 0x006918, 0x00794D, 0x007E7B, + 0x007E87, 0x007EEA, 0x00794E, 0x00699D, 0x007967, 0x00699F, 0x0062DB, + 0x007E7A, 0x007EEB, 0x00BAC0, 0x0097C9, 0x00C537, 0x00C5AB, 0x00D233, + 0x00D338, 0x00BAC1, 0x00D23D, 0x012F91, 0x00D339, 0x00FDC8, 0x00D23C, + 0x00FDDC, 0x00FDC9, 0x00FDDD, 0x00D33C, 0x000003, 0x000016, 0x00003E, + 0x0000C3, 0x0001A1, 0x000347, 0x00062E, 0x000BAA, 0x000F2D, 0x001A2A, + 0x001E58, 0x00309B, 0x003CA3, 0x005D6A, 0x00629A, 0x006996, 0x00794F, + 0x007EE5, 0x00BAD7, 0x00C5AA, 0x00C5F4, 0x00FDDF, 0x00FDDE, 0x018A20, + 0x018A6D, 0x01A67B, 0x01A464, 0x025F21, 0x01F9E2, 0x01F9E3, 0x00000A, + 0x00003D, 0x000128, 0x0003C7, 0x000C24, 0x0018A3, 0x002EB1, 0x003CB2, + 0x00691F, 0x007E79, 0x000013, 0x0000BB, 0x00034E, 0x000D14, 0x0025FD, + 0x004BE7, 0x000024, 0x000188, 0x0007EF, 0x000035, 0x000308, 0x0012F2, + 0x00005C, 0x0003F6, 0x0025E0, 0x00006D, 0x000698, 0x000096, 0x000C25, + 0x0000C7, 0x000F1B, 0x0000F3, 0x0012FF, 0x000174, 0x001A66, 0x0001A0, + 0x003099, 0x0001E4, 0x00316B, 0x000252, 0x003F31, 0x00030B, 0x004BE6, + 0x000346, 0x0062FB, 0x00034F, 0x007966, 0x0003F5, 0x007E86, 0x0005D4, + 0x00C511, 0x00062C, 0x00C5F5, 0x000692, 0x00F299, 0x000795, 0x00F298, + 0x0007E9, 0x018A21, 0x00097E, 0x0175AD, 0x000C27, 0x01A67A, 0x000C57, + 0x02EB59, 0x000D22, 0x0314D9, 0x000F19, 0x03F3C2, 0x000FCD, 0x0348CB, + 0x0012F8, 0x04BE41, 0x0018A0, 0x03F3C1, 0x0018A1, 0x04BE40, 0x0018B7, + 0x0629B0, 0x001A64, 0x0D2329, 0x001E30, 0x03F3C3, 0x001F9F, 0x0BAD62, + 0x001F99, 0x0FCF00, 0x00309A, 0x0629B1, 0x002EB6, 0x175AC3, 0x00314C, + 0x069195, 0x003168, 0x0BAD63, 0x00348E, 0x175AC1, 0x003F30, 0x07E781, + 0x003F41, 0x0D2328, 0x003F42, 0x1F9E03, 0x004BC2, 0x175AC2, 0x003F74, + 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, +}; + +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { + 9, 7, 2, 3, 4, 4, 5, + 6, 6, 7, 7, 8, 8, 8, + 9, 9, 9, 9, 10, 10, 10, + 10, 10, 11, 11, 11, 11, 11, + 11, 12, 12, 12, 12, 12, 12, + 12, 12, 12, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 14, + 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 15, 15, + 14, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, + 15, 15, 16, 16, 16, 16, 16, + 16, 16, 16, 17, 16, 16, 16, + 16, 16, 16, 16, 3, 5, 6, + 8, 9, 10, 11, 12, 12, 13, + 13, 14, 14, 15, 15, 15, 15, + 15, 16, 16, 16, 16, 16, 17, + 17, 17, 17, 18, 17, 17, 4, + 6, 9, 10, 12, 13, 14, 14, + 15, 15, 5, 8, 10, 12, 14, + 15, 6, 9, 11, 6, 10, 13, + 7, 10, 14, 7, 11, 8, 12, + 8, 12, 8, 13, 9, 13, 9, + 14, 9, 14, 10, 14, 10, 15, + 10, 15, 10, 15, 10, 15, 11, + 16, 11, 16, 11, 16, 11, 16, + 11, 17, 12, 17, 12, 17, 12, + 18, 12, 18, 12, 18, 12, 18, + 13, 19, 13, 18, 13, 19, 13, + 19, 13, 20, 13, 18, 13, 20, + 13, 20, 14, 19, 14, 21, 14, + 19, 14, 20, 14, 21, 14, 19, + 14, 20, 14, 21, 15, 21, 14, + 21, 15, 22, 15, 22, 15, +}; + + +static const uint8_t ff_wma3_coef0_run[] = { + 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 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, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 0, 0, +}; + +static const uint8_t ff_wma3_coef0_level[] = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, + 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, + 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, + 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, + 26, 27, 27, 28, 0, 0, +}; + + +static const uint8_t ff_wma3_coef1_run[] = { + 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, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, + 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 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, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, + 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, +}; + +static const uint8_t ff_wma3_coef1_level[] = { + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, + 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, + 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, + 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, + 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, + 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, + 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, +}; + + #define FF_WMA3_HUFF_VEC4_SIZE 127 #define FF_WMA3_HUFF_VEC4_MAXBITS 14 static const uint32_t ff_wma3_vec4_huffcodes[FF_WMA3_HUFF_VEC4_SIZE] = { @@ -458,90 +542,6 @@ static const uint8_t ff_wma3_symbol_to_v }; -static const uint8_t ff_wma3_coef1_run[] = { - 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, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 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, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 5, 0, 1, 2, 0, 1, 2, 0, 1, 2, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -}; - -static const uint8_t ff_wma3_coef1_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, - 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, - 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, - 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, 28, 28, 29, - 29, 30, 30, 31, 31, 32, 32, 33, 33, 34, 34, 35, 35, 36, 36, 37, 37, 38, - 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 44, 44, 45, 45, 46, 46, 47, - 47, 48, 48, 49, 49, 50, 51, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -}; - - -static const uint8_t ff_wma3_coef0_run[] = { - 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 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, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, - 4, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 0, 0, -}; - -static const uint8_t ff_wma3_coef0_level[] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, - 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, - 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, - 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, - 26, 27, 27, 28, 0, 0, -}; - - static const float ff_wma3_default_decorrelation_matrices[] = { 1.000000, 0.707031, -0.707031, 0.707031, 0.707031, 0.578125, 0.707031, 0.410156, 0.578125, -0.707031, 0.410156, 0.578125, 0.000000, -0.816406,

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:40:11 2009 New Revision: 3973 Log: consistent naming for coef? huffman, run and level tables Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:29:53 2009 (r3972) +++ wmapro/wma3data.h Sat Jan 17 14:40:11 2009 (r3973) @@ -139,9 +139,9 @@ static const uint8_t ff_wma3_scale_rl_le }; -#define FF_WMA3_HUFF_COEF0_SIZE 244 -#define FF_WMA3_HUFF_COEF0_MAXBITS 22 -static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { +#define FF_WMA3_HUFF_COEF1_SIZE 244 +#define FF_WMA3_HUFF_COEF1_MAXBITS 22 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, @@ -179,7 +179,7 @@ static const uint32_t ff_wma3_coef0_huff 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, }; -static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_HUFF_COEF0_SIZE] = { +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { 9, 7, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, @@ -218,9 +218,9 @@ static const uint8_t ff_wma3_coef0_huffb }; -#define FF_WMA3_HUFF_COEF1_SIZE 272 -#define FF_WMA3_HUFF_COEF1_MAXBITS 21 -static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { +#define FF_WMA3_HUFF_COEF0_SIZE 272 +#define FF_WMA3_HUFF_COEF0_MAXBITS 21 +static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, 0x000010, 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, 0x000029, 0x000045, 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, @@ -262,7 +262,7 @@ static const uint32_t ff_wma3_coef1_huff 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, }; -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { +static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_HUFF_COEF0_SIZE] = { 8, 7, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, @@ -458,7 +458,7 @@ static const uint8_t ff_wma3_symbol_to_v }; -static const uint8_t ff_wma3_coeff1_run[] = { +static const uint8_t ff_wma3_coef1_run[] = { 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -476,7 +476,7 @@ static const uint8_t ff_wma3_coeff1_run[ 0, 0, 0, 0, }; -static const uint8_t ff_wma3_coeff1_level[] = { +static const uint8_t ff_wma3_coef1_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -495,7 +495,7 @@ static const uint8_t ff_wma3_coeff1_leve }; -static const uint8_t ff_wma3_coeff0_run[] = { +static const uint8_t ff_wma3_coef0_run[] = { 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -518,7 +518,7 @@ static const uint8_t ff_wma3_coeff0_run[ 1, 0, 1, 0, 0, 0, }; -static const uint8_t ff_wma3_coeff0_level[] = { +static const uint8_t ff_wma3_coef0_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 14:29:53 2009 (r3972) +++ wmapro/wma3dec.c Sat Jan 17 14:40:11 2009 (r3973) @@ -220,18 +220,17 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_scale_rl_huffbits, 1, 1, ff_wma3_scale_rl_huffcodes, 4, 4, 0); - - init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_HUFF_COEF0_SIZE, + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_HUFF_COEF0_SIZE, ff_wma3_coef0_huffbits, 1, 1, ff_wma3_coef0_huffcodes, 4, 4, 0); - s->coef_max[1] = ((FF_WMA3_HUFF_COEF0_MAXBITS+VLCBITS-1)/VLCBITS); + s->coef_max[0] = ((FF_WMA3_HUFF_COEF0_MAXBITS+VLCBITS-1)/VLCBITS); - init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_HUFF_COEF1_SIZE, + init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_HUFF_COEF1_SIZE, ff_wma3_coef1_huffbits, 1, 1, ff_wma3_coef1_huffcodes, 4, 4, 0); - s->coef_max[0] = ((FF_WMA3_HUFF_COEF1_MAXBITS+VLCBITS-1)/VLCBITS); + s->coef_max[1] = ((FF_WMA3_HUFF_COEF1_MAXBITS+VLCBITS-1)/VLCBITS); init_vlc(&s->vec4_vlc, VLCBITS, FF_WMA3_HUFF_VEC4_SIZE, ff_wma3_vec4_huffbits, 1, 1, @@ -786,11 +785,11 @@ static int decode_coeffs(WMA3DecodeConte vlcmax = s->coef_max[vlctable]; if(vlctable){ - run = ff_wma3_coeff1_run; - level = ff_wma3_coeff1_level; + run = ff_wma3_coef1_run; + level = ff_wma3_coef1_level; }else{ - run = ff_wma3_coeff0_run; - level = ff_wma3_coeff0_level; + run = ff_wma3_coef0_run; + level = ff_wma3_coef0_level; } while(cur_coeff < s->subframe_len){

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:29:53 2009 New Revision: 3972 Log: renamed ff_wma3_level/run_i to ff_wma3_coeffi_level/run and exchanged the indices so that they match the read bit Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 14:19:07 2009 (r3971) +++ wmapro/wma3data.h Sat Jan 17 14:29:53 2009 (r3972) @@ -458,7 +458,7 @@ static const uint8_t ff_wma3_symbol_to_v }; -static const uint8_t ff_wma3_run_0[] = { +static const uint8_t ff_wma3_coeff1_run[] = { 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -476,7 +476,7 @@ static const uint8_t ff_wma3_run_0[] = { 0, 0, 0, 0, }; -static const uint8_t ff_wma3_level_0[] = { +static const uint8_t ff_wma3_coeff1_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -495,7 +495,7 @@ static const uint8_t ff_wma3_level_0[] = }; -static const uint8_t ff_wma3_run_1[] = { +static const uint8_t ff_wma3_coeff0_run[] = { 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, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, @@ -518,7 +518,7 @@ static const uint8_t ff_wma3_run_1[] = { 1, 0, 1, 0, 0, 0, }; -static const uint8_t ff_wma3_level_1[] = { +static const uint8_t ff_wma3_coeff0_level[] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 14:19:07 2009 (r3971) +++ wmapro/wma3dec.c Sat Jan 17 14:29:53 2009 (r3972) @@ -785,12 +785,12 @@ static int decode_coeffs(WMA3DecodeConte vlc = &s->coef_vlc[vlctable]; vlcmax = s->coef_max[vlctable]; - if(!vlctable){ - run = ff_wma3_run_1; - level = ff_wma3_level_1; + if(vlctable){ + run = ff_wma3_coeff1_run; + level = ff_wma3_coeff1_level; }else{ - run = ff_wma3_run_0; - level = ff_wma3_level_0; + run = ff_wma3_coeff0_run; + level = ff_wma3_coeff0_level; } while(cur_coeff < s->subframe_len){

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 14:19:07 2009 New Revision: 3971 Log: renamed FF_WMA3_COEF0_SIZE/MAXBITS to FF_WMA_HUFF_COEF0_SIZE/MAXBITS and avoid negation during the table selection Modified: wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:55:52 2009 (r3970) +++ wmapro/wma3data.h Sat Jan 17 14:19:07 2009 (r3971) @@ -139,9 +139,9 @@ static const uint8_t ff_wma3_scale_rl_le }; -#define FF_WMA3_COEF0_SIZE 244 -#define FF_WMA3_COEF0_MAXBITS 22 -static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_COEF0_SIZE] = { +#define FF_WMA3_HUFF_COEF0_SIZE 244 +#define FF_WMA3_HUFF_COEF0_MAXBITS 22 +static const uint32_t ff_wma3_coef0_huffcodes[FF_WMA3_HUFF_COEF0_SIZE] = { 0x0001E2, 0x00007F, 0x000000, 0x000002, 0x000008, 0x00000E, 0x000019, 0x00002F, 0x000037, 0x000060, 0x00006C, 0x000095, 0x0000C6, 0x0000F0, 0x00012E, 0x000189, 0x0001A5, 0x0001F8, 0x000253, 0x00030A, 0x000344, @@ -179,7 +179,7 @@ static const uint32_t ff_wma3_coef0_huff 0x175AC0, 0x005D61, 0x3F3C05, 0x006130, 0x3F3C04, 0x0062B5, }; -static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_COEF0_SIZE] = { +static const uint8_t ff_wma3_coef0_huffbits[FF_WMA3_HUFF_COEF0_SIZE] = { 9, 7, 2, 3, 4, 4, 5, 6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 9, 10, 10, 10, @@ -218,9 +218,9 @@ static const uint8_t ff_wma3_coef0_huffb }; -#define FF_WMA3_COEF1_SIZE 272 -#define FF_WMA3_COEF1_MAXBITS 21 -static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_COEF1_SIZE] = { +#define FF_WMA3_HUFF_COEF1_SIZE 272 +#define FF_WMA3_HUFF_COEF1_MAXBITS 21 +static const uint32_t ff_wma3_coef1_huffcodes[FF_WMA3_HUFF_COEF1_SIZE] = { 0x00004A, 0x00002B, 0x000000, 0x000003, 0x000006, 0x000009, 0x00000F, 0x000010, 0x000016, 0x000011, 0x000016, 0x000028, 0x00002F, 0x000026, 0x000029, 0x000045, 0x000055, 0x00005D, 0x000042, 0x00004E, 0x000051, @@ -262,7 +262,7 @@ static const uint32_t ff_wma3_coef1_huff 0x087448, 0x0047E4, 0x043A20, 0x00542A, 0x087449, 0x00898C, }; -static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_COEF1_SIZE] = { +static const uint8_t ff_wma3_coef1_huffbits[FF_WMA3_HUFF_COEF1_SIZE] = { 8, 7, 2, 3, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 7, 8, 8, 8, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:55:52 2009 (r3970) +++ wmapro/wma3dec.c Sat Jan 17 14:19:07 2009 (r3971) @@ -221,17 +221,17 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_scale_rl_huffcodes, 4, 4, 0); - init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_COEF0_SIZE, + init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_HUFF_COEF0_SIZE, ff_wma3_coef0_huffbits, 1, 1, ff_wma3_coef0_huffcodes, 4, 4, 0); - s->coef_max[0] = ((22+VLCBITS-1)/VLCBITS); + s->coef_max[1] = ((FF_WMA3_HUFF_COEF0_MAXBITS+VLCBITS-1)/VLCBITS); - init_vlc(&s->coef_vlc[1], VLCBITS, FF_WMA3_COEF1_SIZE, + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_HUFF_COEF1_SIZE, ff_wma3_coef1_huffbits, 1, 1, ff_wma3_coef1_huffcodes, 4, 4, 0); - s->coef_max[1] = ((21+VLCBITS-1)/VLCBITS); + s->coef_max[0] = ((FF_WMA3_HUFF_COEF1_MAXBITS+VLCBITS-1)/VLCBITS); init_vlc(&s->vec4_vlc, VLCBITS, FF_WMA3_HUFF_VEC4_SIZE, ff_wma3_vec4_huffbits, 1, 1, @@ -782,8 +782,8 @@ static int decode_coeffs(WMA3DecodeConte s->getbit = gb; s->esc_len = av_log2(s->subframe_len -1) +1; vlctable = get_bits(s->getbit, 1); - vlc = &s->coef_vlc[!vlctable]; - vlcmax = s->coef_max[!vlctable]; + vlc = &s->coef_vlc[vlctable]; + vlcmax = s->coef_max[vlctable]; if(!vlctable){ run = ff_wma3_run_1;

1 0

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

17 Jan '09

Author: faust3 Date: Sat Jan 17 13:46:01 2009 New Revision: 3969 Log: renamed rlc_vlc to sf_rl_vlc and moved the init uninit next to sf_vlc Modified: wmapro/wma3.h wmapro/wma3data.h wmapro/wma3dec.c Modified: wmapro/wma3.h ============================================================================== --- wmapro/wma3.h Sat Jan 17 13:25:33 2009 (r3968) +++ wmapro/wma3.h Sat Jan 17 13:46:01 2009 (r3969) @@ -119,7 +119,7 @@ typedef struct WMA3DecodeContext { VLC vec2_vlc; VLC vec1_vlc; VLC coef_vlc[2]; - VLC rlc_vlc; + VLC sf_rl_vlc; int coef_max[2]; int parsed_all_subframes; Modified: wmapro/wma3data.h ============================================================================== --- wmapro/wma3data.h Sat Jan 17 13:25:33 2009 (r3968) +++ wmapro/wma3data.h Sat Jan 17 13:46:01 2009 (r3969) @@ -73,9 +73,9 @@ static const uint8_t ff_wma3_scale_huffb }; -#define FF_WMA3_HUFF_RLC_SIZE 120 -#define FF_WMA3_HUFF_RLC_MAXBITS 21 -static const uint32_t ff_wma3_huff_rlc_codes[FF_WMA3_HUFF_RLC_SIZE] = { +#define FF_WMA3_HUFF_SCALE_RL_SIZE 120 +#define FF_WMA3_HUFF_SCALE_RL_MAXBITS 21 +static const uint32_t ff_wma3_scale_rl_huffcodes[FF_WMA3_HUFF_SCALE_RL_SIZE] = { 0x00010C, 0x000001, 0x10FE2A, 0x000003, 0x000003, 0x000001, 0x000013, 0x000020, 0x000029, 0x000014, 0x000016, 0x000045, 0x000049, 0x00002F, 0x000042, 0x00008E, 0x00008F, 0x000129, 0x000009, 0x00000D, 0x0004AC, @@ -96,7 +96,7 @@ static const uint32_t ff_wma3_huff_rlc_c 0x0002B1, }; -static const uint8_t ff_wma3_huff_rlc_bits[FF_WMA3_HUFF_RLC_SIZE] = { +static const uint8_t ff_wma3_scale_rl_huffbits[FF_WMA3_HUFF_SCALE_RL_SIZE] = { 9, 2, 21, 2, 4, 5, 5, 6, 6, 7, 7, 7, 7, 6, 7, 8, 8, 9, 10, 10, 11, Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jan 17 13:25:33 2009 (r3968) +++ wmapro/wma3dec.c Sat Jan 17 13:46:01 2009 (r3969) @@ -110,12 +110,12 @@ static av_cold int wma3_decode_end(AVCod } free_vlc(&s->sf_vlc); + free_vlc(&s->sf_rl_vlc); free_vlc(&s->coef_vlc[0]); free_vlc(&s->coef_vlc[1]); free_vlc(&s->vec4_vlc); free_vlc(&s->vec2_vlc); free_vlc(&s->vec1_vlc); - free_vlc(&s->rlc_vlc); for(i=0 ; i<BLOCK_NB_SIZES ; i++) ff_mdct_end(&s->mdct_ctx[i]); @@ -216,6 +216,11 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_scale_huffbits, 1, 1, ff_wma3_scale_huffcodes, 4, 4, 0); + init_vlc(&s->sf_rl_vlc, VLCBITS, FF_WMA3_HUFF_SCALE_RL_SIZE, + ff_wma3_scale_rl_huffbits, 1, 1, + ff_wma3_scale_rl_huffcodes, 4, 4, 0); + + init_vlc(&s->coef_vlc[0], VLCBITS, FF_WMA3_COEF0_SIZE, ff_wma3_coef0_huffbits, 1, 1, ff_wma3_coef0_huffcodes, 4, 4, 0); @@ -240,10 +245,6 @@ static av_cold int wma3_decode_init(AVCo ff_wma3_vec1_huffbits, 1, 1, ff_wma3_vec1_huffcodes, 4, 4, 0); - init_vlc(&s->rlc_vlc, VLCBITS, FF_WMA3_HUFF_RLC_SIZE, - ff_wma3_huff_rlc_bits, 1, 1, - ff_wma3_huff_rlc_codes, 4, 4, 0); - s->num_sfb = av_mallocz(sizeof(int)*s->num_possible_block_sizes); s->sfb_offsets = av_mallocz(MAX_BANDS * sizeof(int) *s->num_possible_block_sizes); s->subwoofer_cutoffs = av_mallocz(sizeof(int)*s->num_possible_block_sizes); @@ -903,7 +904,7 @@ static int wma_decode_scale_factors(WMA3 short level_mask; short val; - idx = get_vlc2(gb, s->rlc_vlc.table, VLCBITS, ((FF_WMA3_HUFF_RLC_MAXBITS+VLCBITS-1)/VLCBITS)); + idx = get_vlc2(gb, s->sf_rl_vlc.table, VLCBITS, ((FF_WMA3_HUFF_SCALE_RL_MAXBITS+VLCBITS-1)/VLCBITS)); if( !idx ){ uint32_t mask = get_bits(gb,14);

1 0