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

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 16:58:33 2009 New Revision: 5336 Log: get rid of missing_samples Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 16:51:37 2009 (r5335) +++ wmapro/wmaprodec.c Sat Aug 29 16:58:33 2009 (r5336) @@ -527,7 +527,6 @@ static int decode_tilehdr(WMA3DecodeCont } } else { /** different channels have different subframe layouts */ uint16_t num_samples[WMAPRO_MAX_CHANNELS]; - int missing_samples = s->num_channels * s->samples_per_frame; int channels_for_cur_subframe = s->num_channels; int min_channel_len = 0; @@ -569,10 +568,8 @@ static int decode_tilehdr(WMA3DecodeCont } chan->subframe_len[chan->num_subframes] = subframe_len; num_samples[c] += subframe_len; - missing_samples -= subframe_len; ++chan->num_subframes; - if (missing_samples < 0 - || num_samples[c] > s->samples_per_frame) { + 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;

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 16:51:37 2009 New Revision: 5335 Log: simplify decode_tilehdr Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 16:39:31 2009 (r5334) +++ wmapro/wmaprodec.c Sat Aug 29 16:51:37 2009 (r5335) @@ -528,30 +528,15 @@ static int decode_tilehdr(WMA3DecodeCont } else { /** different channels have different subframe layouts */ uint16_t num_samples[WMAPRO_MAX_CHANNELS]; int missing_samples = s->num_channels * s->samples_per_frame; + int channels_for_cur_subframe = s->num_channels; + int min_channel_len = 0; memset(num_samples, 0, sizeof(num_samples)); /** loop until the frame data is split between the subframes */ - while (missing_samples > 0) { + do { unsigned int channel_mask = 0; - int min_channel_len; - int channels_for_cur_subframe = 0; - int subframe_len = s->min_samples_per_subframe; - /** minimum number of samples that need to be read */ - int min_samples = s->min_samples_per_subframe; - - 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) { - if (num_samples[c] < min_channel_len) { - channels_for_cur_subframe = 0; - min_channel_len = num_samples[c]; - } - ++channels_for_cur_subframe; - } - } - min_samples *= channels_for_cur_subframe; + int subframe_len; /** For every channel with the minimum length, 1 bit might be transmitted that informs us if the channel @@ -595,7 +580,19 @@ static int decode_tilehdr(WMA3DecodeCont } } } - } + + 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) { + 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); } for (c = 0; c < s->num_channels; c++) {

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 16:39:31 2009 New Revision: 5334 Log: make the condition for channel_mask = 1 depend on min_channel_len Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 16:26:24 2009 (r5333) +++ wmapro/wmaprodec.c Sat Aug 29 16:39:31 2009 (r5334) @@ -556,7 +556,7 @@ static int decode_tilehdr(WMA3DecodeCont /** 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_samples == missing_samples) { + 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);

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 16:26:24 2009 New Revision: 5333 Log: unify subframe length decoding for the case when the last subframe has the minimum length Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 15:54:31 2009 (r5332) +++ wmapro/wmaprodec.c Sat Aug 29 16:26:24 2009 (r5333) @@ -449,13 +449,19 @@ static av_cold int decode_init(AVCodecCo /** *@brief Decode the subframe length. *@param s context + *@param offset sample offset in the frame *@return decoded subframe length on success, 0 in case of an error */ -static int decode_subframe_length(WMA3DecodeContext *s) +static int decode_subframe_length(WMA3DecodeContext *s, int offset) { int log2_subframe_len = 0; int subframe_len; - /* 1 bit indicates if the subframe is of maximum length */ + + /** no need to read from the bitstream when only one length is possible */ + if (offset == s->samples_per_frame - s->min_samples_per_subframe) + return s->min_samples_per_subframe; + + /** 1 bit indicates if the subframe is of maximum length */ if (s->max_subframe_len_bit) { if (get_bits1(&s->gb)) log2_subframe_len = 1 + get_bits(&s->gb, s->subframe_len_bits-1); @@ -512,11 +518,9 @@ static int decode_tilehdr(WMA3DecodeCont if (s->max_num_subframes == 1 || get_bits1(&s->gb)) { int num_samples = 0; while (num_samples < s->samples_per_frame) { - int subframe_len = s->min_samples_per_subframe; - if (num_samples < s->samples_per_frame - s->min_samples_per_subframe) { - if (!(subframe_len = decode_subframe_length(s))) - return AVERROR_INVALIDDATA; - } + 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; @@ -563,12 +567,8 @@ static int decode_tilehdr(WMA3DecodeCont } } - /** if we have the choice get next subframe length from the - bitstream */ - if (min_samples != missing_samples) { - if (!(subframe_len = decode_subframe_length(s))) - return AVERROR_INVALIDDATA; - } + if (!(subframe_len = decode_subframe_length(s, min_channel_len))) + return AVERROR_INVALIDDATA; for (c = 0; c < s->num_channels; c++) { WMA3ChannelCtx* chan = &s->channel[c];

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 15:54:31 2009 New Revision: 5332 Log: reindent Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 15:49:50 2009 (r5331) +++ wmapro/wmaprodec.c Sat Aug 29 15:54:31 2009 (r5332) @@ -536,17 +536,17 @@ static int decode_tilehdr(WMA3DecodeCont /** minimum number of samples that need to be read */ int min_samples = s->min_samples_per_subframe; - 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) { - if (num_samples[c] < min_channel_len) { - channels_for_cur_subframe = 0; - min_channel_len = num_samples[c]; - } - ++channels_for_cur_subframe; + 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) { + if (num_samples[c] < min_channel_len) { + channels_for_cur_subframe = 0; + min_channel_len = num_samples[c]; } + ++channels_for_cur_subframe; } + } min_samples *= channels_for_cur_subframe; /** For every channel with the minimum length, 1 bit

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 15:49:50 2009 New Revision: 5331 Log: decode_tilehdr: merge the fixed_channel_layout case with the max_num_subframes == 1 case Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 15:15:09 2009 (r5330) +++ wmapro/wmaprodec.c Sat Aug 29 15:49:50 2009 (r5331) @@ -497,7 +497,6 @@ static int decode_subframe_length(WMA3De static int decode_tilehdr(WMA3DecodeContext *s) { int c; - uint16_t num_samples[WMAPRO_MAX_CHANNELS]; /* Should never consume more than 3073 bits (256 iterations for the * while loop when always the minimum amount of 128 samples is substracted @@ -509,19 +508,24 @@ static int decode_tilehdr(WMA3DecodeCont for (c = 0; c < s->num_channels; c++) s->channel[c].num_subframes = 0; - memset(num_samples, 0, sizeof(num_samples)); - - /** handle the easy case with one constant-sized subframe per channel */ - if (s->max_num_subframes == 1) { - for (c = 0; c < s->num_channels; c++) { - s->channel[c].num_subframes = 1; - s->channel[c].subframe_len[0] = s->samples_per_frame; + /** 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 = s->min_samples_per_subframe; + if (num_samples < s->samples_per_frame - s->min_samples_per_subframe) { + if (!(subframe_len = decode_subframe_length(s))) + 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 { /** subframe length and number of subframes is not constant */ + } else { /** different channels have different subframe layouts */ + uint16_t num_samples[WMAPRO_MAX_CHANNELS]; int missing_samples = s->num_channels * s->samples_per_frame; - int fixed_channel_layout; /** all channels have the same subframe layout */ - fixed_channel_layout = get_bits1(&s->gb); + memset(num_samples, 0, sizeof(num_samples)); /** loop until the frame data is split between the subframes */ while (missing_samples > 0) { @@ -532,10 +536,6 @@ static int decode_tilehdr(WMA3DecodeCont /** minimum number of samples that need to be read */ int min_samples = s->min_samples_per_subframe; - if (fixed_channel_layout) { - channels_for_cur_subframe = s->num_channels; - min_channel_len = num_samples[0]; - } else { min_channel_len = s->samples_per_frame; /** find channels with the smallest overall length */ for (c = 0; c < s->num_channels; c++) { @@ -547,14 +547,12 @@ static int decode_tilehdr(WMA3DecodeCont ++channels_for_cur_subframe; } } - } min_samples *= channels_for_cur_subframe; /** 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 (fixed_channel_layout || channels_for_cur_subframe == 1 || - min_samples == missing_samples) { + if (channels_for_cur_subframe == 1 || min_samples == missing_samples) { channel_mask = -1; } else { channel_mask = get_bits(&s->gb, channels_for_cur_subframe);

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 15:15:09 2009 New Revision: 5330 Log: document error return code for decode_subframe_length Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 15:10:20 2009 (r5329) +++ wmapro/wmaprodec.c Sat Aug 29 15:15:09 2009 (r5330) @@ -447,9 +447,9 @@ static av_cold int decode_init(AVCodecCo } /** - *@brief Decode the subframe length + *@brief Decode the subframe length. *@param s context - *@return decoded subframe length + *@return decoded subframe length on success, 0 in case of an error */ static int decode_subframe_length(WMA3DecodeContext *s) {

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 15:10:20 2009 New Revision: 5329 Log: decode subframe length in a separate function Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 14:53:57 2009 (r5328) +++ wmapro/wmaprodec.c Sat Aug 29 15:10:20 2009 (r5329) @@ -447,6 +447,34 @@ static av_cold int decode_init(AVCodecCo } /** + *@brief Decode the subframe length + *@param s context + *@return decoded subframe length + */ +static int decode_subframe_length(WMA3DecodeContext *s) +{ + int log2_subframe_len = 0; + int subframe_len; + /* 1 bit indicates if the subframe is of maximum length */ + if (s->max_subframe_len_bit) { + if (get_bits1(&s->gb)) + log2_subframe_len = 1 + get_bits(&s->gb, s->subframe_len_bits-1); + } else + log2_subframe_len = get_bits(&s->gb, s->subframe_len_bits); + + subframe_len = s->samples_per_frame / (1 << log2_subframe_len); + + /** sanity check the length */ + if (subframe_len < s->min_samples_per_subframe + || subframe_len > s->samples_per_frame) { + av_log(s->avctx, AV_LOG_ERROR, "broken frame: subframe_len %i\n", + subframe_len); + return 0; + } + return subframe_len; +} + +/** *@brief Decode how the data in the frame is split into subframes. * Every WMA frame contains the encoded data for a fixed number of * samples per channel. The data for every channel might be split @@ -500,7 +528,7 @@ static int decode_tilehdr(WMA3DecodeCont unsigned int channel_mask = 0; int min_channel_len; int channels_for_cur_subframe = 0; - int subframe_len; + int subframe_len = s->min_samples_per_subframe; /** minimum number of samples that need to be read */ int min_samples = s->min_samples_per_subframe; @@ -540,27 +568,9 @@ static int decode_tilehdr(WMA3DecodeCont /** if we have the choice get next subframe length from the bitstream */ if (min_samples != missing_samples) { - int log2_subframe_len = 0; - /* 1 bit indicates if the subframe is of maximum length */ - if (s->max_subframe_len_bit) { - if (get_bits1(&s->gb)) { - log2_subframe_len = 1 + - get_bits(&s->gb, s->subframe_len_bits-1); - } - } else - log2_subframe_len = get_bits(&s->gb, s->subframe_len_bits); - - subframe_len = s->samples_per_frame / (1 << log2_subframe_len); - - /** sanity check the length */ - if (subframe_len < s->min_samples_per_subframe - || subframe_len > s->samples_per_frame) { - av_log(s->avctx, AV_LOG_ERROR, - "broken frame: subframe_len %i\n", subframe_len); + if (!(subframe_len = decode_subframe_length(s))) return AVERROR_INVALIDDATA; - } - } else - subframe_len = s->min_samples_per_subframe; + } for (c = 0; c < s->num_channels; c++) { WMA3ChannelCtx* chan = &s->channel[c];

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 14:53:57 2009 New Revision: 5328 Log: move subframe_len_bits calculation to decode_init Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sat Aug 29 14:02:32 2009 (r5327) +++ wmapro/wmaprodec.c Sat Aug 29 14:53:57 2009 (r5328) @@ -179,6 +179,8 @@ typedef struct WMA3DecodeContext { int8_t num_channels; ///< number of channels in the stream (same as AVCodecContext.num_channels) int8_t lfe_channel; ///< lfe channel index 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 @@ -310,6 +312,10 @@ static av_cold int decode_init(AVCodecCo /** subframe info */ log2_max_num_subframes = ((s->decode_flags & 0x38) >> 3); s->max_num_subframes = 1 << log2_max_num_subframes; + if (s->max_num_subframes == 16) + 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; s->min_samples_per_subframe = s->samples_per_frame / s->max_num_subframes; s->dynamic_range_compression = (s->decode_flags & 0x80); @@ -485,17 +491,10 @@ static int decode_tilehdr(WMA3DecodeCont } } 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 */ fixed_channel_layout = get_bits1(&s->gb); - /** calculate subframe len bits */ - if (s->max_num_subframes == 16) - subframe_len_zero_bit = 1; - subframe_len_bits = av_log2(av_log2(s->max_num_subframes)) + 1; - /** loop until the frame data is split between the subframes */ while (missing_samples > 0) { unsigned int channel_mask = 0; @@ -543,13 +542,13 @@ static int decode_tilehdr(WMA3DecodeCont if (min_samples != missing_samples) { int log2_subframe_len = 0; /* 1 bit indicates if the subframe is of maximum length */ - if (subframe_len_zero_bit) { + if (s->max_subframe_len_bit) { if (get_bits1(&s->gb)) { log2_subframe_len = 1 + - get_bits(&s->gb, subframe_len_bits-1); + get_bits(&s->gb, s->subframe_len_bits-1); } } else - log2_subframe_len = get_bits(&s->gb, subframe_len_bits); + log2_subframe_len = get_bits(&s->gb, s->subframe_len_bits); subframe_len = s->samples_per_frame / (1 << log2_subframe_len);

1 0

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

29 Aug '09

Author: faust3 Date: Sat Aug 29 14:02:32 2009 New Revision: 5327 Log: use ff_copy_bits to fill the bitreservoir Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Thu Aug 27 18:49:27 2009 (r5326) +++ wmapro/wmaprodec.c Sat Aug 29 14:02:32 2009 (r5327) @@ -89,6 +89,7 @@ #include "avcodec.h" #include "internal.h" #include "get_bits.h" +#include "put_bits.h" #include "wmaprodata.h" #include "dsputil.h" #include "wma.h" @@ -163,6 +164,7 @@ typedef struct WMA3DecodeContext { DSPContext dsp; ///< accelerated DSP functions uint8_t frame_data[MAX_FRAMESIZE + FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data + PutBitContext pb; ///< context for filling the frame_data buffer MDCTContext mdct_ctx[WMAPRO_BLOCK_SIZES]; ///< MDCT context per block size DECLARE_ALIGNED_16(float, tmp[WMAPRO_BLOCK_MAX_SIZE]); ///< IMDCT output buffer float* windows[WMAPRO_BLOCK_SIZES]; ///< windows for the different block sizes @@ -266,6 +268,7 @@ static av_cold int decode_init(AVCodecCo s->avctx = avctx; dsputil_init(&s->dsp, avctx); + init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); avctx->sample_fmt = SAMPLE_FMT_FLT; @@ -1401,12 +1404,15 @@ static void save_bits(WMA3DecodeContext int append) { int buflen; - int bit_offset; - int pos; + + /** when the frame data does not need to be concatenated, the input buffer + is resetted and additional bits from the previous frame are copyed + and skipped later so that a fast byte copy is possible */ if (!append) { s->frame_offset = get_bits_count(gb) & 7; s->num_saved_bits = s->frame_offset; + init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); } buflen = (s->num_saved_bits + len + 8) >> 3; @@ -1417,36 +1423,21 @@ static void save_bits(WMA3DecodeContext return; } + s->num_saved_bits += len; if (!append) { - s->num_saved_bits += len; - memcpy(s->frame_data, gb->buffer + (get_bits_count(gb) >> 3), - (s->num_saved_bits + 8)>> 3); - skip_bits_long(gb, len); + ff_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3), s->num_saved_bits); } else { - bit_offset = s->num_saved_bits & 7; - pos = (s->num_saved_bits - bit_offset) >> 3; - - s->num_saved_bits += len; - - /** byte align prev_frame buffer */ - if (bit_offset) { - int missing = 8 - bit_offset; - missing = FFMIN(len, missing); - s->frame_data[pos++] |= - get_bits(gb, missing) << (8 - bit_offset - missing); - len -= missing; - } - - /** copy full bytes */ - while (len > 7) { - s->frame_data[pos++] = get_bits(gb, 8); - len -= 8; - } - - /** copy remaining bits */ - if (len > 0) - s->frame_data[pos++] = get_bits(gb, len) << (8 - len); + int align = 8 - (get_bits_count(gb) & 7); + align = FFMIN(align, len); + put_bits(&s->pb, align, get_bits(gb, align)); + len -= align; + ff_copy_bits(&s->pb, gb->buffer + (get_bits_count(gb) >> 3), len); + } + skip_bits_long(gb, len); + { + PutBitContext tmp = s->pb; + flush_put_bits(&tmp); } init_get_bits(&s->gb, s->frame_data, s->num_saved_bits);

1 0