Skip to content

F
ffmpeg
Commit 1ff19987 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

swscale/yuv2rgb: Fix vertical dither offset with slices 

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit be3c29e3)
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent e6dcdee1
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 21 deletions
libswscale/yuv2rgb.c
View file @ 1ff19987
...@@ -124,10 +124,11 @@ const int *sws_getCoefficients(int colorspace) ...@@ -124,10 +124,11 @@ const int *sws_getCoefficients(int colorspace)
srcStride[2] *= 2; \ srcStride[2] *= 2; \
} \ } \
for (y = 0; y < srcSliceH; y += 2) { \ for (y = 0; y < srcSliceH; y += 2) { \
int yd = y + srcSliceY; \
dst_type *dst_1 = \ dst_type *dst_1 = \
(dst_type *)(dst[0] + (y + srcSliceY) * dstStride[0]); \ (dst_type *)(dst[0] + (yd) * dstStride[0]); \
dst_type *dst_2 = \ dst_type *dst_2 = \
(dst_type *)(dst[0] + (y + srcSliceY + 1) * dstStride[0]); \ (dst_type *)(dst[0] + (yd + 1) * dstStride[0]); \
dst_type av_unused *r, *g, *b; \ dst_type av_unused *r, *g, *b; \
const uint8_t *py_1 = src[0] + y * srcStride[0]; \ const uint8_t *py_1 = src[0] + y * srcStride[0]; \
const uint8_t *py_2 = py_1 + srcStride[0]; \ const uint8_t *py_2 = py_1 + srcStride[0]; \
...@@ -476,8 +477,8 @@ CLOSEYUV2RGBFUNC(8) ...@@ -476,8 +477,8 @@ CLOSEYUV2RGBFUNC(8)
// r, g, b, dst_1, dst_2 // r, g, b, dst_1, dst_2
YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0)
const uint8_t *d32 = ff_dither_8x8_32[y & 7]; const uint8_t *d32 = ff_dither_8x8_32[yd & 7];
const uint8_t *d64 = ff_dither_8x8_73[y & 7]; const uint8_t *d64 = ff_dither_8x8_73[yd & 7];
#define PUTRGB8(dst, src, i, o) \ #define PUTRGB8(dst, src, i, o) \
Y = src[2 * i]; \ Y = src[2 * i]; \
...@@ -506,8 +507,8 @@ YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0) ...@@ -506,8 +507,8 @@ YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0)
PUTRGB8(dst_1, py_1, 3, 6); PUTRGB8(dst_1, py_1, 3, 6);
ENDYUV2RGBLINE(8, 0) ENDYUV2RGBLINE(8, 0)
const uint8_t *d32 = ff_dither_8x8_32[y & 7]; const uint8_t *d32 = ff_dither_8x8_32[yd & 7];
const uint8_t *d64 = ff_dither_8x8_73[y & 7]; const uint8_t *d64 = ff_dither_8x8_73[yd & 7];
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB8(dst_1, py_1, 0, 0); PUTRGB8(dst_1, py_1, 0, 0);
PUTRGB8(dst_2, py_2, 0, 0 + 8); PUTRGB8(dst_2, py_2, 0, 0 + 8);
...@@ -517,8 +518,8 @@ ENDYUV2RGBLINE(8, 0) ...@@ -517,8 +518,8 @@ ENDYUV2RGBLINE(8, 0)
PUTRGB8(dst_1, py_1, 1, 2); PUTRGB8(dst_1, py_1, 1, 2);
ENDYUV2RGBLINE(8, 1) ENDYUV2RGBLINE(8, 1)
const uint8_t *d32 = ff_dither_8x8_32[y & 7]; const uint8_t *d32 = ff_dither_8x8_32[yd & 7];
const uint8_t *d64 = ff_dither_8x8_73[y & 7]; const uint8_t *d64 = ff_dither_8x8_73[yd & 7];
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB8(dst_1, py_1, 0, 0); PUTRGB8(dst_1, py_1, 0, 0);
PUTRGB8(dst_2, py_2, 0, 0 + 8); PUTRGB8(dst_2, py_2, 0, 0 + 8);
...@@ -527,8 +528,8 @@ ENDYUV2RGBFUNC() ...@@ -527,8 +528,8 @@ ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0)
const uint8_t * d64 = ff_dither_8x8_73[y & 7]; const uint8_t * d64 = ff_dither_8x8_73[yd & 7];
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
int acc; int acc;
#define PUTRGB4D(dst, src, i, o) \ #define PUTRGB4D(dst, src, i, o) \
...@@ -559,8 +560,8 @@ YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0) ...@@ -559,8 +560,8 @@ YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0)
PUTRGB4D(dst_1, py_1, 3, 6); PUTRGB4D(dst_1, py_1, 3, 6);
ENDYUV2RGBLINE(4, 0) ENDYUV2RGBLINE(4, 0)
const uint8_t * d64 = ff_dither_8x8_73[y & 7]; const uint8_t * d64 = ff_dither_8x8_73[yd & 7];
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
int acc; int acc;
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB4D(dst_1, py_1, 0, 0); PUTRGB4D(dst_1, py_1, 0, 0);
...@@ -571,8 +572,8 @@ ENDYUV2RGBLINE(4, 0) ...@@ -571,8 +572,8 @@ ENDYUV2RGBLINE(4, 0)
PUTRGB4D(dst_1, py_1, 1, 2); PUTRGB4D(dst_1, py_1, 1, 2);
ENDYUV2RGBLINE(4, 1) ENDYUV2RGBLINE(4, 1)
const uint8_t * d64 = ff_dither_8x8_73[y & 7]; const uint8_t * d64 = ff_dither_8x8_73[yd & 7];
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
int acc; int acc;
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB4D(dst_1, py_1, 0, 0); PUTRGB4D(dst_1, py_1, 0, 0);
...@@ -580,8 +581,8 @@ ENDYUV2RGBLINE(4, 1) ...@@ -580,8 +581,8 @@ ENDYUV2RGBLINE(4, 1)
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0)
const uint8_t *d64 = ff_dither_8x8_73[y & 7]; const uint8_t *d64 = ff_dither_8x8_73[yd & 7];
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
#define PUTRGB4DB(dst, src, i, o) \ #define PUTRGB4DB(dst, src, i, o) \
Y = src[2 * i]; \ Y = src[2 * i]; \
...@@ -609,8 +610,8 @@ YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0) ...@@ -609,8 +610,8 @@ YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0)
PUTRGB4DB(dst_2, py_2, 3, 6 + 8); PUTRGB4DB(dst_2, py_2, 3, 6 + 8);
PUTRGB4DB(dst_1, py_1, 3, 6); PUTRGB4DB(dst_1, py_1, 3, 6);
ENDYUV2RGBLINE(8, 0) ENDYUV2RGBLINE(8, 0)
const uint8_t *d64 = ff_dither_8x8_73[y & 7]; const uint8_t *d64 = ff_dither_8x8_73[yd & 7];
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB4DB(dst_1, py_1, 0, 0); PUTRGB4DB(dst_1, py_1, 0, 0);
PUTRGB4DB(dst_2, py_2, 0, 0 + 8); PUTRGB4DB(dst_2, py_2, 0, 0 + 8);
...@@ -619,15 +620,15 @@ ENDYUV2RGBLINE(8, 0) ...@@ -619,15 +620,15 @@ ENDYUV2RGBLINE(8, 0)
PUTRGB4DB(dst_2, py_2, 1, 2 + 8); PUTRGB4DB(dst_2, py_2, 1, 2 + 8);
PUTRGB4DB(dst_1, py_1, 1, 2); PUTRGB4DB(dst_1, py_1, 1, 2);
ENDYUV2RGBLINE(8, 1) ENDYUV2RGBLINE(8, 1)
const uint8_t *d64 = ff_dither_8x8_73[y & 7]; const uint8_t *d64 = ff_dither_8x8_73[yd & 7];
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
LOADCHROMA(0); LOADCHROMA(0);
PUTRGB4DB(dst_1, py_1, 0, 0); PUTRGB4DB(dst_1, py_1, 0, 0);
PUTRGB4DB(dst_2, py_2, 0, 0 + 8); PUTRGB4DB(dst_2, py_2, 0, 0 + 8);
ENDYUV2RGBFUNC() ENDYUV2RGBFUNC()
YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0) YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0)
const uint8_t *d128 = ff_dither_8x8_220[y & 7]; const uint8_t *d128 = ff_dither_8x8_220[yd & 7];
char out_1 = 0, out_2 = 0; char out_1 = 0, out_2 = 0;
g = c->table_gU[128 + YUVRGB_TABLE_HEADROOM] + c->table_gV[128 + YUVRGB_TABLE_HEADROOM]; g = c->table_gU[128 + YUVRGB_TABLE_HEADROOM] + c->table_gV[128 + YUVRGB_TABLE_HEADROOM];
......
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