virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

swscale/unscaled: correctly round yuv2yuv when not dithering

Browse Source 
We should at least bias towards the nearest integer, instead of always
rounding down, when not dithering. This is a bit more correct.

The FATE changes are only in the cases where sws_dither was explicitly set
to "none", which is exactly as expected.

Signed-off-by: Niklas Haas <git@haasn.dev>
Sponsored-by: Sovereign Tech Fund
This commit is contained in:
Niklas Haas
2024-12-17 15:20:14 +01:00
parent a9ae2cc14d
commit c6bf7f6645
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libswscale/swscale_unscaled.c
View File

@@ -2075,20 +2075,21 @@ static int packedCopyWrapper(SwsInternal *c, const uint8_t *const src[],
#define DITHER_COPY(dst, dstStride, src, srcStride, bswap, dbswap)\ #define DITHER_COPY(dst, dstStride, src, srcStride, bswap, dbswap)\
unsigned shift= src_depth-dst_depth, tmp;\ unsigned shift= src_depth-dst_depth, tmp;\
unsigned bias = 1 << (shift - 1);\
if (c->opts.dither == SWS_DITHER_NONE) {\ if (c->opts.dither == SWS_DITHER_NONE) {\
for (i = 0; i < height; i++) {\ for (i = 0; i < height; i++) {\
for (j = 0; j < length-7; j+=8) {\ for (j = 0; j < length-7; j+=8) {\
dst[j+0] = dbswap(bswap(src[j+0])>>shift);\ tmp = (bswap(src[j+0]) + bias)>>shift; dst[j+0] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+1] = dbswap(bswap(src[j+1])>>shift);\ tmp = (bswap(src[j+1]) + bias)>>shift; dst[j+1] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+2] = dbswap(bswap(src[j+2])>>shift);\ tmp = (bswap(src[j+2]) + bias)>>shift; dst[j+2] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+3] = dbswap(bswap(src[j+3])>>shift);\ tmp = (bswap(src[j+3]) + bias)>>shift; dst[j+3] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+4] = dbswap(bswap(src[j+4])>>shift);\ tmp = (bswap(src[j+4]) + bias)>>shift; dst[j+4] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+5] = dbswap(bswap(src[j+5])>>shift);\ tmp = (bswap(src[j+5]) + bias)>>shift; dst[j+5] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+6] = dbswap(bswap(src[j+6])>>shift);\ tmp = (bswap(src[j+6]) + bias)>>shift; dst[j+6] = dbswap(tmp - (tmp>>dst_depth));\
dst[j+7] = dbswap(bswap(src[j+7])>>shift);\ tmp = (bswap(src[j+7]) + bias)>>shift; dst[j+7] = dbswap(tmp - (tmp>>dst_depth));\
}\ }\
for (; j < length; j++) {\ for (; j < length; j++) {\
dst[j] = dbswap(bswap(src[j])>>shift);\ tmp = (bswap(src[j]) + bias)>>shift; dst[j] = dbswap(tmp - (tmp>>dst_depth));\
}\ }\
dst += dstStride;\ dst += dstStride;\
src += srcStride;\ src += srcStride;\
@@ -2169,6 +2170,7 @@ static int planarCopyWrapper(SwsInternal *c, const uint8_t *const src[],
uint16_t *dstPtr2 = (uint16_t*)dstPtr; uint16_t *dstPtr2 = (uint16_t*)dstPtr;
if (dst_depth == 8) { if (dst_depth == 8) {
av_assert1(src_depth > 8);
if(isBE(c->opts.src_format) == HAVE_BIGENDIAN){ if(isBE(c->opts.src_format) == HAVE_BIGENDIAN){
DITHER_COPY(dstPtr, dstStride[plane], srcPtr2, srcStride[plane]/2, , ) DITHER_COPY(dstPtr, dstStride[plane], srcPtr2, srcStride[plane]/2, , )
} else { } else {
@@ -2248,7 +2250,7 @@ static int planarCopyWrapper(SwsInternal *c, const uint8_t *const src[],
dstPtr2 += dstStride[plane]/2; dstPtr2 += dstStride[plane]/2;
srcPtr2 += srcStride[plane]/2; srcPtr2 += srcStride[plane]/2;
} }
} else { } else { /* src_depth > dst_depth */
if(isBE(c->opts.src_format) == HAVE_BIGENDIAN){ if(isBE(c->opts.src_format) == HAVE_BIGENDIAN){
if(isBE(c->opts.dst_format) == HAVE_BIGENDIAN){ if(isBE(c->opts.dst_format) == HAVE_BIGENDIAN){
DITHER_COPY(dstPtr2, dstStride[plane]/2, srcPtr2, srcStride[plane]/2, , ) DITHER_COPY(dstPtr2, dstStride[plane]/2, srcPtr2, srcStride[plane]/2, , )

2
tests/ref/pixfmt/yuv444p10-yuv444p
View File

@@ -1,2 +1,2 @@
1b783c5b90f43945b91b0b5be254aded *tests/data/pixfmt/yuv444p10-yuv444p.yuv 51b33e13d1f9f7f5da849f780262200c *tests/data/pixfmt/yuv444p10-yuv444p.yuv
15206400 tests/data/pixfmt/yuv444p10-yuv444p.yuv 15206400 tests/data/pixfmt/yuv444p10-yuv444p.yuv

2
tests/ref/pixfmt/yuv444p12-yuv444p
View File

@@ -1,2 +1,2 @@
9339fb7fd327f4131639c3b718eeccce *tests/data/pixfmt/yuv444p12-yuv444p.yuv 6b16abfcc822202064351794f08b6db8 *tests/data/pixfmt/yuv444p12-yuv444p.yuv
15206400 tests/data/pixfmt/yuv444p12-yuv444p.yuv 15206400 tests/data/pixfmt/yuv444p12-yuv444p.yuv

2
tests/ref/pixfmt/yuv444p12-yuv444p10be
View File

@@ -1,2 +1,2 @@
6f9fb7022d197765457c7a39645d8a3f *tests/data/pixfmt/yuv444p12-yuv444p10be.yuv d885def826d77206e10cd7f9bc2ce72a *tests/data/pixfmt/yuv444p12-yuv444p10be.yuv
15206400 tests/data/pixfmt/yuv444p12-yuv444p10be.yuv 15206400 tests/data/pixfmt/yuv444p12-yuv444p10be.yuv

2
tests/ref/pixfmt/yuv444p12-yuv444p10le
View File

@@ -1,2 +1,2 @@
6f9fb7022d197765457c7a39645d8a3f *tests/data/pixfmt/yuv444p12-yuv444p10le.yuv d885def826d77206e10cd7f9bc2ce72a *tests/data/pixfmt/yuv444p12-yuv444p10le.yuv
15206400 tests/data/pixfmt/yuv444p12-yuv444p10le.yuv 15206400 tests/data/pixfmt/yuv444p12-yuv444p10le.yuv