har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/vf_codecview: Fix undefined left shifts of negative numbers

Browse Source 
Affected the filter-codecview-mvs FATE-test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 3c151e79991181c8b7b9f9b888ac46eba91c5012)
This commit is contained in:
Andreas Rheinhardt 2021-03-26 16:24:59 +01:00 committed by Andreas Rheinhardt
parent 195cce45cf
commit cc3b05e424
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_codecview.c
View File

@ -141,7 +141,7 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey,
} }
buf += sx + sy * stride; buf += sx + sy * stride;
ex -= sx; ex -= sx;
f = ((ey - sy) << 16) / ex; f = ((ey - sy) * (1 << 16)) / ex;
for (x = 0; x <= ex; x++) { for (x = 0; x <= ex; x++) {
y = (x * f) >> 16; y = (x * f) >> 16;
fr = (x * f) & 0xFFFF; fr = (x * f) & 0xFFFF;
@ -156,7 +156,7 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey,
buf += sx + sy * stride; buf += sx + sy * stride;
ey -= sy; ey -= sy;
if (ey) if (ey)
f = ((ex - sx) << 16) / ey; f = ((ex - sx) * (1 << 16)) / ey;
else else
f = 0; f = 0;
for(y= 0; y <= ey; y++){ for(y= 0; y <= ey; y++){
@ -199,8 +199,8 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex,
int length = sqrt((rx * rx + ry * ry) << 8); int length = sqrt((rx * rx + ry * ry) << 8);
// FIXME subpixel accuracy // FIXME subpixel accuracy
rx = ROUNDED_DIV(rx * 3 << 4, length); rx = ROUNDED_DIV(rx * (3 << 4), length);
ry = ROUNDED_DIV(ry * 3 << 4, length); ry = ROUNDED_DIV(ry * (3 << 4), length);
if (tail) { if (tail) {
rx = -rx; rx = -rx;