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

swscale/output: Fix several invalid shifts in yuv2rgb_full_1_c_template()

Browse Source 
Fixes: Invalid shifts
Fixes: #8320

Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7b7f97532b2ac8836d8d8e3c71dd026e35ae1ca7)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-01-21 22:52:19 +01:00
parent 0ec11133d9
commit f541744f73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswscale/output.c
View File

@ -2099,7 +2099,7 @@ yuv2rgb_full_1_c_template(SwsContext *c, const int16_t *buf0,
if (uvalpha < 2048) { if (uvalpha < 2048) {
int A = 0; //init to silence warning int A = 0; //init to silence warning
for (i = 0; i < dstW; i++) { for (i = 0; i < dstW; i++) {
int Y = buf0[i] << 2; int Y = buf0[i] * 4;
int U = (ubuf0[i] - (128<<7)) * 4; int U = (ubuf0[i] - (128<<7)) * 4;
int V = (vbuf0[i] - (128<<7)) * 4; int V = (vbuf0[i] - (128<<7)) * 4;
@ -2116,9 +2116,9 @@ yuv2rgb_full_1_c_template(SwsContext *c, const int16_t *buf0,
const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1]; const int16_t *ubuf1 = ubuf[1], *vbuf1 = vbuf[1];
int A = 0; //init to silence warning int A = 0; //init to silence warning
for (i = 0; i < dstW; i++) { for (i = 0; i < dstW; i++) {
int Y = buf0[i] << 2; int Y = buf0[i] * 4;
int U = (ubuf0[i] + ubuf1[i] - (128<<8)) << 1; int U = (ubuf0[i] + ubuf1[i] - (128<<8)) * 2;
int V = (vbuf0[i] + vbuf1[i] - (128<<8)) << 1; int V = (vbuf0[i] + vbuf1[i] - (128<<8)) * 2;
if (hasAlpha) { if (hasAlpha) {
A = (abuf0[i] + 64) >> 7; A = (abuf0[i] + 64) >> 7;