RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 02:04:58 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/g729postfilter: Fix left shift of negative value

Browse Source 
Fixes: Ticket8176

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5f0acc5064)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-10-17 11:48:47 +02:00
parent b786eed33a
commit b97aaf791f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/g729postfilter.c
View File

@ -346,7 +346,7 @@ static int16_t long_term_filter(AudioDSPContext *adsp, int pitch_delay_int,
L_temp1 = gain_long_num * gain_long_num; L_temp1 = gain_long_num * gain_long_num;
L_temp1 = MULL(L_temp1, gain_den, FRAC_BITS); L_temp1 = MULL(L_temp1, gain_den, FRAC_BITS);
tmp = ((sh_gain_long_num - sh_gain_num) << 1) - (sh_gain_long_den - sh_gain_den); tmp = ((sh_gain_long_num - sh_gain_num) * 2) - (sh_gain_long_den - sh_gain_den);
if (tmp > 0) if (tmp > 0)
L_temp0 >>= tmp; L_temp0 >>= tmp;
else else
@ -367,7 +367,7 @@ static int16_t long_term_filter(AudioDSPContext *adsp, int pitch_delay_int,
/* Rescale selected signal to original value. */ /* Rescale selected signal to original value. */
if (shift > 0) if (shift > 0)
for (i = 0; i < subframe_size; i++) for (i = 0; i < subframe_size; i++)
selected_signal[i] <<= shift; selected_signal[i] *= 1 << shift;
else else
for (i = 0; i < subframe_size; i++) for (i = 0; i < subframe_size; i++)
selected_signal[i] >>= -shift; selected_signal[i] >>= -shift;
@ -464,7 +464,7 @@ static int16_t get_tilt_comp(AudioDSPContext *adsp, int16_t *lp_gn,
speech[i] = (speech[i] * temp + 0x4000) >> 15; speech[i] = (speech[i] * temp + 0x4000) >> 15;
} }
return -(rh1 << 15) / rh0; return -(rh1 * (1 << 15)) / rh0;
} }
/** /**