x86/swscale: disable AVX2 yuv2nv12cX functions if accurate_rnd is requested

jamrial · jamrial · commit 2eb9c35010fe · 2024-11-07T11:16:42.000-03:00
Signed-off-by: James Almer &lt;jamrial@gmail.com&gt;
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
@@ -678,6 +678,7 @@ switch(c->dstBpc){ \
             case_rgb(abgr,  ABGR,  avx2);
             case_rgb(argb,  ARGB,  avx2);
             }
+        if (!(c->flags & SWS_ACCURATE_RND)) // FIXME
         switch (c->dstFormat) {
         case AV_PIX_FMT_NV12:
         case AV_PIX_FMT_NV24:
diff --git a/tests/ref/pixfmt/gbrp10-nv12 b/tests/ref/pixfmt/gbrp10-nv12
@@ -1,2 +1,2 @@
-dfeb7f05970bae694ed8713d284b3f7e *tests/data/pixfmt/gbrp10-nv12.yuv
+c1e554255de934b10fbffda5121f2680 *tests/data/pixfmt/gbrp10-nv12.yuv
 15206400 tests/data/pixfmt/gbrp10-nv12.yuv
diff --git a/tests/ref/pixfmt/gbrp10-nv24 b/tests/ref/pixfmt/gbrp10-nv24
@@ -1,2 +1,2 @@
-df99a669100970de2adfdbf78d3d6282 *tests/data/pixfmt/gbrp10-nv24.yuv
+e40afe127b0d698b03e1165603e871e1 *tests/data/pixfmt/gbrp10-nv24.yuv
 15206400 tests/data/pixfmt/gbrp10-nv24.yuv
diff --git a/tests/ref/pixfmt/gbrp12-nv12 b/tests/ref/pixfmt/gbrp12-nv12
@@ -1,2 +1,2 @@
-368d99ad7c86b5a0094b15bbebf6490b *tests/data/pixfmt/gbrp12-nv12.yuv
+faa7b7f6332300263711e46d8c6a1841 *tests/data/pixfmt/gbrp12-nv12.yuv
 15206400 tests/data/pixfmt/gbrp12-nv12.yuv
diff --git a/tests/ref/pixfmt/gbrp12-nv24 b/tests/ref/pixfmt/gbrp12-nv24
@@ -1,2 +1,2 @@
-138fe6d7116b1a9d525bd70c355de633 *tests/data/pixfmt/gbrp12-nv24.yuv
+e285d138f196a7b9e13e4703c97420d2 *tests/data/pixfmt/gbrp12-nv24.yuv
 15206400 tests/data/pixfmt/gbrp12-nv24.yuv
diff --git a/tests/ref/pixfmt/rgb48-nv12 b/tests/ref/pixfmt/rgb48-nv12
@@ -1,2 +1,2 @@
-6bb4022bd553678f751c6a198167c55e *tests/data/pixfmt/rgb48-nv12.yuv
+2a9817112e5dab50d753eb331eac2c34 *tests/data/pixfmt/rgb48-nv12.yuv
 15206400 tests/data/pixfmt/rgb48-nv12.yuv
diff --git a/tests/ref/pixfmt/rgb48-nv24 b/tests/ref/pixfmt/rgb48-nv24
@@ -1,2 +1,2 @@
-01398d67e0844599253574c67fa2f608 *tests/data/pixfmt/rgb48-nv24.yuv
+fbb12a3f411e34fec877c03cb41ad455 *tests/data/pixfmt/rgb48-nv24.yuv
 15206400 tests/data/pixfmt/rgb48-nv24.yuv
diff --git a/tests/ref/pixfmt/yuv444p10-nv12 b/tests/ref/pixfmt/yuv444p10-nv12
@@ -1,2 +1,2 @@
-bd5e32b13acc3f3431e5fc0c14466b4f *tests/data/pixfmt/yuv444p10-nv12.yuv
+27fc9d596cdb023945263f612de8d7d0 *tests/data/pixfmt/yuv444p10-nv12.yuv
 15206400 tests/data/pixfmt/yuv444p10-nv12.yuv
diff --git a/tests/ref/pixfmt/yuv444p10-nv24 b/tests/ref/pixfmt/yuv444p10-nv24
@@ -1,2 +1,2 @@
-12e33acf9605dd7b8c3f2ce4bec5b275 *tests/data/pixfmt/yuv444p10-nv24.yuv
+6af215bf78cba3fa3e22b85b202e0a2c *tests/data/pixfmt/yuv444p10-nv24.yuv
 15206400 tests/data/pixfmt/yuv444p10-nv24.yuv
diff --git a/tests/ref/pixfmt/yuv444p12-nv12 b/tests/ref/pixfmt/yuv444p12-nv12
@@ -1,2 +1,2 @@
-b123008efd2e1793c90d6aede028004b *tests/data/pixfmt/yuv444p12-nv12.yuv
+02679cf4ddfb12d1f4ba03d54a949d9e *tests/data/pixfmt/yuv444p12-nv12.yuv
 15206400 tests/data/pixfmt/yuv444p12-nv12.yuv
diff --git a/tests/ref/pixfmt/yuv444p12-nv24 b/tests/ref/pixfmt/yuv444p12-nv24
@@ -1,2 +1,2 @@
-fe5f29ca40140c63f082029bfd23047d *tests/data/pixfmt/yuv444p12-nv24.yuv
+3457a9ef6af639e0b1565d01b3e145e5 *tests/data/pixfmt/yuv444p12-nv24.yuv
 15206400 tests/data/pixfmt/yuv444p12-nv24.yuv

Original file line number	Diff line number	Diff line change
`@@ -678,6 +678,7 @@ switch(c->dstBpc){ \`
`678`	`678`	`case_rgb(abgr, ABGR, avx2);`
`679`	`679`	`case_rgb(argb, ARGB, avx2);`
`680`	`680`	`}`
	`681`	`+ if (!(c->flags & SWS_ACCURATE_RND)) // FIXME`
`681`	`682`	`switch (c->dstFormat) {`
`682`	`683`	`case AV_PIX_FMT_NV12:`
`683`	`684`	`case AV_PIX_FMT_NV24:`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-dfeb7f05970bae694ed8713d284b3f7e *tests/data/pixfmt/gbrp10-nv12.yuv`
	`1`	`+c1e554255de934b10fbffda5121f2680 *tests/data/pixfmt/gbrp10-nv12.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/gbrp10-nv12.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-df99a669100970de2adfdbf78d3d6282 *tests/data/pixfmt/gbrp10-nv24.yuv`
	`1`	`+e40afe127b0d698b03e1165603e871e1 *tests/data/pixfmt/gbrp10-nv24.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/gbrp10-nv24.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-368d99ad7c86b5a0094b15bbebf6490b *tests/data/pixfmt/gbrp12-nv12.yuv`
	`1`	`+faa7b7f6332300263711e46d8c6a1841 *tests/data/pixfmt/gbrp12-nv12.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/gbrp12-nv12.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-138fe6d7116b1a9d525bd70c355de633 *tests/data/pixfmt/gbrp12-nv24.yuv`
	`1`	`+e285d138f196a7b9e13e4703c97420d2 *tests/data/pixfmt/gbrp12-nv24.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/gbrp12-nv24.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-6bb4022bd553678f751c6a198167c55e *tests/data/pixfmt/rgb48-nv12.yuv`
	`1`	`+2a9817112e5dab50d753eb331eac2c34 *tests/data/pixfmt/rgb48-nv12.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/rgb48-nv12.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-01398d67e0844599253574c67fa2f608 *tests/data/pixfmt/rgb48-nv24.yuv`
	`1`	`+fbb12a3f411e34fec877c03cb41ad455 *tests/data/pixfmt/rgb48-nv24.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/rgb48-nv24.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-bd5e32b13acc3f3431e5fc0c14466b4f *tests/data/pixfmt/yuv444p10-nv12.yuv`
	`1`	`+27fc9d596cdb023945263f612de8d7d0 *tests/data/pixfmt/yuv444p10-nv12.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/yuv444p10-nv12.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-12e33acf9605dd7b8c3f2ce4bec5b275 *tests/data/pixfmt/yuv444p10-nv24.yuv`
	`1`	`+6af215bf78cba3fa3e22b85b202e0a2c *tests/data/pixfmt/yuv444p10-nv24.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/yuv444p10-nv24.yuv`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-b123008efd2e1793c90d6aede028004b *tests/data/pixfmt/yuv444p12-nv12.yuv`
	`1`	`+02679cf4ddfb12d1f4ba03d54a949d9e *tests/data/pixfmt/yuv444p12-nv12.yuv`
`2`	`2`	`15206400 tests/data/pixfmt/yuv444p12-nv12.yuv`