subtract_test: Use static arrays for test params

fixes compiler warnings in MSVC related to decorated name truncation Change-Id: I07869a4f46baf3995a56073f0d2d1918540b736b

subtract_test: Use static arrays for test params
fixes compiler warnings in MSVC related to decorated name truncation Change-Id: I07869a4f46baf3995a56073f0d2d1918540b736b
7184065f · James Zern · ff766cd2 · 7184065f
Commit 7184065f authored Jun 20, 2017 by James Zern
Hide whitespace changes
Inline Side-by-side

Showing with 38 additions and 34 deletions

test/subtract_test.cc test/subtract_test.cc +38 -34

No files found.
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -213,40 +213,44 @@ TEST_P(AV1HBDSubtractBlockTest, CheckSpeed) { RunForSpeed(); }
 #endif  // USE_SPEED_TEST

 #if HAVE_SSE2
-INSTANTIATE_TEST_CASE_P(
-    SSE2, AV1HBDSubtractBlockTest,
-    ::testing::Values(make_tuple(4, 4, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(4, 4, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(4, 8, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(4, 8, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(8, 4, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(8, 4, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(8, 8, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(8, 8, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(8, 16, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(8, 16, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(16, 8, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(16, 8, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(16, 16, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(16, 16, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(16, 32, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(16, 32, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(32, 16, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(32, 16, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(32, 32, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(32, 32, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(32, 64, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(32, 64, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(64, 32, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(64, 32, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(64, 64, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(64, 64, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(64, 128, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(64, 128, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(128, 64, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(128, 64, 12, &aom_highbd_subtract_block_c),
-                      make_tuple(128, 128, 12, &aom_highbd_subtract_block_sse2),
-                      make_tuple(128, 128, 12, &aom_highbd_subtract_block_c)));
+
+const Params kAV1HBDSubtractBlock_sse2[] = {
+  make_tuple(4, 4, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(4, 4, 12, &aom_highbd_subtract_block_c),
+  make_tuple(4, 8, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(4, 8, 12, &aom_highbd_subtract_block_c),
+  make_tuple(8, 4, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(8, 4, 12, &aom_highbd_subtract_block_c),
+  make_tuple(8, 8, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(8, 8, 12, &aom_highbd_subtract_block_c),
+  make_tuple(8, 16, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(8, 16, 12, &aom_highbd_subtract_block_c),
+  make_tuple(16, 8, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(16, 8, 12, &aom_highbd_subtract_block_c),
+  make_tuple(16, 16, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(16, 16, 12, &aom_highbd_subtract_block_c),
+  make_tuple(16, 32, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(16, 32, 12, &aom_highbd_subtract_block_c),
+  make_tuple(32, 16, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(32, 16, 12, &aom_highbd_subtract_block_c),
+  make_tuple(32, 32, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(32, 32, 12, &aom_highbd_subtract_block_c),
+  make_tuple(32, 64, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(32, 64, 12, &aom_highbd_subtract_block_c),
+  make_tuple(64, 32, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(64, 32, 12, &aom_highbd_subtract_block_c),
+  make_tuple(64, 64, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(64, 64, 12, &aom_highbd_subtract_block_c),
+  make_tuple(64, 128, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(64, 128, 12, &aom_highbd_subtract_block_c),
+  make_tuple(128, 64, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(128, 64, 12, &aom_highbd_subtract_block_c),
+  make_tuple(128, 128, 12, &aom_highbd_subtract_block_sse2),
+  make_tuple(128, 128, 12, &aom_highbd_subtract_block_c)
+};
+
+INSTANTIATE_TEST_CASE_P(SSE2, AV1HBDSubtractBlockTest,
+                        ::testing::ValuesIn(kAV1HBDSubtractBlock_sse2));
 #endif  // HAVE_SSE2
 #endif  // CONFIG_HIGHBITDEPTH
 }  // namespace