Commit 902bfa5b authored by Nedeljko Babic's avatar Nedeljko Babic Committed by Michael Niedermayer

avcodec/aacdec_fixed: Fix preparation for resampler

2nd channel makes sense only for CPE type.

Skip 2nd channel in preparation for resampler (in spectral_to _sample())
depending on block type.

Fixes fate failure with clang ftrapv.
Signed-off-by: 's avatarNedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent d64ba25a
...@@ -2750,6 +2750,7 @@ static void spectral_to_sample(AACContext *ac, int samples) ...@@ -2750,6 +2750,7 @@ static void spectral_to_sample(AACContext *ac, int samples)
/* preparation for resampler */ /* preparation for resampler */
for(j = 0; j<samples; 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;
if(type == TYPE_CPE)
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;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment