mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-08 06:09:50 +00:00
swscale/output: Fix unsigned cast position in yuv2*
Fixes: signed overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 566e9032b1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
parent
716cf25eb8
commit
dcf7f9b70c
1 changed files with 45 additions and 45 deletions
|
|
@ -503,8 +503,8 @@ static void yuv2nv12cX_c(enum AVPixelFormat dstFormat, const uint8_t *chrDither,
|
||||||
int v = chrDither[(i + 3) & 7] << 12;
|
int v = chrDither[(i + 3) & 7] << 12;
|
||||||
int j;
|
int j;
|
||||||
for (j=0; j<chrFilterSize; j++) {
|
for (j=0; j<chrFilterSize; j++) {
|
||||||
u += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
u += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
v += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
v += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
dest[2*i]= av_clip_uint8(u>>19);
|
dest[2*i]= av_clip_uint8(u>>19);
|
||||||
|
|
@ -516,8 +516,8 @@ static void yuv2nv12cX_c(enum AVPixelFormat dstFormat, const uint8_t *chrDither,
|
||||||
int v = chrDither[(i + 3) & 7] << 12;
|
int v = chrDither[(i + 3) & 7] << 12;
|
||||||
int j;
|
int j;
|
||||||
for (j=0; j<chrFilterSize; j++) {
|
for (j=0; j<chrFilterSize; j++) {
|
||||||
u += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
u += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
v += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
v += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
dest[2*i]= av_clip_uint8(v>>19);
|
dest[2*i]= av_clip_uint8(v>>19);
|
||||||
|
|
@ -577,8 +577,8 @@ static void yuv2p01xcX_c(int big_endian, const uint8_t *chrDither,
|
||||||
int v = 1 << (shift - 1);
|
int v = 1 << (shift - 1);
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
u += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
u += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
v += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
v += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
output_pixel(&dest[2*i] , u);
|
output_pixel(&dest[2*i] , u);
|
||||||
|
|
@ -678,8 +678,8 @@ yuv2mono_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int Y2 = 1 << 18;
|
int Y2 = 1 << 18;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++) {
|
for (j = 0; j < lumFilterSize; j++) {
|
||||||
Y1 += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y1 += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
Y2 += (unsigned)(lumSrc[j][i+1] * lumFilter[j]);
|
Y2 += lumSrc[j][i+1] * (unsigned)lumFilter[j];
|
||||||
}
|
}
|
||||||
Y1 >>= 19;
|
Y1 >>= 19;
|
||||||
Y2 >>= 19;
|
Y2 >>= 19;
|
||||||
|
|
@ -896,12 +896,12 @@ yuv2422_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int V = 1 << 18;
|
int V = 1 << 18;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++) {
|
for (j = 0; j < lumFilterSize; j++) {
|
||||||
Y1 += (unsigned)(lumSrc[j][i * 2] * lumFilter[j]);
|
Y1 += lumSrc[j][i * 2] * (unsigned)lumFilter[j];
|
||||||
Y2 += (unsigned)(lumSrc[j][i * 2 + 1] * lumFilter[j]);
|
Y2 += lumSrc[j][i * 2 + 1] * (unsigned)lumFilter[j];
|
||||||
}
|
}
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
Y1 >>= 19;
|
Y1 >>= 19;
|
||||||
Y2 >>= 19;
|
Y2 >>= 19;
|
||||||
|
|
@ -1802,12 +1802,12 @@ yuv2rgb_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
const void *r, *g, *b;
|
const void *r, *g, *b;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++) {
|
for (j = 0; j < lumFilterSize; j++) {
|
||||||
Y1 += (unsigned)(lumSrc[j][i * 2] * lumFilter[j]);
|
Y1 += lumSrc[j][i * 2] * (unsigned)lumFilter[j];
|
||||||
Y2 += (unsigned)(lumSrc[j][i * 2 + 1] * lumFilter[j]);
|
Y2 += lumSrc[j][i * 2 + 1] * (unsigned)lumFilter[j];
|
||||||
}
|
}
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
Y1 >>= 19;
|
Y1 >>= 19;
|
||||||
Y2 >>= 19;
|
Y2 >>= 19;
|
||||||
|
|
@ -1817,8 +1817,8 @@ yuv2rgb_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
A1 = 1 << 18;
|
A1 = 1 << 18;
|
||||||
A2 = 1 << 18;
|
A2 = 1 << 18;
|
||||||
for (j = 0; j < lumFilterSize; j++) {
|
for (j = 0; j < lumFilterSize; j++) {
|
||||||
A1 += (unsigned)(alpSrc[j][i * 2 ] * lumFilter[j]);
|
A1 += alpSrc[j][i * 2 ] * (unsigned)lumFilter[j];
|
||||||
A2 += (unsigned)(alpSrc[j][i * 2 + 1] * lumFilter[j]);
|
A2 += alpSrc[j][i * 2 + 1] * (unsigned)lumFilter[j];
|
||||||
}
|
}
|
||||||
A1 >>= 19;
|
A1 >>= 19;
|
||||||
A2 >>= 19;
|
A2 >>= 19;
|
||||||
|
|
@ -2179,11 +2179,11 @@ yuv2rgb_full_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int V = (1<<9)-(128 << 19);
|
int V = (1<<9)-(128 << 19);
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++) {
|
for (j = 0; j < lumFilterSize; j++) {
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
}
|
}
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
Y >>= 10;
|
Y >>= 10;
|
||||||
U >>= 10;
|
U >>= 10;
|
||||||
|
|
@ -2191,7 +2191,7 @@ yuv2rgb_full_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
if (hasAlpha) {
|
if (hasAlpha) {
|
||||||
A = 1 << 18;
|
A = 1 << 18;
|
||||||
for (j = 0; j < lumFilterSize; j++) {
|
for (j = 0; j < lumFilterSize; j++) {
|
||||||
A += (unsigned)(alpSrc[j][i] * lumFilter[j]);
|
A += alpSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
}
|
}
|
||||||
A >>= 19;
|
A >>= 19;
|
||||||
if (A & 0x100)
|
if (A & 0x100)
|
||||||
|
|
@ -2360,11 +2360,11 @@ yuv2gbrp_full_X_c(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int R, G, B;
|
int R, G, B;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
Y >>= 10;
|
Y >>= 10;
|
||||||
|
|
@ -2375,7 +2375,7 @@ yuv2gbrp_full_X_c(SwsInternal *c, const int16_t *lumFilter,
|
||||||
A = 1 << 18;
|
A = 1 << 18;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
A += (unsigned)(alpSrc[j][i] * lumFilter[j]);
|
A += alpSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
if (A & 0xF8000000)
|
if (A & 0xF8000000)
|
||||||
A = av_clip_uintp2(A, 27);
|
A = av_clip_uintp2(A, 27);
|
||||||
|
|
@ -2679,7 +2679,7 @@ yuv2ya8_X_c(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int Y = 1 << 18, A = 1 << 18;
|
int Y = 1 << 18, A = 1 << 18;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
Y >>= 19;
|
Y >>= 19;
|
||||||
if (Y & 0x100)
|
if (Y & 0x100)
|
||||||
|
|
@ -2687,7 +2687,7 @@ yuv2ya8_X_c(SwsInternal *c, const int16_t *lumFilter,
|
||||||
|
|
||||||
if (hasAlpha) {
|
if (hasAlpha) {
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
A += (unsigned)(alpSrc[j][i] * lumFilter[j]);
|
A += alpSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
A >>= 19;
|
A >>= 19;
|
||||||
|
|
||||||
|
|
@ -2793,11 +2793,11 @@ yuv2v30_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
Y = av_clip_uintp2(Y >> 17, 10);
|
Y = av_clip_uintp2(Y >> 17, 10);
|
||||||
|
|
@ -2847,11 +2847,11 @@ yuv2xv36_X_c(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++) {
|
for (j = 0; j < chrFilterSize; j++) {
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
output_pixels(dest + 8 * i + 2, Y, 15, 12, 4)
|
output_pixels(dest + 8 * i + 2, Y, 15, 12, 4)
|
||||||
|
|
@ -3011,13 +3011,13 @@ yuv2ayuv_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int V = 1 << 18, A = 255;
|
int V = 1 << 18, A = 255;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++)
|
for (j = 0; j < chrFilterSize; j++)
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++)
|
for (j = 0; j < chrFilterSize; j++)
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
|
|
||||||
Y >>= 19;
|
Y >>= 19;
|
||||||
U >>= 19;
|
U >>= 19;
|
||||||
|
|
@ -3034,7 +3034,7 @@ yuv2ayuv_X_c_template(SwsInternal *c, const int16_t *lumFilter,
|
||||||
A = 1 << 18;
|
A = 1 << 18;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
A += (unsigned)(alpSrc[j][i] * lumFilter[j]);
|
A += alpSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
A >>= 19;
|
A >>= 19;
|
||||||
|
|
||||||
|
|
@ -3105,13 +3105,13 @@ AYUVPACKEDWRAPPER(uyva, AV_PIX_FMT_UYVA)
|
||||||
int U = 1 << (shift - 1), V = 1 << (shift - 1); \
|
int U = 1 << (shift - 1), V = 1 << (shift - 1); \
|
||||||
\
|
\
|
||||||
for (j = 0; j < lumFilterSize; j++) { \
|
for (j = 0; j < lumFilterSize; j++) { \
|
||||||
Y1 += (unsigned)(lumSrc[j][i * 2] * lumFilter[j]); \
|
Y1 += lumSrc[j][i * 2] * (unsigned)lumFilter[j]; \
|
||||||
Y2 += (unsigned)(lumSrc[j][i * 2 + 1] * lumFilter[j]); \
|
Y2 += lumSrc[j][i * 2 + 1] * (unsigned)lumFilter[j]; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
for (j = 0; j < chrFilterSize; j++) { \
|
for (j = 0; j < chrFilterSize; j++) { \
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]); \
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j]; \
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]); \
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j]; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
output_pixel(dest + 8 * i + 0, Y1, bits); \
|
output_pixel(dest + 8 * i + 0, Y1, bits); \
|
||||||
|
|
@ -3259,13 +3259,13 @@ yuv2vyu444_X_c(SwsInternal *c, const int16_t *lumFilter,
|
||||||
int V = 1 << 18;
|
int V = 1 << 18;
|
||||||
|
|
||||||
for (j = 0; j < lumFilterSize; j++)
|
for (j = 0; j < lumFilterSize; j++)
|
||||||
Y += (unsigned)(lumSrc[j][i] * lumFilter[j]);
|
Y += lumSrc[j][i] * (unsigned)lumFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++)
|
for (j = 0; j < chrFilterSize; j++)
|
||||||
U += (unsigned)(chrUSrc[j][i] * chrFilter[j]);
|
U += chrUSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
|
|
||||||
for (j = 0; j < chrFilterSize; j++)
|
for (j = 0; j < chrFilterSize; j++)
|
||||||
V += (unsigned)(chrVSrc[j][i] * chrFilter[j]);
|
V += chrVSrc[j][i] * (unsigned)chrFilter[j];
|
||||||
|
|
||||||
Y >>= 19;
|
Y >>= 19;
|
||||||
U >>= 19;
|
U >>= 19;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue