From d248929c059ff7629a85333699717d7a677d8d96 Mon Sep 17 00:00:00 2001
From: Frank Barchard <fbarchard@google.com>
Date: Tue, 12 Jul 2022 16:39:11 -0700
Subject: [PATCH] Enable 256x144 scale tests for libyuv

- This test used to fail on ARM, but is passing now, so re-enable
- Kept behind a flag so it can be disabled with /DDISABLE_SLOW_TESTS

Bug:  libyuv:905, b/197551385
Change-Id: Iff3c75c1778610c136621b595adee4b1004df9a5
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3758943
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
---
 README.chromium              | 2 +-
 include/libyuv/version.h     | 2 +-
 unit_test/scale_argb_test.cc | 4 ++--
 unit_test/scale_rgb_test.cc  | 6 ++----
 unit_test/scale_test.cc      | 4 ++--
 unit_test/scale_uv_test.cc   | 4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.chromium b/README.chromium
index 56dd4cba0..8fca6a3d3 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1832
+Version: 1833
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 8ef3493b9..7cc55698a 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1832
+#define LIBYUV_VERSION 1833
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index 9bd614149..f54a68f11 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -337,11 +337,11 @@ TEST_FACTOR(3, 1, 3)
 #endif
 
 TEST_SCALETO(ARGBScale, 1, 1)
-// TEST_SCALETO(ARGBScale, 256, 144) /* 128x72 * 2 */
-TEST_SCALETO(ARGBScale, 320, 240)
 TEST_SCALETO(ARGBScale, 569, 480)
 TEST_SCALETO(ARGBScale, 640, 360)
 #ifndef DISABLE_SLOW_TESTS
+TEST_SCALETO(ARGBScale, 256, 144) /* 128x72 * 2 */
+TEST_SCALETO(ARGBScale, 320, 240)
 TEST_SCALETO(ARGBScale, 1280, 720)
 TEST_SCALETO(ARGBScale, 1920, 1080)
 #endif  // DISABLE_SLOW_TESTS
diff --git a/unit_test/scale_rgb_test.cc b/unit_test/scale_rgb_test.cc
index e4703ee74..8296abe31 100644
--- a/unit_test/scale_rgb_test.cc
+++ b/unit_test/scale_rgb_test.cc
@@ -184,14 +184,12 @@ TEST_FACTOR(3, 1, 3)
   TEST_SCALETO1(name, width, height, Bilinear, 3)
 #endif
 
+TEST_SCALETO(RGBScale, 640, 360)
 #ifndef DISABLE_SLOW_TESTS
 TEST_SCALETO(RGBScale, 1, 1)
-#endif
-// TEST_SCALETO(RGBScale, 256, 144) /* 128x72 * 3 */
+TEST_SCALETO(RGBScale, 256, 144) /* 128x72 * 3 */
 TEST_SCALETO(RGBScale, 320, 240)
-#ifndef DISABLE_SLOW_TESTS
 TEST_SCALETO(RGBScale, 569, 480)
-TEST_SCALETO(RGBScale, 640, 360)
 TEST_SCALETO(RGBScale, 1280, 720)
 TEST_SCALETO(RGBScale, 1920, 1080)
 #endif  // DISABLE_SLOW_TESTS
diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc
index 81c839f41..a8c95268d 100644
--- a/unit_test/scale_test.cc
+++ b/unit_test/scale_test.cc
@@ -1044,11 +1044,11 @@ TEST_FACTOR(3, 1, 3, 0)
 #endif
 
 TEST_SCALETO(Scale, 1, 1)
-// TEST_SCALETO(Scale, 256, 144) /* 128x72 * 2 */
-TEST_SCALETO(Scale, 320, 240)
 TEST_SCALETO(Scale, 569, 480)
 TEST_SCALETO(Scale, 640, 360)
 #ifndef DISABLE_SLOW_TESTS
+TEST_SCALETO(Scale, 256, 144) /* 128x72 * 2 */
+TEST_SCALETO(Scale, 320, 240)
 TEST_SCALETO(Scale, 1280, 720)
 TEST_SCALETO(Scale, 1920, 1080)
 #endif  // DISABLE_SLOW_TESTS
diff --git a/unit_test/scale_uv_test.cc b/unit_test/scale_uv_test.cc
index a185fb63c..3d524bef1 100644
--- a/unit_test/scale_uv_test.cc
+++ b/unit_test/scale_uv_test.cc
@@ -183,11 +183,11 @@ TEST_FACTOR(3, 1, 3)
 #endif
 
 TEST_SCALETO(UVScale, 1, 1)
-// TEST_SCALETO(UVScale, 256, 144) /* 128x72 * 2 */
-TEST_SCALETO(UVScale, 320, 240)
 TEST_SCALETO(UVScale, 569, 480)
 TEST_SCALETO(UVScale, 640, 360)
 #ifndef DISABLE_SLOW_TESTS
+TEST_SCALETO(UVScale, 256, 144) /* 128x72 * 2 */
+TEST_SCALETO(UVScale, 320, 240)
 TEST_SCALETO(UVScale, 1280, 720)
 TEST_SCALETO(UVScale, 1920, 1080)
 #endif  // DISABLE_SLOW_TESTS