Skip to content

F
ffmpeg.wasm-core
Commit b64a72e1 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files
Options

yuv2rgb: handle line widths that are not a multiple of 4. 

This introduces support for width%4==2 in addition to width%4==0. For
odd widths, some more checks are needed, since the current code always
handles two luma items in a row, thus there is a possibility of an
overread by one.
parent 09d5e02a
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 16 deletions
libswscale/yuv2rgb.c
View file @ b64a72e1
...@@ -147,15 +147,15 @@ const int *sws_getCoefficients(int colorspace) ...@@ -147,15 +147,15 @@ const int *sws_getCoefficients(int colorspace)
while (h_size--) { \ while (h_size--) { \
int av_unused U, V, Y; \ int av_unused U, V, Y; \
#define ENDYUV2RGBLINE(dst_delta) \ #define ENDYUV2RGBLINE(dst_delta, ss) \
pu += 4; \ pu += 4 >> ss; \
pv += 4; \ pv += 4 >> ss; \
py_1 += 8; \ py_1 += 8 >> ss; \
py_2 += 8; \ py_2 += 8 >> ss; \
dst_1 += dst_delta; \ dst_1 += dst_delta >> ss; \
dst_2 += dst_delta; \ dst_2 += dst_delta >> ss; \
} \ } \
if (c->dstW & 4) { \ if (c->dstW & (4 >> ss)) { \
int av_unused Y, U, V; \ int av_unused Y, U, V; \
#define ENDYUV2RGBFUNC() \ #define ENDYUV2RGBFUNC() \
...@@ -165,7 +165,7 @@ const int *sws_getCoefficients(int colorspace) ...@@ -165,7 +165,7 @@ const int *sws_getCoefficients(int colorspace)
} }
#define CLOSEYUV2RGBFUNC(dst_delta) \ #define CLOSEYUV2RGBFUNC(dst_delta) \
ENDYUV2RGBLINE(dst_delta) \ ENDYUV2RGBLINE(dst_delta, 0) \
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_48, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_48, uint8_t, 0)
...@@ -184,7 +184,7 @@ YUV2RGBFUNC(yuv2rgb_c_48, uint8_t, 0) ...@@ -184,7 +184,7 @@ YUV2RGBFUNC(yuv2rgb_c_48, uint8_t, 0)
LOADCHROMA(3); LOADCHROMA(3);
PUTRGB48(dst_2, py_2, 3); PUTRGB48(dst_2, py_2, 3);
PUTRGB48(dst_1, py_1, 3); PUTRGB48(dst_1, py_1, 3);
ENDYUV2RGBLINE(48) ENDYUV2RGBLINE(48, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB48(dst_1, py_1, 0); PUTRGB48(dst_1, py_1, 0);
PUTRGB48(dst_2, py_2, 0); PUTRGB48(dst_2, py_2, 0);
...@@ -192,6 +192,10 @@ ENDYUV2RGBLINE(48) ...@@ -192,6 +192,10 @@ ENDYUV2RGBLINE(48)
LOADCHROMA(1); LOADCHROMA(1);
PUTRGB48(dst_2, py_2, 1); PUTRGB48(dst_2, py_2, 1);
PUTRGB48(dst_1, py_1, 1); PUTRGB48(dst_1, py_1, 1);
ENDYUV2RGBLINE(48, 1)
LOADCHROMA(0);
PUTRGB48(dst_1, py_1, 0);
PUTRGB48(dst_2, py_2, 0);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_bgr48, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_bgr48, uint8_t, 0)
...@@ -210,7 +214,7 @@ YUV2RGBFUNC(yuv2rgb_c_bgr48, uint8_t, 0) ...@@ -210,7 +214,7 @@ YUV2RGBFUNC(yuv2rgb_c_bgr48, uint8_t, 0)
LOADCHROMA(3); LOADCHROMA(3);
PUTBGR48(dst_2, py_2, 3); PUTBGR48(dst_2, py_2, 3);
PUTBGR48(dst_1, py_1, 3); PUTBGR48(dst_1, py_1, 3);
ENDYUV2RGBLINE(48) ENDYUV2RGBLINE(48, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTBGR48(dst_1, py_1, 0); PUTBGR48(dst_1, py_1, 0);
PUTBGR48(dst_2, py_2, 0); PUTBGR48(dst_2, py_2, 0);
...@@ -218,6 +222,10 @@ ENDYUV2RGBLINE(48) ...@@ -218,6 +222,10 @@ ENDYUV2RGBLINE(48)
LOADCHROMA(1); LOADCHROMA(1);
PUTBGR48(dst_2, py_2, 1); PUTBGR48(dst_2, py_2, 1);
PUTBGR48(dst_1, py_1, 1); PUTBGR48(dst_1, py_1, 1);
ENDYUV2RGBLINE(48, 1)
LOADCHROMA(0);
PUTBGR48(dst_1, py_1, 0);
PUTBGR48(dst_2, py_2, 0);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0) YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0)
...@@ -236,7 +244,7 @@ YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0) ...@@ -236,7 +244,7 @@ YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0)
LOADCHROMA(3); LOADCHROMA(3);
PUTRGB(dst_2, py_2, 3); PUTRGB(dst_2, py_2, 3);
PUTRGB(dst_1, py_1, 3); PUTRGB(dst_1, py_1, 3);
ENDYUV2RGBLINE(8) ENDYUV2RGBLINE(8, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB(dst_1, py_1, 0); PUTRGB(dst_1, py_1, 0);
PUTRGB(dst_2, py_2, 0); PUTRGB(dst_2, py_2, 0);
...@@ -244,6 +252,10 @@ ENDYUV2RGBLINE(8) ...@@ -244,6 +252,10 @@ ENDYUV2RGBLINE(8)
LOADCHROMA(1); LOADCHROMA(1);
PUTRGB(dst_2, py_2, 1); PUTRGB(dst_2, py_2, 1);
PUTRGB(dst_1, py_1, 1); PUTRGB(dst_1, py_1, 1);
ENDYUV2RGBLINE(8, 1)
LOADCHROMA(0);
PUTRGB(dst_1, py_1, 0);
PUTRGB(dst_2, py_2, 0);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1) YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1)
...@@ -264,7 +276,7 @@ YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1) ...@@ -264,7 +276,7 @@ YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1)
PUTRGBA(dst_1, py_1, pa_2, 3, 24); PUTRGBA(dst_1, py_1, pa_2, 3, 24);
pa_1 += 8; \ pa_1 += 8; \
pa_2 += 8; \ pa_2 += 8; \
ENDYUV2RGBLINE(8) ENDYUV2RGBLINE(8, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTRGBA(dst_1, py_1, pa_1, 0, 24); PUTRGBA(dst_1, py_1, pa_1, 0, 24);
PUTRGBA(dst_2, py_2, pa_2, 0, 24); PUTRGBA(dst_2, py_2, pa_2, 0, 24);
...@@ -272,6 +284,12 @@ ENDYUV2RGBLINE(8) ...@@ -272,6 +284,12 @@ ENDYUV2RGBLINE(8)
LOADCHROMA(1); LOADCHROMA(1);
PUTRGBA(dst_2, py_2, pa_1, 1, 24); PUTRGBA(dst_2, py_2, pa_1, 1, 24);
PUTRGBA(dst_1, py_1, pa_2, 1, 24); PUTRGBA(dst_1, py_1, pa_2, 1, 24);
pa_1 += 4; \
pa_2 += 4; \
ENDYUV2RGBLINE(8, 1)
LOADCHROMA(0);
PUTRGBA(dst_1, py_1, pa_1, 0, 24);
PUTRGBA(dst_2, py_2, pa_2, 0, 24);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuva2argb_c, uint32_t, 1) YUV2RGBFUNC(yuva2argb_c, uint32_t, 1)
...@@ -292,7 +310,7 @@ YUV2RGBFUNC(yuva2argb_c, uint32_t, 1) ...@@ -292,7 +310,7 @@ YUV2RGBFUNC(yuva2argb_c, uint32_t, 1)
PUTRGBA(dst_1, py_1, pa_1, 3, 0); PUTRGBA(dst_1, py_1, pa_1, 3, 0);
pa_1 += 8; \ pa_1 += 8; \
pa_2 += 8; \ pa_2 += 8; \
ENDYUV2RGBLINE(8) ENDYUV2RGBLINE(8, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTRGBA(dst_1, py_1, pa_1, 0, 0); PUTRGBA(dst_1, py_1, pa_1, 0, 0);
PUTRGBA(dst_2, py_2, pa_2, 0, 0); PUTRGBA(dst_2, py_2, pa_2, 0, 0);
...@@ -300,6 +318,12 @@ ENDYUV2RGBLINE(8) ...@@ -300,6 +318,12 @@ ENDYUV2RGBLINE(8)
LOADCHROMA(1); LOADCHROMA(1);
PUTRGBA(dst_2, py_2, pa_2, 1, 0); PUTRGBA(dst_2, py_2, pa_2, 1, 0);
PUTRGBA(dst_1, py_1, pa_1, 1, 0); PUTRGBA(dst_1, py_1, pa_1, 1, 0);
pa_1 += 4; \
pa_2 += 4; \
ENDYUV2RGBLINE(8, 1)
LOADCHROMA(0);
PUTRGBA(dst_1, py_1, pa_1, 0, 0);
PUTRGBA(dst_2, py_2, pa_2, 0, 0);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_24_rgb, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_24_rgb, uint8_t, 0)
...@@ -318,7 +342,7 @@ YUV2RGBFUNC(yuv2rgb_c_24_rgb, uint8_t, 0) ...@@ -318,7 +342,7 @@ YUV2RGBFUNC(yuv2rgb_c_24_rgb, uint8_t, 0)
LOADCHROMA(3); LOADCHROMA(3);
PUTRGB24(dst_2, py_2, 3); PUTRGB24(dst_2, py_2, 3);
PUTRGB24(dst_1, py_1, 3); PUTRGB24(dst_1, py_1, 3);
ENDYUV2RGBLINE(24) ENDYUV2RGBLINE(24, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB24(dst_1, py_1, 0); PUTRGB24(dst_1, py_1, 0);
PUTRGB24(dst_2, py_2, 0); PUTRGB24(dst_2, py_2, 0);
...@@ -326,6 +350,10 @@ ENDYUV2RGBLINE(24) ...@@ -326,6 +350,10 @@ ENDYUV2RGBLINE(24)
LOADCHROMA(1); LOADCHROMA(1);
PUTRGB24(dst_2, py_2, 1); PUTRGB24(dst_2, py_2, 1);
PUTRGB24(dst_1, py_1, 1); PUTRGB24(dst_1, py_1, 1);
ENDYUV2RGBLINE(24, 1)
LOADCHROMA(0);
PUTRGB24(dst_1, py_1, 0);
PUTRGB24(dst_2, py_2, 0);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
// only trivial mods from yuv2rgb_c_24_rgb // only trivial mods from yuv2rgb_c_24_rgb
...@@ -345,7 +373,7 @@ YUV2RGBFUNC(yuv2rgb_c_24_bgr, uint8_t, 0) ...@@ -345,7 +373,7 @@ YUV2RGBFUNC(yuv2rgb_c_24_bgr, uint8_t, 0)
LOADCHROMA(3); LOADCHROMA(3);
PUTBGR24(dst_2, py_2, 3); PUTBGR24(dst_2, py_2, 3);
PUTBGR24(dst_1, py_1, 3); PUTBGR24(dst_1, py_1, 3);
ENDYUV2RGBLINE(24) ENDYUV2RGBLINE(24, 0)
LOADCHROMA(0); LOADCHROMA(0);
PUTBGR24(dst_1, py_1, 0); PUTBGR24(dst_1, py_1, 0);
PUTBGR24(dst_2, py_2, 0); PUTBGR24(dst_2, py_2, 0);
...@@ -353,6 +381,10 @@ ENDYUV2RGBLINE(24) ...@@ -353,6 +381,10 @@ ENDYUV2RGBLINE(24)
LOADCHROMA(1); LOADCHROMA(1);
PUTBGR24(dst_2, py_2, 1); PUTBGR24(dst_2, py_2, 1);
PUTBGR24(dst_1, py_1, 1); PUTBGR24(dst_1, py_1, 1);
ENDYUV2RGBLINE(24, 1)
LOADCHROMA(0);
PUTBGR24(dst_1, py_1, 0);
PUTBGR24(dst_2, py_2, 0);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
// This is exactly the same code as yuv2rgb_c_32 except for the types of // This is exactly the same code as yuv2rgb_c_32 except for the types of
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment