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

[soc]: r5346 - wmapro/wmaprodec.c
by faust3 30 Aug '09

30 Aug '09

Author: faust3 Date: Sat Aug 29 23:34:43 2009 New Revision: 5346 Log: reduce per-channel output buffer size by 1/4 Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 18:58:22 2009 (r5345) +++ wmapro/wmaprodec.c Sat Aug 29 23:34:43 2009 (r5346) @@ -141,7 +141,7 @@ typedef struct { int saved_scale_factors[MAX_BANDS]; ///< scale factors from a previous subframe uint8_t table_idx; ///< index in sf_offsets for the scale factor reference block float* coeffs; ///< pointer to the subframe decode buffer - DECLARE_ALIGNED_16(float, out[2*WMAPRO_BLOCK_MAX_SIZE]); ///< output buffer + DECLARE_ALIGNED_16(float, out[WMAPRO_BLOCK_MAX_SIZE + WMAPRO_BLOCK_MAX_SIZE / 2]); ///< output buffer } WMA3ChannelCtx; /** @@ -1333,7 +1333,7 @@ static int decode_frame(WMA3DecodeContex /** reuse second half of the IMDCT output for the next frame */ memcpy(&s->channel[i].out[0], &s->channel[i].out[s->samples_per_frame], - s->samples_per_frame * sizeof(*s->channel[i].out)); + s->samples_per_frame * sizeof(*s->channel[i].out) >> 1); } if (s->skip_frame) {

1 0

[soc]: r5345 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 18:58:22 2009 New Revision: 5345 Log: reindent Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 18:55:52 2009 (r5344) +++ wmapro/wmaprodec.c Sat Aug 29 18:58:22 2009 (r5345) @@ -915,7 +915,7 @@ static int decode_scale_factors(WMA3Deco s->channel[c].scale_factors, s->num_bands * sizeof(*s->channel[c].saved_scale_factors)); s->channel[c].table_idx = s->table_idx; - s->channel[c].reuse_sf = 1; + s->channel[c].reuse_sf = 1; } /** calculate new scale factor maximum */ @@ -1070,10 +1070,10 @@ static int decode_subframe(WMA3DecodeCon s->channels_for_cur_subframe); /** calculate number of scale factor bands and their offsets */ - s->table_idx = av_log2(s->samples_per_frame/subframe_len); - s->num_bands = s->num_sfb[s->table_idx]; - s->cur_sfb_offsets = s->sfb_offsets[s->table_idx]; - cur_subwoofer_cutoff = s->subwoofer_cutoffs[s->table_idx]; + s->table_idx = av_log2(s->samples_per_frame/subframe_len); + s->num_bands = s->num_sfb[s->table_idx]; + s->cur_sfb_offsets = s->sfb_offsets[s->table_idx]; + cur_subwoofer_cutoff = s->subwoofer_cutoffs[s->table_idx]; /** configure the decoder for the current subframe */ for (i = 0; i < s->channels_for_cur_subframe; i++) {

1 0

[soc]: r5344 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 18:55:52 2009 New Revision: 5344 Log: store the sf_offsets table indices in the context instead of recalculating them when they are needed Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 18:32:50 2009 (r5343) +++ wmapro/wmaprodec.c Sat Aug 29 18:55:52 2009 (r5344) @@ -139,7 +139,7 @@ typedef struct { int max_scale_factor; ///< maximum scale factor for the current subframe int scale_factors[MAX_BANDS]; ///< scale factor values for the current subframe int saved_scale_factors[MAX_BANDS]; ///< scale factors from a previous subframe - int16_t scale_factor_block_len; ///< scale factor reference block length + uint8_t table_idx; ///< index in sf_offsets for the scale factor reference block float* coeffs; ///< pointer to the subframe decode buffer DECLARE_ALIGNED_16(float, out[2*WMAPRO_BLOCK_MAX_SIZE]); ///< output buffer } WMA3ChannelCtx; @@ -210,6 +210,7 @@ typedef struct WMA3DecodeContext { int8_t channel_indexes_for_cur_subframe[WMAPRO_MAX_CHANNELS]; int8_t num_bands; ///< number of scale factor bands int16_t* cur_sfb_offsets; ///< sfb offsets for the current block + uint8_t table_idx; ///< index for the num_sfb, sfb_offsets, sf_offsets and subwoofer_cutoffs tables int8_t esc_len; ///< length of escaped coefficients uint8_t num_chgroups; ///< number of channel groups @@ -856,12 +857,7 @@ static int decode_scale_factors(WMA3Deco /** resample scale factors for the new block size */ if (s->channel[c].reuse_sf) { - const int blocks_per_frame = s->samples_per_frame/s->subframe_len; - const int res_blocks_per_frame = s->samples_per_frame / - s->channel[c].scale_factor_block_len; - const int idx0 = av_log2(blocks_per_frame); - const int idx1 = av_log2(res_blocks_per_frame); - const int8_t* sf_offsets = s->sf_offsets[idx0][idx1]; + const int8_t* sf_offsets = s->sf_offsets[s->table_idx][s->channel[c].table_idx]; int b; for (b = 0; b < s->num_bands; b++) s->channel[c].scale_factors[b] = @@ -918,7 +914,7 @@ static int decode_scale_factors(WMA3Deco memcpy(s->channel[c].saved_scale_factors, s->channel[c].scale_factors, s->num_bands * sizeof(*s->channel[c].saved_scale_factors)); - s->channel[c].scale_factor_block_len = s->subframe_len; + s->channel[c].table_idx = s->table_idx; s->channel[c].reuse_sf = 1; } @@ -1027,7 +1023,6 @@ static int decode_subframe(WMA3DecodeCon int total_samples = s->samples_per_frame * s->num_channels; int transmit_coeffs = 0; int cur_subwoofer_cutoff; - int frame_offset; s->subframe_offset = get_bits_count(&s->gb); @@ -1075,10 +1070,10 @@ static int decode_subframe(WMA3DecodeCon s->channels_for_cur_subframe); /** calculate number of scale factor bands and their offsets */ - frame_offset = av_log2(s->samples_per_frame/subframe_len); - s->num_bands = s->num_sfb[frame_offset]; - s->cur_sfb_offsets = s->sfb_offsets[frame_offset]; - cur_subwoofer_cutoff = s->subwoofer_cutoffs[frame_offset]; + s->table_idx = av_log2(s->samples_per_frame/subframe_len); + s->num_bands = s->num_sfb[s->table_idx]; + s->cur_sfb_offsets = s->sfb_offsets[s->table_idx]; + cur_subwoofer_cutoff = s->subwoofer_cutoffs[s->table_idx]; /** configure the decoder for the current subframe */ for (i = 0; i < s->channels_for_cur_subframe; i++) {

1 0

[soc]: r5343 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 18:32:50 2009 New Revision: 5343 Log: do not store cur_subwoofer_cutoff in the context Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 18:16:21 2009 (r5342) +++ wmapro/wmaprodec.c Sat Aug 29 18:32:50 2009 (r5343) @@ -208,7 +208,6 @@ typedef struct WMA3DecodeContext { int16_t subframe_len; ///< current subframe length int8_t channels_for_cur_subframe; ///< number of channels that contain the subframe int8_t channel_indexes_for_cur_subframe[WMAPRO_MAX_CHANNELS]; - int16_t cur_subwoofer_cutoff; ///< subwoofer cutoff value int8_t num_bands; ///< number of scale factor bands int16_t* cur_sfb_offsets; ///< sfb offsets for the current block int8_t esc_len; ///< length of escaped coefficients @@ -1027,6 +1026,7 @@ static int decode_subframe(WMA3DecodeCon int i; int total_samples = s->samples_per_frame * s->num_channels; int transmit_coeffs = 0; + int cur_subwoofer_cutoff; int frame_offset; s->subframe_offset = get_bits_count(&s->gb); @@ -1078,7 +1078,7 @@ static int decode_subframe(WMA3DecodeCon frame_offset = av_log2(s->samples_per_frame/subframe_len); s->num_bands = s->num_sfb[frame_offset]; s->cur_sfb_offsets = s->sfb_offsets[frame_offset]; - s->cur_subwoofer_cutoff = s->subwoofer_cutoffs[frame_offset]; + cur_subwoofer_cutoff = s->subwoofer_cutoffs[frame_offset]; /** configure the decoder for the current subframe */ for (i = 0; i < s->channels_for_cur_subframe; i++) { @@ -1199,8 +1199,8 @@ static int decode_subframe(WMA3DecodeCon int b; if (c == s->lfe_channel) - memset(&s->tmp[s->cur_subwoofer_cutoff], 0, sizeof(*s->tmp) * - (subframe_len - s->cur_subwoofer_cutoff)); + memset(&s->tmp[cur_subwoofer_cutoff], 0, sizeof(*s->tmp) * + (subframe_len - cur_subwoofer_cutoff)); /** inverse quantization and rescaling */ for (b = 0; b < s->num_bands; b++) {

1 0

[soc]: r5342 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 18:16:21 2009 New Revision: 5342 Log: no need to store num_possible_block_sizes in the context Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 17:54:55 2009 (r5341) +++ wmapro/wmaprodec.c Sat Aug 29 18:16:21 2009 (r5342) @@ -181,7 +181,6 @@ typedef struct WMA3DecodeContext { uint8_t max_num_subframes; uint8_t subframe_len_bits; ///< number of bits used for the subframe length uint8_t max_subframe_len_bit; ///< flag indicating that the subframe is of maximum size when the first subframe length bit is 1 - int8_t num_possible_block_sizes; ///< number of distinct block sizes that can be found in the file uint16_t min_samples_per_subframe; int8_t num_sfb[WMAPRO_BLOCK_SIZES]; ///< scale factor bands per block size int16_t sfb_offsets[WMAPRO_BLOCK_SIZES][MAX_BANDS]; ///< scale factor band offsets (multiples of 4) @@ -267,6 +266,7 @@ static av_cold int decode_init(AVCodecCo unsigned int channel_mask; int i; int log2_max_num_subframes; + int num_possible_block_sizes; s->avctx = avctx; dsputil_init(&s->dsp, avctx); @@ -316,7 +316,7 @@ static av_cold int decode_init(AVCodecCo s->max_subframe_len_bit = 1; s->subframe_len_bits = av_log2(log2_max_num_subframes) + 1; - s->num_possible_block_sizes = log2_max_num_subframes + 1; + num_possible_block_sizes = log2_max_num_subframes + 1; s->min_samples_per_subframe = s->samples_per_frame / s->max_num_subframes; s->dynamic_range_compression = (s->decode_flags & 0x80); @@ -374,7 +374,7 @@ static av_cold int decode_init(AVCodecCo /** calculate number of scale factor bands and their offsets for every possible block size */ - for (i = 0; i < s->num_possible_block_sizes; i++) { + for (i = 0; i < num_possible_block_sizes; i++) { int subframe_len = s->samples_per_frame >> i; int x; int band = 1; @@ -398,13 +398,13 @@ static av_cold int decode_init(AVCodecCo The matrix sf_offsets is needed to find the correct scale factor. */ - for (i = 0; i < s->num_possible_block_sizes; i++) { + for (i = 0; i < num_possible_block_sizes; i++) { int b; for (b = 0; b < s->num_sfb[i]; b++) { int x; int offset = ((s->sfb_offsets[i][b] + s->sfb_offsets[i][b + 1] - 1)<<i) >> 1; - for (x = 0; x < s->num_possible_block_sizes; x++) { + for (x = 0; x < num_possible_block_sizes; x++) { int v = 0; while (s->sfb_offsets[x][v + 1] << x < offset) ++v; @@ -428,7 +428,7 @@ static av_cold int decode_init(AVCodecCo } /** calculate subwoofer cutoff values */ - for (i = 0; i < s->num_possible_block_sizes; i++) { + for (i = 0; i < num_possible_block_sizes; i++) { int block_size = s->samples_per_frame >> i; int cutoff = (440*block_size + 3 * (s->avctx->sample_rate >> 1) - 1) / s->avctx->sample_rate;

1 0

[soc]: r5341 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 17:54:55 2009 New Revision: 5341 Log: reindent Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 17:49:09 2009 (r5340) +++ wmapro/wmaprodec.c Sat Aug 29 17:54:55 2009 (r5341) @@ -524,54 +524,54 @@ static int decode_tilehdr(WMA3DecodeCont if (s->max_num_subframes == 1 || get_bits1(&s->gb)) fixed_channel_layout = 1; - /** loop until the frame data is split between the subframes */ - do { - int subframe_len; + /** loop until the frame data is split between the subframes */ + do { + int subframe_len; - /** check which channels contain the subframe */ - for (c = 0; c < s->num_channels; c++) { - if (num_samples[c] == min_channel_len) { - if (fixed_channel_layout || channels_for_cur_subframe == 1 || - (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) - contains_subframe[c] = 1; - else - contains_subframe[c] = get_bits1(&s->gb); - } else - contains_subframe[c] = 0; - } + /** check which channels contain the subframe */ + for (c = 0; c < s->num_channels; c++) { + if (num_samples[c] == min_channel_len) { + if (fixed_channel_layout || channels_for_cur_subframe == 1 || + (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) + contains_subframe[c] = 1; + else + contains_subframe[c] = get_bits1(&s->gb); + } else + contains_subframe[c] = 0; + } - /** get subframe length */ - if (!(subframe_len = decode_subframe_length(s, min_channel_len))) - return AVERROR_INVALIDDATA; + /** get subframe length */ + if (!(subframe_len = decode_subframe_length(s, min_channel_len))) + return AVERROR_INVALIDDATA; - /** add subframes to the individual channels and find new min_channel_len */ - min_channel_len += subframe_len; - for (c = 0; c < s->num_channels; c++) { - WMA3ChannelCtx* chan = &s->channel[c]; + /** add subframes to the individual channels and find new min_channel_len */ + min_channel_len += subframe_len; + for (c = 0; c < s->num_channels; c++) { + WMA3ChannelCtx* chan = &s->channel[c]; - if (contains_subframe[c]) { - if (chan->num_subframes >= MAX_SUBFRAMES) { - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: num subframes > 31\n"); - return AVERROR_INVALIDDATA; - } - chan->subframe_len[chan->num_subframes] = subframe_len; - num_samples[c] += subframe_len; - ++chan->num_subframes; - if (num_samples[c] > s->samples_per_frame) { - av_log(s->avctx, AV_LOG_ERROR,"broken frame: " - "channel len > samples_per_frame\n"); - return AVERROR_INVALIDDATA; - } - } else if(num_samples[c] <= min_channel_len) { - if (num_samples[c] < min_channel_len) { - channels_for_cur_subframe = 0; - min_channel_len = num_samples[c]; - } - ++channels_for_cur_subframe; + if (contains_subframe[c]) { + if (chan->num_subframes >= MAX_SUBFRAMES) { + av_log(s->avctx, AV_LOG_ERROR, + "broken frame: num subframes > 31\n"); + return AVERROR_INVALIDDATA; } + chan->subframe_len[chan->num_subframes] = subframe_len; + num_samples[c] += subframe_len; + ++chan->num_subframes; + if (num_samples[c] > s->samples_per_frame) { + av_log(s->avctx, AV_LOG_ERROR,"broken frame: " + "channel len > samples_per_frame\n"); + return AVERROR_INVALIDDATA; + } + } else if(num_samples[c] <= min_channel_len) { + if (num_samples[c] < min_channel_len) { + channels_for_cur_subframe = 0; + min_channel_len = num_samples[c]; + } + ++channels_for_cur_subframe; } - } while (min_channel_len < s->samples_per_frame); + } + } while (min_channel_len < s->samples_per_frame); for (c = 0; c < s->num_channels; c++) { int i;

1 0

[soc]: r5340 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 17:49:09 2009 New Revision: 5340 Log: merge fixed channel layout special handling code with the generic code Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 17:37:23 2009 (r5339) +++ wmapro/wmaprodec.c Sat Aug 29 17:49:09 2009 (r5340) @@ -502,6 +502,11 @@ static int decode_subframe_length(WMA3De */ static int decode_tilehdr(WMA3DecodeContext *s) { + uint16_t num_samples[WMAPRO_MAX_CHANNELS]; + uint8_t contains_subframe[WMAPRO_MAX_CHANNELS]; + int channels_for_cur_subframe = s->num_channels; + int fixed_channel_layout = 0; + int min_channel_len = 0; int c; /* Should never consume more than 3073 bits (256 iterations for the @@ -514,24 +519,10 @@ static int decode_tilehdr(WMA3DecodeCont for (c = 0; c < s->num_channels; c++) s->channel[c].num_subframes = 0; - /** all channels have the same subframe layout */ - if (s->max_num_subframes == 1 || get_bits1(&s->gb)) { - int num_samples = 0; - while (num_samples < s->samples_per_frame) { - int subframe_len; - if (!(subframe_len = decode_subframe_length(s, num_samples))) - return AVERROR_INVALIDDATA; - for (c = 0; c < s->num_channels; c++) - s->channel[c].subframe_len[s->channel[c].num_subframes++] = subframe_len; - num_samples += subframe_len; - } - } else { /** different channels have different subframe layouts */ - uint16_t num_samples[WMAPRO_MAX_CHANNELS]; - uint8_t contains_subframe[WMAPRO_MAX_CHANNELS]; - int channels_for_cur_subframe = s->num_channels; - int min_channel_len = 0; + memset(num_samples, 0, sizeof(num_samples)); - memset(num_samples, 0, sizeof(num_samples)); + if (s->max_num_subframes == 1 || get_bits1(&s->gb)) + fixed_channel_layout = 1; /** loop until the frame data is split between the subframes */ do { @@ -540,7 +531,8 @@ static int decode_tilehdr(WMA3DecodeCont /** check which channels contain the subframe */ for (c = 0; c < s->num_channels; c++) { if (num_samples[c] == min_channel_len) { - if (channels_for_cur_subframe == 1 || (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) + if (fixed_channel_layout || channels_for_cur_subframe == 1 || + (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) contains_subframe[c] = 1; else contains_subframe[c] = get_bits1(&s->gb); @@ -580,7 +572,6 @@ static int decode_tilehdr(WMA3DecodeCont } } } while (min_channel_len < s->samples_per_frame); - } for (c = 0; c < s->num_channels; c++) { int i;

1 0

[soc]: r5339 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 17:37:23 2009 New Revision: 5339 Log: rename decode_channel variable Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 17:29:59 2009 (r5338) +++ wmapro/wmaprodec.c Sat Aug 29 17:37:23 2009 (r5339) @@ -527,7 +527,7 @@ static int decode_tilehdr(WMA3DecodeCont } } else { /** different channels have different subframe layouts */ uint16_t num_samples[WMAPRO_MAX_CHANNELS]; - uint8_t decode_channel[WMAPRO_MAX_CHANNELS]; + uint8_t contains_subframe[WMAPRO_MAX_CHANNELS]; int channels_for_cur_subframe = s->num_channels; int min_channel_len = 0; @@ -541,11 +541,11 @@ static int decode_tilehdr(WMA3DecodeCont for (c = 0; c < s->num_channels; c++) { if (num_samples[c] == min_channel_len) { if (channels_for_cur_subframe == 1 || (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) - decode_channel[c] = 1; + contains_subframe[c] = 1; else - decode_channel[c] = get_bits1(&s->gb); + contains_subframe[c] = get_bits1(&s->gb); } else - decode_channel[c] = 0; + contains_subframe[c] = 0; } /** get subframe length */ @@ -557,7 +557,7 @@ static int decode_tilehdr(WMA3DecodeCont for (c = 0; c < s->num_channels; c++) { WMA3ChannelCtx* chan = &s->channel[c]; - if (decode_channel[c]) { + if (contains_subframe[c]) { if (chan->num_subframes >= MAX_SUBFRAMES) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: num subframes > 31\n");

1 0

[soc]: r5338 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 17:29:59 2009 New Revision: 5338 Log: reindent Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 17:27:47 2009 (r5337) +++ wmapro/wmaprodec.c Sat Aug 29 17:29:59 2009 (r5338) @@ -558,19 +558,19 @@ static int decode_tilehdr(WMA3DecodeCont WMA3ChannelCtx* chan = &s->channel[c]; if (decode_channel[c]) { - if (chan->num_subframes >= MAX_SUBFRAMES) { - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: num subframes > 31\n"); - return AVERROR_INVALIDDATA; - } - chan->subframe_len[chan->num_subframes] = subframe_len; - num_samples[c] += subframe_len; - ++chan->num_subframes; - if (num_samples[c] > s->samples_per_frame) { - av_log(s->avctx, AV_LOG_ERROR,"broken frame: " - "channel len > samples_per_frame\n"); - return AVERROR_INVALIDDATA; - } + if (chan->num_subframes >= MAX_SUBFRAMES) { + av_log(s->avctx, AV_LOG_ERROR, + "broken frame: num subframes > 31\n"); + return AVERROR_INVALIDDATA; + } + chan->subframe_len[chan->num_subframes] = subframe_len; + num_samples[c] += subframe_len; + ++chan->num_subframes; + if (num_samples[c] > s->samples_per_frame) { + av_log(s->avctx, AV_LOG_ERROR,"broken frame: " + "channel len > samples_per_frame\n"); + return AVERROR_INVALIDDATA; + } } else if(num_samples[c] <= min_channel_len) { if (num_samples[c] < min_channel_len) { channels_for_cur_subframe = 0;

1 0

[soc]: r5337 - wmapro/wmaprodec.c
by faust3 29 Aug '09

29 Aug '09

Author: faust3 Date: Sat Aug 29 17:27:47 2009 New Revision: 5337 Log: update channel context and estimate new min_channel_len in one loop use an array instead of a bit mask to decide if a channel contains a subframe Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 16:58:33 2009 (r5336) +++ wmapro/wmaprodec.c Sat Aug 29 17:27:47 2009 (r5337) @@ -527,6 +527,7 @@ static int decode_tilehdr(WMA3DecodeCont } } else { /** different channels have different subframe layouts */ uint16_t num_samples[WMAPRO_MAX_CHANNELS]; + uint8_t decode_channel[WMAPRO_MAX_CHANNELS]; int channels_for_cur_subframe = s->num_channels; int min_channel_len = 0; @@ -534,33 +535,29 @@ static int decode_tilehdr(WMA3DecodeCont /** loop until the frame data is split between the subframes */ do { - unsigned int channel_mask = 0; int subframe_len; - /** For every channel with the minimum length, 1 bit - might be transmitted that informs us if the channel - contains a subframe with the next subframe_len. */ - if (channels_for_cur_subframe == 1 || (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) { - channel_mask = -1; - } else { - channel_mask = get_bits(&s->gb, channels_for_cur_subframe); - if (!channel_mask) { - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: zero frames for subframe_len\n"); - return AVERROR_INVALIDDATA; - } + /** check which channels contain the subframe */ + for (c = 0; c < s->num_channels; c++) { + if (num_samples[c] == min_channel_len) { + if (channels_for_cur_subframe == 1 || (min_channel_len == s->samples_per_frame - s->min_samples_per_subframe)) + decode_channel[c] = 1; + else + decode_channel[c] = get_bits1(&s->gb); + } else + decode_channel[c] = 0; } + /** get subframe length */ if (!(subframe_len = decode_subframe_length(s, min_channel_len))) return AVERROR_INVALIDDATA; + /** add subframes to the individual channels and find new min_channel_len */ + min_channel_len += subframe_len; for (c = 0; c < s->num_channels; c++) { WMA3ChannelCtx* chan = &s->channel[c]; - /** add subframes to the individual channels */ - if (min_channel_len == num_samples[c]) { - --channels_for_cur_subframe; - if (channel_mask & (1 << channels_for_cur_subframe)) { + if (decode_channel[c]) { if (chan->num_subframes >= MAX_SUBFRAMES) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: num subframes > 31\n"); @@ -574,14 +571,7 @@ static int decode_tilehdr(WMA3DecodeCont "channel len > samples_per_frame\n"); return AVERROR_INVALIDDATA; } - } - } - } - - min_channel_len = s->samples_per_frame; - /** find channels with the smallest overall length */ - for (c = 0; c < s->num_channels; c++) { - if (num_samples[c] <= min_channel_len) { + } else if(num_samples[c] <= min_channel_len) { if (num_samples[c] < min_channel_len) { channels_for_cur_subframe = 0; min_channel_len = num_samples[c];

1 0