diff options
author | Sascha Sommer <saschasommer@freenet.de> | 2011-01-16 16:39:53 +0000 |
---|---|---|
committer | Sascha Sommer <saschasommer@freenet.de> | 2011-01-16 16:39:53 +0000 |
commit | f62be777ee0a220563f13662abe32854cd4b2bef (patch) | |
tree | f8bcdd7979e97e53af7c2d15f4c54a720777a800 /libavcodec/wmaprodec.c | |
parent | 240034195a83043e2b25f6a3f679baba336bc073 (diff) | |
download | ffmpeg-f62be777ee0a220563f13662abe32854cd4b2bef.tar.gz |
support decoding of files that contain the number
of vector coded coefficients in their bitstream
fixes issue 2536
Originally committed as revision 26388 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wmaprodec.c')
-rw-r--r-- | libavcodec/wmaprodec.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index cf7fc44a0f..5941781676 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -143,6 +143,7 @@ typedef struct { int* scale_factors; ///< pointer to the scale factor values used for decoding uint8_t table_idx; ///< index in sf_offsets for the scale factor reference block float* coeffs; ///< pointer to the subframe decode buffer + uint16_t num_vec_coeffs; ///< number of vector coded coefficients DECLARE_ALIGNED(16, float, out)[WMAPRO_BLOCK_MAX_SIZE + WMAPRO_BLOCK_MAX_SIZE / 2]; ///< output buffer } WMAProChannelCtx; @@ -215,6 +216,7 @@ typedef struct WMAProDecodeCtx { int8_t channels_for_cur_subframe; ///< number of channels that contain the subframe int8_t channel_indexes_for_cur_subframe[WMAPRO_MAX_CHANNELS]; int8_t num_bands; ///< number of scale factor bands + int8_t transmit_num_vec_coeffs; ///< number of vector coded coefficients is part of the bitstream 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 @@ -794,7 +796,8 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) /** 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) { + while ((s->transmit_num_vec_coeffs || !rl_mode) && + (cur_coeff + 3 < ci->num_vec_coeffs)) { int vals[4]; int i; unsigned int idx; @@ -843,7 +846,7 @@ static int decode_coeffs(WMAProDecodeCtx *s, int c) } /** decode run level coded coefficients */ - if (rl_mode) { + if (cur_coeff < s->subframe_len) { memset(&ci->coeffs[cur_coeff], 0, sizeof(*ci->coeffs) * (s->subframe_len - cur_coeff)); if (ff_wma_run_level_decode(s->avctx, &s->gb, vlc, @@ -1148,10 +1151,19 @@ static int decode_subframe(WMAProDecodeCtx *s) if (transmit_coeffs) { int step; int quant_step = 90 * s->bits_per_sample >> 4; - if ((get_bits1(&s->gb))) { - /** FIXME: might change run level mode decision */ - av_log_ask_for_sample(s->avctx, "unsupported quant step coding\n"); - return AVERROR_INVALIDDATA; + + /** decode number of vector coded coefficients */ + if ((s->transmit_num_vec_coeffs = get_bits1(&s->gb))) { + int num_bits = av_log2((s->subframe_len + 3)/4) + 1; + for (i = 0; i < s->channels_for_cur_subframe; i++) { + int c = s->channel_indexes_for_cur_subframe[i]; + s->channel[c].num_vec_coeffs = get_bits(&s->gb, num_bits) << 2; + } + } else { + for (i = 0; i < s->channels_for_cur_subframe; i++) { + int c = s->channel_indexes_for_cur_subframe[i]; + s->channel[c].num_vec_coeffs = s->subframe_len; + } } /** decode quantization step */ step = get_sbits(&s->gb, 6); |