highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/asrc_sine: Fix invalid left shift of negative number

Browse Source 
by using a multiplication instead. The multiplication can never overflow
an int because the sin-factor is only an int16_t.

Affected the FATE-tests filter-concat and filter-concat-vfr.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 55b46902c1f855d02ea802de1285d68577a38806)
This commit is contained in:
Andreas Rheinhardt 2020-01-22 02:05:10 +01:00 committed by Andreas Rheinhardt
parent 9f011f0876
commit da4b64ea02
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/asrc_sine.c
View File

@ -247,7 +247,7 @@ static int request_frame(AVFilterLink *outlink)
samples[i] = sine->sin[sine->phi >> (32 - LOG_PERIOD)];
sine->phi += sine->dphi;
if (sine->beep_index < sine->beep_length) {
samples[i] += sine->sin[sine->phi_beep >> (32 - LOG_PERIOD)] << 1;
samples[i] += sine->sin[sine->phi_beep >> (32 - LOG_PERIOD)] * 2;
sine->phi_beep += sine->dphi_beep;
}
if (++sine->beep_index == sine->beep_period)