Update libyuv to r1602 version to get best performance.
Bug: 29870647
Change-Id: I8ec9fab7f55765fa33ebe7ba1c7ad2147f418de2
diff --git a/files/unit_test/scale_test.cc b/files/unit_test/scale_test.cc
index 55b4148..f40443e 100644
--- a/files/unit_test/scale_test.cc
+++ b/files/unit_test/scale_test.cc
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
+ * in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
@@ -15,59 +15,65 @@
#include "libyuv/scale.h"
#include "../unit_test/unit_test.h"
+#define STRINGIZE(line) #line
+#define FILELINESTR(file, line) file ":" STRINGIZE(line)
+
namespace libyuv {
+// Test scaling with C vs Opt and return maximum pixel difference. 0 = exact.
static int TestFilter(int src_width, int src_height,
int dst_width, int dst_height,
- FilterMode f, int rounding, int benchmark_iterations) {
- const int b = 128 * rounding;
- int src_width_uv = (src_width + rounding) >> 1;
- int src_height_uv = (src_height + rounding) >> 1;
+ FilterMode f, int benchmark_iterations,
+ int disable_cpu_flags, int benchmark_cpu_info) {
+ if (!SizeValid(src_width, src_height, dst_width, dst_height)) {
+ return 0;
+ }
- int src_y_plane_size = (src_width + b * 2) * (src_height + b * 2);
- int src_uv_plane_size = (src_width_uv + b * 2) * (src_height_uv + b * 2);
+ int i, j;
+ const int b = 0; // 128 to test for padding/stride.
+ int src_width_uv = (Abs(src_width) + 1) >> 1;
+ int src_height_uv = (Abs(src_height) + 1) >> 1;
- int src_stride_y = b * 2 + src_width;
+ int64 src_y_plane_size = (Abs(src_width) + b * 2) * (Abs(src_height) + b * 2);
+ int64 src_uv_plane_size = (src_width_uv + b * 2) * (src_height_uv + b * 2);
+
+ int src_stride_y = b * 2 + Abs(src_width);
int src_stride_uv = b * 2 + src_width_uv;
align_buffer_page_end(src_y, src_y_plane_size)
align_buffer_page_end(src_u, src_uv_plane_size)
align_buffer_page_end(src_v, src_uv_plane_size)
+ if (!src_y || !src_u || !src_v) {
+ printf("Skipped. Alloc failed " FILELINESTR(__FILE__, __LINE__) "\n");
+ return 0;
+ }
+ MemRandomize(src_y, src_y_plane_size);
+ MemRandomize(src_u, src_uv_plane_size);
+ MemRandomize(src_v, src_uv_plane_size);
- int dst_width_uv = (dst_width + rounding) >> 1;
- int dst_height_uv = (dst_height + rounding) >> 1;
+ int dst_width_uv = (dst_width + 1) >> 1;
+ int dst_height_uv = (dst_height + 1) >> 1;
- int dst_y_plane_size = (dst_width + b * 2) * (dst_height + b * 2);
- int dst_uv_plane_size = (dst_width_uv + b * 2) * (dst_height_uv + b * 2);
+ int64 dst_y_plane_size = (dst_width + b * 2) * (dst_height + b * 2);
+ int64 dst_uv_plane_size = (dst_width_uv + b * 2) * (dst_height_uv + b * 2);
int dst_stride_y = b * 2 + dst_width;
int dst_stride_uv = b * 2 + dst_width_uv;
- srandom(time(NULL));
-
- int i, j;
- for (i = b; i < (src_height + b); ++i) {
- for (j = b; j < (src_width + b); ++j) {
- src_y[(i * src_stride_y) + j] = (random() & 0xff);
- }
- }
-
- for (i = b; i < (src_height_uv + b); ++i) {
- for (j = b; j < (src_width_uv + b); ++j) {
- src_u[(i * src_stride_uv) + j] = (random() & 0xff);
- src_v[(i * src_stride_uv) + j] = (random() & 0xff);
- }
- }
-
align_buffer_page_end(dst_y_c, dst_y_plane_size)
align_buffer_page_end(dst_u_c, dst_uv_plane_size)
align_buffer_page_end(dst_v_c, dst_uv_plane_size)
align_buffer_page_end(dst_y_opt, dst_y_plane_size)
align_buffer_page_end(dst_u_opt, dst_uv_plane_size)
align_buffer_page_end(dst_v_opt, dst_uv_plane_size)
+ if (!dst_y_c || !dst_u_c || !dst_v_c ||
+ !dst_y_opt|| !dst_u_opt|| !dst_v_opt) {
+ printf("Skipped. Alloc failed " FILELINESTR(__FILE__, __LINE__) "\n");
+ return 0;
+ }
- // Warm up both versions for consistent benchmarks.
- MaskCpuFlags(0); // Disable all CPU optimization.
+ MaskCpuFlags(disable_cpu_flags); // Disable all CPU optimization.
+ double c_time = get_time();
I420Scale(src_y + (src_stride_y * b) + b, src_stride_y,
src_u + (src_stride_uv * b) + b, src_stride_uv,
src_v + (src_stride_uv * b) + b, src_stride_uv,
@@ -76,31 +82,9 @@
dst_u_c + (dst_stride_uv * b) + b, dst_stride_uv,
dst_v_c + (dst_stride_uv * b) + b, dst_stride_uv,
dst_width, dst_height, f);
- MaskCpuFlags(-1); // Enable all CPU optimization.
- I420Scale(src_y + (src_stride_y * b) + b, src_stride_y,
- src_u + (src_stride_uv * b) + b, src_stride_uv,
- src_v + (src_stride_uv * b) + b, src_stride_uv,
- src_width, src_height,
- dst_y_opt + (dst_stride_y * b) + b, dst_stride_y,
- dst_u_opt + (dst_stride_uv * b) + b, dst_stride_uv,
- dst_v_opt + (dst_stride_uv * b) + b, dst_stride_uv,
- dst_width, dst_height, f);
+ c_time = (get_time() - c_time);
- MaskCpuFlags(0); // Disable all CPU optimization.
- double c_time = get_time();
- for (i = 0; i < benchmark_iterations; ++i) {
- I420Scale(src_y + (src_stride_y * b) + b, src_stride_y,
- src_u + (src_stride_uv * b) + b, src_stride_uv,
- src_v + (src_stride_uv * b) + b, src_stride_uv,
- src_width, src_height,
- dst_y_c + (dst_stride_y * b) + b, dst_stride_y,
- dst_u_c + (dst_stride_uv * b) + b, dst_stride_uv,
- dst_v_c + (dst_stride_uv * b) + b, dst_stride_uv,
- dst_width, dst_height, f);
- }
- c_time = (get_time() - c_time) / benchmark_iterations;
-
- MaskCpuFlags(-1); // Enable all CPU optimization.
+ MaskCpuFlags(benchmark_cpu_info); // Enable all CPU optimization.
double opt_time = get_time();
for (i = 0; i < benchmark_iterations; ++i) {
I420Scale(src_y + (src_stride_y * b) + b, src_stride_y,
@@ -113,10 +97,11 @@
dst_width, dst_height, f);
}
opt_time = (get_time() - opt_time) / benchmark_iterations;
-
// Report performance of C vs OPT
printf("filter %d - %8d us C - %8d us OPT\n",
- f, static_cast<int>(c_time*1e6), static_cast<int>(opt_time*1e6));
+ f,
+ static_cast<int>(c_time * 1e6),
+ static_cast<int>(opt_time * 1e6));
// C version may be a little off from the optimized. Order of
// operations may introduce rounding somewhere. So do a difference
@@ -125,7 +110,7 @@
int max_diff = 0;
for (i = b; i < (dst_height + b); ++i) {
for (j = b; j < (dst_width + b); ++j) {
- int abs_diff = abs(dst_y_c[(i * dst_stride_y) + j] -
+ int abs_diff = Abs(dst_y_c[(i * dst_stride_y) + j] -
dst_y_opt[(i * dst_stride_y) + j]);
if (abs_diff > max_diff) {
max_diff = abs_diff;
@@ -135,12 +120,12 @@
for (i = b; i < (dst_height_uv + b); ++i) {
for (j = b; j < (dst_width_uv + b); ++j) {
- int abs_diff = abs(dst_u_c[(i * dst_stride_uv) + j] -
+ int abs_diff = Abs(dst_u_c[(i * dst_stride_uv) + j] -
dst_u_opt[(i * dst_stride_uv) + j]);
if (abs_diff > max_diff) {
max_diff = abs_diff;
}
- abs_diff = abs(dst_v_c[(i * dst_stride_uv) + j] -
+ abs_diff = Abs(dst_v_c[(i * dst_stride_uv) + j] -
dst_v_opt[(i * dst_stride_uv) + j]);
if (abs_diff > max_diff) {
max_diff = abs_diff;
@@ -162,215 +147,226 @@
return max_diff;
}
-TEST_F(libyuvTest, ScaleDownBy2) {
- const int src_width = 1280;
- const int src_height = 720;
- const int dst_width = src_width / 2;
- const int dst_height = src_height / 2;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
+// Test scaling with 8 bit C vs 16 bit C and return maximum pixel difference.
+// 0 = exact.
+static int TestFilter_16(int src_width, int src_height,
+ int dst_width, int dst_height,
+ FilterMode f, int benchmark_iterations) {
+ if (!SizeValid(src_width, src_height, dst_width, dst_height)) {
+ return 0;
}
+
+ int i, j;
+ const int b = 0; // 128 to test for padding/stride.
+ int src_width_uv = (Abs(src_width) + 1) >> 1;
+ int src_height_uv = (Abs(src_height) + 1) >> 1;
+
+ int64 src_y_plane_size = (Abs(src_width) + b * 2) *
+ (Abs(src_height) + b * 2);
+ int64 src_uv_plane_size = (src_width_uv + b * 2) * (src_height_uv + b * 2);
+
+ int src_stride_y = b * 2 + Abs(src_width);
+ int src_stride_uv = b * 2 + src_width_uv;
+
+ align_buffer_page_end(src_y, src_y_plane_size)
+ align_buffer_page_end(src_u, src_uv_plane_size)
+ align_buffer_page_end(src_v, src_uv_plane_size)
+ align_buffer_page_end(src_y_16, src_y_plane_size * 2)
+ align_buffer_page_end(src_u_16, src_uv_plane_size * 2)
+ align_buffer_page_end(src_v_16, src_uv_plane_size * 2)
+ uint16* p_src_y_16 = reinterpret_cast<uint16*>(src_y_16);
+ uint16* p_src_u_16 = reinterpret_cast<uint16*>(src_u_16);
+ uint16* p_src_v_16 = reinterpret_cast<uint16*>(src_v_16);
+
+ MemRandomize(src_y, src_y_plane_size);
+ MemRandomize(src_u, src_uv_plane_size);
+ MemRandomize(src_v, src_uv_plane_size);
+
+ for (i = b; i < src_height + b; ++i) {
+ for (j = b; j < src_width + b; ++j) {
+ p_src_y_16[(i * src_stride_y) + j] = src_y[(i * src_stride_y) + j];
+ }
+ }
+
+ for (i = b; i < (src_height_uv + b); ++i) {
+ for (j = b; j < (src_width_uv + b); ++j) {
+ p_src_u_16[(i * src_stride_uv) + j] = src_u[(i * src_stride_uv) + j];
+ p_src_v_16[(i * src_stride_uv) + j] = src_v[(i * src_stride_uv) + j];
+ }
+ }
+
+ int dst_width_uv = (dst_width + 1) >> 1;
+ int dst_height_uv = (dst_height + 1) >> 1;
+
+ int dst_y_plane_size = (dst_width + b * 2) * (dst_height + b * 2);
+ int dst_uv_plane_size = (dst_width_uv + b * 2) * (dst_height_uv + b * 2);
+
+ int dst_stride_y = b * 2 + dst_width;
+ int dst_stride_uv = b * 2 + dst_width_uv;
+
+ align_buffer_page_end(dst_y_8, dst_y_plane_size)
+ align_buffer_page_end(dst_u_8, dst_uv_plane_size)
+ align_buffer_page_end(dst_v_8, dst_uv_plane_size)
+ align_buffer_page_end(dst_y_16, dst_y_plane_size * 2)
+ align_buffer_page_end(dst_u_16, dst_uv_plane_size * 2)
+ align_buffer_page_end(dst_v_16, dst_uv_plane_size * 2)
+
+ uint16* p_dst_y_16 = reinterpret_cast<uint16*>(dst_y_16);
+ uint16* p_dst_u_16 = reinterpret_cast<uint16*>(dst_u_16);
+ uint16* p_dst_v_16 = reinterpret_cast<uint16*>(dst_v_16);
+
+ I420Scale(src_y + (src_stride_y * b) + b, src_stride_y,
+ src_u + (src_stride_uv * b) + b, src_stride_uv,
+ src_v + (src_stride_uv * b) + b, src_stride_uv,
+ src_width, src_height,
+ dst_y_8 + (dst_stride_y * b) + b, dst_stride_y,
+ dst_u_8 + (dst_stride_uv * b) + b, dst_stride_uv,
+ dst_v_8 + (dst_stride_uv * b) + b, dst_stride_uv,
+ dst_width, dst_height, f);
+
+ for (i = 0; i < benchmark_iterations; ++i) {
+ I420Scale_16(p_src_y_16 + (src_stride_y * b) + b, src_stride_y,
+ p_src_u_16 + (src_stride_uv * b) + b, src_stride_uv,
+ p_src_v_16 + (src_stride_uv * b) + b, src_stride_uv,
+ src_width, src_height,
+ p_dst_y_16 + (dst_stride_y * b) + b, dst_stride_y,
+ p_dst_u_16 + (dst_stride_uv * b) + b, dst_stride_uv,
+ p_dst_v_16 + (dst_stride_uv * b) + b, dst_stride_uv,
+ dst_width, dst_height, f);
+ }
+
+ // Expect an exact match
+ int max_diff = 0;
+ for (i = b; i < (dst_height + b); ++i) {
+ for (j = b; j < (dst_width + b); ++j) {
+ int abs_diff = Abs(dst_y_8[(i * dst_stride_y) + j] -
+ p_dst_y_16[(i * dst_stride_y) + j]);
+ if (abs_diff > max_diff) {
+ max_diff = abs_diff;
+ }
+ }
+ }
+
+ for (i = b; i < (dst_height_uv + b); ++i) {
+ for (j = b; j < (dst_width_uv + b); ++j) {
+ int abs_diff = Abs(dst_u_8[(i * dst_stride_uv) + j] -
+ p_dst_u_16[(i * dst_stride_uv) + j]);
+ if (abs_diff > max_diff) {
+ max_diff = abs_diff;
+ }
+ abs_diff = Abs(dst_v_8[(i * dst_stride_uv) + j] -
+ p_dst_v_16[(i * dst_stride_uv) + j]);
+ if (abs_diff > max_diff) {
+ max_diff = abs_diff;
+ }
+ }
+ }
+
+ free_aligned_buffer_page_end(dst_y_8)
+ free_aligned_buffer_page_end(dst_u_8)
+ free_aligned_buffer_page_end(dst_v_8)
+ free_aligned_buffer_page_end(dst_y_16)
+ free_aligned_buffer_page_end(dst_u_16)
+ free_aligned_buffer_page_end(dst_v_16)
+
+ free_aligned_buffer_page_end(src_y)
+ free_aligned_buffer_page_end(src_u)
+ free_aligned_buffer_page_end(src_v)
+ free_aligned_buffer_page_end(src_y_16)
+ free_aligned_buffer_page_end(src_u_16)
+ free_aligned_buffer_page_end(src_v_16)
+
+ return max_diff;
}
-TEST_F(libyuvTest, ScaleDownBy4) {
- const int src_width = 1280;
- const int src_height = 720;
- const int dst_width = src_width / 4;
- const int dst_height = src_height / 4;
+// The following adjustments in dimensions ensure the scale factor will be
+// exactly achieved.
+// 2 is chroma subsample
+#define DX(x, nom, denom) static_cast<int>(((Abs(x) / nom + 1) / 2) * nom * 2)
+#define SX(x, nom, denom) static_cast<int>(((x / nom + 1) / 2) * denom * 2)
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 2); // This is the only scale factor with error of 2.
- }
-}
+#define TEST_FACTOR1(name, filter, nom, denom, max_diff) \
+ TEST_F(LibYUVScaleTest, ScaleDownBy##name##_##filter) { \
+ int diff = TestFilter(SX(benchmark_width_, nom, denom), \
+ SX(benchmark_height_, nom, denom), \
+ DX(benchmark_width_, nom, denom), \
+ DX(benchmark_height_, nom, denom), \
+ kFilter##filter, benchmark_iterations_, \
+ disable_cpu_flags_, benchmark_cpu_info_); \
+ EXPECT_LE(diff, max_diff); \
+ } \
+ TEST_F(LibYUVScaleTest, DISABLED_ScaleDownBy##name##_##filter##_16) { \
+ int diff = TestFilter_16(SX(benchmark_width_, nom, denom), \
+ SX(benchmark_height_, nom, denom), \
+ DX(benchmark_width_, nom, denom), \
+ DX(benchmark_height_, nom, denom), \
+ kFilter##filter, benchmark_iterations_); \
+ EXPECT_LE(diff, max_diff); \
+ }
-TEST_F(libyuvTest, ScaleDownBy5) {
- const int src_width = 1280;
- const int src_height = 720;
- const int dst_width = src_width / 5;
- const int dst_height = src_height / 5;
+// Test a scale factor with all 4 filters. Expect unfiltered to be exact, but
+// filtering is different fixed point implementations for SSSE3, Neon and C.
+#define TEST_FACTOR(name, nom, denom, boxdiff) \
+ TEST_FACTOR1(name, None, nom, denom, 0) \
+ TEST_FACTOR1(name, Linear, nom, denom, 3) \
+ TEST_FACTOR1(name, Bilinear, nom, denom, 3) \
+ TEST_FACTOR1(name, Box, nom, denom, boxdiff)
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
+TEST_FACTOR(2, 1, 2, 0)
+TEST_FACTOR(4, 1, 4, 0)
+TEST_FACTOR(8, 1, 8, 0)
+TEST_FACTOR(3by4, 3, 4, 1)
+TEST_FACTOR(3by8, 3, 8, 1)
+TEST_FACTOR(3, 1, 3, 0)
+#undef TEST_FACTOR1
+#undef TEST_FACTOR
+#undef SX
+#undef DX
-TEST_F(libyuvTest, ScaleDownBy8) {
- const int src_width = 1280;
- const int src_height = 720;
- const int dst_width = src_width / 8;
- const int dst_height = src_height / 8;
+#define TEST_SCALETO1(name, width, height, filter, max_diff) \
+ TEST_F(LibYUVScaleTest, name##To##width##x##height##_##filter) { \
+ int diff = TestFilter(benchmark_width_, benchmark_height_, \
+ width, height, \
+ kFilter##filter, benchmark_iterations_, \
+ disable_cpu_flags_, benchmark_cpu_info_); \
+ EXPECT_LE(diff, max_diff); \
+ } \
+ TEST_F(LibYUVScaleTest, name##From##width##x##height##_##filter) { \
+ int diff = TestFilter(width, height, \
+ Abs(benchmark_width_), Abs(benchmark_height_), \
+ kFilter##filter, benchmark_iterations_, \
+ disable_cpu_flags_, benchmark_cpu_info_); \
+ EXPECT_LE(diff, max_diff); \
+ } \
+ TEST_F(LibYUVScaleTest, \
+ DISABLED_##name##To##width##x##height##_##filter##_16) { \
+ int diff = TestFilter_16(benchmark_width_, benchmark_height_, \
+ width, height, \
+ kFilter##filter, benchmark_iterations_); \
+ EXPECT_LE(diff, max_diff); \
+ } \
+ TEST_F(LibYUVScaleTest, \
+ DISABLED_##name##From##width##x##height##_##filter##_16) { \
+ int diff = TestFilter_16(width, height, \
+ Abs(benchmark_width_), Abs(benchmark_height_), \
+ kFilter##filter, benchmark_iterations_); \
+ EXPECT_LE(diff, max_diff); \
+ }
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
+// Test scale to a specified size with all 4 filters.
+#define TEST_SCALETO(name, width, height) \
+ TEST_SCALETO1(name, width, height, None, 0) \
+ TEST_SCALETO1(name, width, height, Linear, 0) \
+ TEST_SCALETO1(name, width, height, Bilinear, 0) \
+ TEST_SCALETO1(name, width, height, Box, 0)
-TEST_F(libyuvTest, ScaleDownBy16) {
- const int src_width = 1280;
- const int src_height = 720;
- const int dst_width = src_width / 16;
- const int dst_height = src_height / 16;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleDownBy34) {
- const int src_width = 1280;
- const int src_height = 720;
- const int dst_width = src_width * 3 / 4;
- const int dst_height = src_height * 3 / 4;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleDownBy38) {
- int src_width = 1280;
- int src_height = 720;
- int dst_width = src_width * 3 / 8;
- int dst_height = src_height * 3 / 8;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleTo1366) {
- int src_width = 1280;
- int src_height = 720;
- int dst_width = 1366;
- int dst_height = 768;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleTo4074) {
- int src_width = 2880 * 2;
- int src_height = 1800;
- int dst_width = 4074;
- int dst_height = 1272;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleTo853) {
- int src_width = 1280;
- int src_height = 720;
- int dst_width = 853;
- int dst_height = 480;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleTo853Wrong) {
- int src_width = 1280;
- int src_height = 720;
- int dst_width = 853;
- int dst_height = 480;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 0,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-// A one off test for a screen cast resolution scale.
-TEST_F(libyuvTest, ScaleTo684) {
- int src_width = 686;
- int src_height = 557;
- int dst_width = 684;
- int dst_height = 552;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleTo342) {
- int src_width = 686;
- int src_height = 557;
- int dst_width = 342;
- int dst_height = 276;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
-
-TEST_F(libyuvTest, ScaleToHalf342) {
- int src_width = 684;
- int src_height = 552;
- int dst_width = 342;
- int dst_height = 276;
-
- for (int f = 0; f < 3; ++f) {
- int max_diff = TestFilter(src_width, src_height,
- dst_width, dst_height,
- static_cast<FilterMode>(f), 1,
- benchmark_iterations_);
- EXPECT_LE(max_diff, 1);
- }
-}
+TEST_SCALETO(Scale, 1, 1)
+TEST_SCALETO(Scale, 320, 240)
+TEST_SCALETO(Scale, 352, 288)
+TEST_SCALETO(Scale, 569, 480)
+TEST_SCALETO(Scale, 640, 360)
+TEST_SCALETO(Scale, 1280, 720)
+#undef TEST_SCALETO1
+#undef TEST_SCALETO
} // namespace libyuv