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

[soc]: r4525 - wmapro/wma3dec.c
by faust3 25 Jun '09

25 Jun '09

Author: faust3 Date: Wed Jun 24 21:08:32 2009 New Revision: 4525 Log: no need to multiply * 8 before calling av_log2 Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 20:55:25 2009 (r4524) +++ wmapro/wma3dec.c Wed Jun 24 21:08:32 2009 (r4525) @@ -286,7 +286,7 @@ static av_cold int decode_init(AVCodecCo } /** generic init */ - s->log2_frame_size = av_log2(avctx->block_align*8)+1; + s->log2_frame_size = av_log2(avctx->block_align) + 4; /** frame info */ s->skip_frame = 1; /** skip first frame */

1 0

[soc]: r4524 - wmapro/wma3dec.c
by faust3 25 Jun '09

25 Jun '09

Author: faust3 Date: Wed Jun 24 20:55:25 2009 New Revision: 4524 Log: simplify vector decoding Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 20:09:12 2009 (r4523) +++ wmapro/wma3dec.c Wed Jun 24 20:55:25 2009 (r4524) @@ -822,8 +822,6 @@ static int decode_coeffs(WMA3DecodeConte int num_zeros = 0; const uint16_t* run; const uint16_t* level; - int zero_init = 0; - int rl_switchmask = (s->subframe_len>>8); dprintf(s->avctx, "decode coefficients for channel %i\n",c); @@ -838,13 +836,6 @@ static int decode_coeffs(WMA3DecodeConte level = coef0_level; } - /** for subframe_len 128 the first zero coefficient will switch to - the run level mode */ - if (s->subframe_len == 128) { - zero_init = num_zeros = 1; - rl_switchmask = 1; - } - /** decode vector coefficients (consumes up to 167 bits per iteration for 4 vector coded large values) */ while (!rl_mode && cur_coeff + 3 < s->subframe_len) { @@ -881,12 +872,11 @@ static int decode_coeffs(WMA3DecodeConte if (vals[i]) { int sign = get_bits1(&s->gb) - 1; ci->coeffs[cur_coeff] = (vals[i]^sign) - sign; - num_zeros = zero_init; + num_zeros = 0; } else { /** switch to run level mode when subframe_len / 128 zeros were found in a row */ - rl_mode |= (num_zeros & rl_switchmask); - ++num_zeros; + rl_mode |= (++num_zeros > s->subframe_len>>8); } ++cur_coeff; }

1 0

[soc]: r4523 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 20:09:12 2009 New Revision: 4523 Log: Simplify subframe channel selection Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 20:01:17 2009 (r4522) +++ wmapro/wma3dec.c Wed Jun 24 20:09:12 2009 (r4523) @@ -562,7 +562,8 @@ static int decode_tilehdr(WMA3DecodeCont "broken frame: zero frames for subframe_len\n"); return -1; } - } + } else + channel_mask = -1; /** if we have the choice get next subframe length from the bitstream */ @@ -602,8 +603,7 @@ static int decode_tilehdr(WMA3DecodeCont /** add subframes to the individual channels */ if (min_channel_len == chan->channel_len) { --channels_for_cur_subframe; - if (!read_channel_mask || - channel_mask & (1<<channels_for_cur_subframe)) { + if (channel_mask & (1<<channels_for_cur_subframe)) { if (chan->num_subframes >= MAX_SUBFRAMES) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: num subframes > 31\n");

1 0

[soc]: r4522 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 20:01:17 2009 New Revision: 4522 Log: Merge increment by one with previous statement Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:57:19 2009 (r4521) +++ wmapro/wma3dec.c Wed Jun 24 20:01:17 2009 (r4522) @@ -571,9 +571,8 @@ static int decode_tilehdr(WMA3DecodeCont /* 1 bit indicates if the subframe length is zero */ if (subframe_len_zero_bit) { if (get_bits1(&s->gb)) { - log2_subframe_len = + log2_subframe_len = 1 + get_bits(&s->gb,subframe_len_bits-1); - ++log2_subframe_len; } } else log2_subframe_len = get_bits(&s->gb,subframe_len_bits);

1 0

[soc]: r4521 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 19:57:19 2009 New Revision: 4521 Log: Move variable initialization to the place where it is needed Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:51:41 2009 (r4520) +++ wmapro/wma3dec.c Wed Jun 24 19:57:19 2009 (r4521) @@ -521,7 +521,7 @@ static int decode_tilehdr(WMA3DecodeCont /** loop until the frame data is split between the subframes */ while (missing_samples > 0) { unsigned int channel_mask = 0; - int min_channel_len = s->samples_per_frame; + int min_channel_len; int read_channel_mask = 1; int channels_for_cur_subframe = 0; int subframe_len; @@ -534,6 +534,7 @@ static int decode_tilehdr(WMA3DecodeCont min_samples *= channels_for_cur_subframe; min_channel_len = s->channel[0].channel_len; } else { + min_channel_len = s->samples_per_frame; /** find channels with the smallest overall length */ for (c=0;c<s->num_channels;c++) { if (s->channel[c].channel_len <= min_channel_len) {

1 0

[soc]: r4520 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 19:51:41 2009 New Revision: 4520 Log: Move missing_samples declaration to the block where the variable is used Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:45:15 2009 (r4519) +++ wmapro/wma3dec.c Wed Jun 24 19:51:41 2009 (r4520) @@ -482,7 +482,6 @@ static av_cold int decode_init(AVCodecCo static int decode_tilehdr(WMA3DecodeContext *s) { int c; - int missing_samples = s->num_channels * s->samples_per_frame; /* should never consume more than 3073 bits (256 iterations for the * while loop when always the minimum amount of 128 samples is substracted @@ -503,6 +502,7 @@ static int decode_tilehdr(WMA3DecodeCont s->channel[c].subframe_len[0] = s->samples_per_frame; } } else { /** subframe length and number of subframes is not constant */ + int missing_samples = s->num_channels * s->samples_per_frame; int subframe_len_bits = 0; /** bits needed for the subframe length */ int subframe_len_zero_bit = 0; /** first bit indicates if length is zero */ int fixed_channel_layout; /** all channels have the same subframe layout */

1 0

[soc]: r4519 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 19:45:15 2009 New Revision: 4519 Log: Move variable descriptions next to the variables Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:32:41 2009 (r4518) +++ wmapro/wma3dec.c Wed Jun 24 19:45:15 2009 (r4519) @@ -503,12 +503,9 @@ static int decode_tilehdr(WMA3DecodeCont s->channel[c].subframe_len[0] = s->samples_per_frame; } } else { /** subframe length and number of subframes is not constant */ - /** bits needed for the subframe length */ - int subframe_len_bits = 0; - /** first bit indicates if length is zero */ - int subframe_len_zero_bit = 0; - /** all channels have the same subframe layout */ - int fixed_channel_layout; + int subframe_len_bits = 0; /** bits needed for the subframe length */ + int subframe_len_zero_bit = 0; /** first bit indicates if length is zero */ + int fixed_channel_layout; /** all channels have the same subframe layout */ fixed_channel_layout = get_bits1(&s->gb);

1 0

[soc]: r4518 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 19:32:41 2009 New Revision: 4518 Log: No need to reset channel_len when num_subframes == 1 Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:27:23 2009 (r4517) +++ wmapro/wma3dec.c Wed Jun 24 19:32:41 2009 (r4518) @@ -501,7 +501,6 @@ static int decode_tilehdr(WMA3DecodeCont for (c=0;c<s->num_channels;c++) { s->channel[c].num_subframes = 1; s->channel[c].subframe_len[0] = s->samples_per_frame; - s->channel[c].channel_len = 0; } } else { /** subframe length and number of subframes is not constant */ /** bits needed for the subframe length */

1 0

[soc]: r4517 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 19:27:23 2009 New Revision: 4517 Log: Merge declaration and init Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:11:23 2009 (r4516) +++ wmapro/wma3dec.c Wed Jun 24 19:27:23 2009 (r4517) @@ -1101,10 +1101,9 @@ static void window(WMA3DecodeContext *s) int i; for (i=0;i<s->channels_for_cur_subframe;i++) { int c = s->channel_indexes_for_cur_subframe[i]; - float* start; float* window; int winlen = s->channel[c].prev_block_len; - start = s->channel[c].coeffs - (winlen >> 1); + float* start = s->channel[c].coeffs - (winlen >> 1); if (s->subframe_len < winlen) { start += (winlen - s->subframe_len)>>1;

1 0

[soc]: r4516 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 19:11:23 2009 New Revision: 4516 Log: Rename sample_bit_depth to bits_per_sample Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 19:00:06 2009 (r4515) +++ wmapro/wma3dec.c Wed Jun 24 19:11:23 2009 (r4516) @@ -162,7 +162,7 @@ typedef struct WMA3DecodeContext { uint32_t decode_flags; ///< used compression features uint8_t len_prefix; ///< frame is prefixed with its length uint8_t dynamic_range_compression; ///< frame contains DRC data - uint8_t sample_bit_depth; ///< bits per sample + uint8_t bits_per_sample; uint16_t samples_per_frame; ///< number of samples to output uint16_t log2_frame_size; ///< frame size int8_t num_channels; ///< number of channels @@ -217,7 +217,7 @@ static void av_cold dump_context(WMA3Dec #define PRINT(a,b) av_log(s->avctx,AV_LOG_DEBUG," %s = %d\n", a, b); #define PRINT_HEX(a,b) av_log(s->avctx,AV_LOG_DEBUG," %s = %x\n", a, b); - PRINT("ed sample bit depth",s->sample_bit_depth); + PRINT("ed sample bit depth",s->bits_per_sample); PRINT_HEX("ed decode flags",s->decode_flags); PRINT("samples per frame",s->samples_per_frame); PRINT("log2 frame size",s->log2_frame_size); @@ -268,11 +268,11 @@ static av_cold int decode_init(AVCodecCo avctx->sample_fmt = SAMPLE_FMT_S16; /** FIXME: is this really the right thing to do for 24 bits? */ - s->sample_bit_depth = 16; // avctx->bits_per_sample; + s->bits_per_sample = 16; // avctx->bits_per_sample; if (avctx->extradata_size >= 18) { s->decode_flags = AV_RL16(edata_ptr+14); channel_mask = AV_RL32(edata_ptr+2); -// s->sample_bit_depth = AV_RL16(edata_ptr); +// s->bits_per_sample = AV_RL16(edata_ptr); #ifdef DEBUG /** dump the extradata */ for (i=0 ; i<avctx->extradata_size ; i++) @@ -1252,7 +1252,7 @@ static int decode_subframe(WMA3DecodeCon if (transmit_coeffs) { int step; - int quant_step = 90 * s->sample_bit_depth >> 4; + int quant_step = 90 * s->bits_per_sample >> 4; if ((get_bits1(&s->gb))) { /** FIXME: might change run level mode decision */ ff_log_ask_for_sample(s->avctx, "unsupported quant step coding\n");

1 0