generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/aac_fixed: Fix a bug in spectral_to_sample()

Browse Source 
There was fixed number of loops (2048) in preparation for resampler, so
when number of samples is smaller than this, there would be an overflow on
ret_buf.

For some reason this behavior popped out only under valgrind with
--disable-memory-poisoning option.

This is now fixed and number of loops depends on actual number of samples.

Signed-off-by: Nedeljko Babic <nedeljko.babic@rt-rk.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Nedeljko Babic 2015-07-28 17:40:23 +02:00 committed by Michael Niedermayer
parent 8c2f00d590
commit fee7c42bf4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/aacdec_template.c
View File

@ -2694,7 +2694,7 @@ static void apply_channel_coupling(AACContext *ac, ChannelElement *cc,
/** /**
* Convert spectral data to samples, applying all supported tools as appropriate. * Convert spectral data to samples, applying all supported tools as appropriate.
*/ */
static void spectral_to_sample(AACContext *ac) static void spectral_to_sample(AACContext *ac, int samples)
{ {
int i, type; int i, type;
void (*imdct_and_window)(AACContext *ac, SingleChannelElement *sce); void (*imdct_and_window)(AACContext *ac, SingleChannelElement *sce);
@ -2748,7 +2748,7 @@ static void spectral_to_sample(AACContext *ac)
{ {
int j; int j;
/* preparation for resampler */ /* preparation for resampler */
for(j = 0; j<2048; j++){ for(j = 0; j<samples; j++){
che->ch[0].ret[j] = (int32_t)av_clipl_int32((int64_t)che->ch[0].ret[j]<<7)+0x8000; che->ch[0].ret[j] = (int32_t)av_clipl_int32((int64_t)che->ch[0].ret[j]<<7)+0x8000;
che->ch[1].ret[j] = (int32_t)av_clipl_int32((int64_t)che->ch[1].ret[j]<<7)+0x8000; che->ch[1].ret[j] = (int32_t)av_clipl_int32((int64_t)che->ch[1].ret[j]<<7)+0x8000;
} }
@ -2881,7 +2881,7 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data,
return err; return err;
} }
spectral_to_sample(ac); spectral_to_sample(ac, samples);
ac->frame->nb_samples = samples; ac->frame->nb_samples = samples;
ac->frame->sample_rate = avctx->sample_rate; ac->frame->sample_rate = avctx->sample_rate;
@ -3029,11 +3029,11 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
return 0; return 0;
} }
spectral_to_sample(ac);
multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0; multiplier = (ac->oc[1].m4ac.sbr == 1) ? ac->oc[1].m4ac.ext_sample_rate > ac->oc[1].m4ac.sample_rate : 0;
samples <<= multiplier; samples <<= multiplier;
spectral_to_sample(ac, samples);
if (ac->oc[1].status && audio_found) { if (ac->oc[1].status && audio_found) {
avctx->sample_rate = ac->oc[1].m4ac.sample_rate << multiplier; avctx->sample_rate = ac->oc[1].m4ac.sample_rate << multiplier;
avctx->frame_size = samples; avctx->frame_size = samples;