RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/ac3dec: Fix undefined shifts 

Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-11 16:21:26 +01:00
parent 3b63819dfb
commit 94ccbad488
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/ac3dec.c
View File

@ -112,7 +112,7 @@ static const uint8_t ac3_default_coeffs[8][5][2] = {
static inline int static inline int
symmetric_dequant(int code, int levels) symmetric_dequant(int code, int levels)
{ {
return ((code - (levels >> 1)) << 24) / levels; return ((code - (levels >> 1)) * (1 << 24)) / levels;
} }
/* /*
@ -470,7 +470,7 @@ static void calc_transform_coeffs_cpl(AC3DecodeContext *s)
int cpl_coord = s->cpl_coords[ch][band] << 5; int cpl_coord = s->cpl_coords[ch][band] << 5;
for (bin = band_start; bin < band_end; bin++) { for (bin = band_start; bin < band_end; bin++) {
s->fixed_coeffs[ch][bin] = s->fixed_coeffs[ch][bin] =
MULH(s->fixed_coeffs[CPL_CH][bin] << 4, cpl_coord); MULH(s->fixed_coeffs[CPL_CH][bin] * (1 << 4), cpl_coord);
} }
if (ch == 2 && s->phase_flags[band]) { if (ch == 2 && s->phase_flags[band]) {
for (bin = band_start; bin < band_end; bin++) for (bin = band_start; bin < band_end; bin++)
@ -567,8 +567,7 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma
av_log(s->avctx, AV_LOG_ERROR, "bap %d is invalid in plain AC-3\n", bap); av_log(s->avctx, AV_LOG_ERROR, "bap %d is invalid in plain AC-3\n", bap);
bap = 15; bap = 15;
} }
mantissa = get_sbits(gbc, quantization_tab[bap]); mantissa = (unsigned)get_sbits(gbc, quantization_tab[bap]) << (24 - quantization_tab[bap]);
mantissa <<= 24 - quantization_tab[bap];
break; break;
} }
coeffs[freq] = mantissa >> exps[freq]; coeffs[freq] = mantissa >> exps[freq];