Google Git
Sign in
aomedia/avm/1659191fcd5be050c63d99ec63b6c9a7afa6fcca^!/.
commit
1659191fcd5be050c63d99ec63b6c9a7afa6fcca
[log]
author
Yaowu Xu <yaowu@google.com>
Wed May 03 08:58:12 2017 -0700
committer
Yaowu Xu <yaowu@google.com>
Wed May 03 19:37:52 2017 +0000
tree
b1ed27892a1b1c514b601c14f87ef8917b02ae96
parent
e816b31a5aa13145192bd3cbb66e79982f15ad77 [diff]
Change to use defined vectors in test

Fixes MSVC2015 build errors

BUG=aomedia:500

Change-Id: I5e6e689932e4f138a16d4c3b89a3d596de48ec75

diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 4efed57..5dd8c00 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc

@@ -126,105 +126,111 @@
 
 #if HAVE_SSE2
 #if CONFIG_HIGHBITDEPTH
-INSTANTIATE_TEST_CASE_P(
-    SSE2_TO_C_8, AV1IntraPredTest,
-    ::testing::Values(IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
-                                    &aom_highbd_dc_predictor_32x32_c, 32, 8),
+const IntraPredFunc IntraPredTestVector8[] = {
+  IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
+                &aom_highbd_dc_predictor_32x32_c, 32, 8),
 #if !CONFIG_ALT_INTRA
-                      IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
-                                    &aom_highbd_tm_predictor_16x16_c, 16, 8),
-                      IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
-                                    &aom_highbd_tm_predictor_32x32_c, 32, 8),
+  IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
+                &aom_highbd_tm_predictor_16x16_c, 16, 8),
+  IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
+                &aom_highbd_tm_predictor_32x32_c, 32, 8),
 #endif  // !CONFIG_ALT_INTRA
 
-                      IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
-                                    &aom_highbd_dc_predictor_4x4_c, 4, 8),
-                      IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
-                                    &aom_highbd_dc_predictor_8x8_c, 8, 8),
-                      IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
-                                    &aom_highbd_dc_predictor_16x16_c, 16, 8),
-                      IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2,
-                                    &aom_highbd_v_predictor_4x4_c, 4, 8),
-                      IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2,
-                                    &aom_highbd_v_predictor_8x8_c, 8, 8),
-                      IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
-                                    &aom_highbd_v_predictor_16x16_c, 16, 8),
-                      IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
-                                    &aom_highbd_v_predictor_32x32_c, 32, 8)
+  IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
+                &aom_highbd_dc_predictor_4x4_c, 4, 8),
+  IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
+                &aom_highbd_dc_predictor_8x8_c, 8, 8),
+  IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
+                &aom_highbd_dc_predictor_16x16_c, 16, 8),
+  IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, &aom_highbd_v_predictor_4x4_c,
+                4, 8),
+  IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, &aom_highbd_v_predictor_8x8_c,
+                8, 8),
+  IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
+                &aom_highbd_v_predictor_16x16_c, 16, 8),
+  IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
+                &aom_highbd_v_predictor_32x32_c, 32, 8)
 #if !CONFIG_ALT_INTRA
-                          ,
-                      IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
-                                    &aom_highbd_tm_predictor_4x4_c, 4, 8),
-                      IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
-                                    &aom_highbd_tm_predictor_8x8_c, 8, 8)
+      ,
+  IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
+                &aom_highbd_tm_predictor_4x4_c, 4, 8),
+  IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
+                &aom_highbd_tm_predictor_8x8_c, 8, 8)
 #endif  // !CONFIG_ALT_INTRA
-                          ));
+};
 
-INSTANTIATE_TEST_CASE_P(
-    SSE2_TO_C_10, AV1IntraPredTest,
-    ::testing::Values(IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
-                                    &aom_highbd_dc_predictor_32x32_c, 32, 10),
-#if !CONFIG_ALT_INTRA
-                      IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
-                                    &aom_highbd_tm_predictor_16x16_c, 16, 10),
-                      IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
-                                    &aom_highbd_tm_predictor_32x32_c, 32, 10),
-#endif  // !CONFIG_ALT_INTRA
-                      IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
-                                    &aom_highbd_dc_predictor_4x4_c, 4, 10),
-                      IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
-                                    &aom_highbd_dc_predictor_8x8_c, 8, 10),
-                      IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
-                                    &aom_highbd_dc_predictor_16x16_c, 16, 10),
-                      IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2,
-                                    &aom_highbd_v_predictor_4x4_c, 4, 10),
-                      IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2,
-                                    &aom_highbd_v_predictor_8x8_c, 8, 10),
-                      IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
-                                    &aom_highbd_v_predictor_16x16_c, 16, 10),
-                      IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
-                                    &aom_highbd_v_predictor_32x32_c, 32, 10)
-#if !CONFIG_ALT_INTRA
-                          ,
-                      IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
-                                    &aom_highbd_tm_predictor_4x4_c, 4, 10),
-                      IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
-                                    &aom_highbd_tm_predictor_8x8_c, 8, 10)
-#endif  // !CONFIG_ALT_INTRA
-                          ));
+INSTANTIATE_TEST_CASE_P(SSE2_TO_C_8, AV1IntraPredTest,
+                        ::testing::ValuesIn(IntraPredTestVector8));
 
-INSTANTIATE_TEST_CASE_P(
-    SSE2_TO_C_12, AV1IntraPredTest,
-    ::testing::Values(IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
-                                    &aom_highbd_dc_predictor_32x32_c, 32, 12),
+const IntraPredFunc IntraPredTestVector10[] = {
+  IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
+                &aom_highbd_dc_predictor_32x32_c, 32, 10),
 #if !CONFIG_ALT_INTRA
-                      IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
-                                    &aom_highbd_tm_predictor_16x16_c, 16, 12),
-                      IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
-                                    &aom_highbd_tm_predictor_32x32_c, 32, 12),
+  IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
+                &aom_highbd_tm_predictor_16x16_c, 16, 10),
+  IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
+                &aom_highbd_tm_predictor_32x32_c, 32, 10),
 #endif  // !CONFIG_ALT_INTRA
-                      IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
-                                    &aom_highbd_dc_predictor_4x4_c, 4, 12),
-                      IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
-                                    &aom_highbd_dc_predictor_8x8_c, 8, 12),
-                      IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
-                                    &aom_highbd_dc_predictor_16x16_c, 16, 12),
-                      IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2,
-                                    &aom_highbd_v_predictor_4x4_c, 4, 12),
-                      IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2,
-                                    &aom_highbd_v_predictor_8x8_c, 8, 12),
-                      IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
-                                    &aom_highbd_v_predictor_16x16_c, 16, 12),
-                      IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
-                                    &aom_highbd_v_predictor_32x32_c, 32, 12)
+  IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
+                &aom_highbd_dc_predictor_4x4_c, 4, 10),
+  IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
+                &aom_highbd_dc_predictor_8x8_c, 8, 10),
+  IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
+                &aom_highbd_dc_predictor_16x16_c, 16, 10),
+  IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, &aom_highbd_v_predictor_4x4_c,
+                4, 10),
+  IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, &aom_highbd_v_predictor_8x8_c,
+                8, 10),
+  IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
+                &aom_highbd_v_predictor_16x16_c, 16, 10),
+  IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
+                &aom_highbd_v_predictor_32x32_c, 32, 10)
 #if !CONFIG_ALT_INTRA
-                          ,
-                      IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
-                                    &aom_highbd_tm_predictor_4x4_c, 4, 12),
-                      IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
-                                    &aom_highbd_tm_predictor_8x8_c, 8, 12)
+      ,
+  IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
+                &aom_highbd_tm_predictor_4x4_c, 4, 10),
+  IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
+                &aom_highbd_tm_predictor_8x8_c, 8, 10)
 #endif  // !CONFIG_ALT_INTRA
-                          ));
+};
+
+INSTANTIATE_TEST_CASE_P(SSE2_TO_C_10, AV1IntraPredTest,
+                        ::testing::ValuesIn(IntraPredTestVector10));
+
+const IntraPredFunc IntraPredTestVector12[] = {
+  IntraPredFunc(&aom_highbd_dc_predictor_32x32_sse2,
+                &aom_highbd_dc_predictor_32x32_c, 32, 12),
+#if !CONFIG_ALT_INTRA
+  IntraPredFunc(&aom_highbd_tm_predictor_16x16_sse2,
+                &aom_highbd_tm_predictor_16x16_c, 16, 12),
+  IntraPredFunc(&aom_highbd_tm_predictor_32x32_sse2,
+                &aom_highbd_tm_predictor_32x32_c, 32, 12),
+#endif  // !CONFIG_ALT_INTRA
+  IntraPredFunc(&aom_highbd_dc_predictor_4x4_sse2,
+                &aom_highbd_dc_predictor_4x4_c, 4, 12),
+  IntraPredFunc(&aom_highbd_dc_predictor_8x8_sse2,
+                &aom_highbd_dc_predictor_8x8_c, 8, 12),
+  IntraPredFunc(&aom_highbd_dc_predictor_16x16_sse2,
+                &aom_highbd_dc_predictor_16x16_c, 16, 12),
+  IntraPredFunc(&aom_highbd_v_predictor_4x4_sse2, &aom_highbd_v_predictor_4x4_c,
+                4, 12),
+  IntraPredFunc(&aom_highbd_v_predictor_8x8_sse2, &aom_highbd_v_predictor_8x8_c,
+                8, 12),
+  IntraPredFunc(&aom_highbd_v_predictor_16x16_sse2,
+                &aom_highbd_v_predictor_16x16_c, 16, 12),
+  IntraPredFunc(&aom_highbd_v_predictor_32x32_sse2,
+                &aom_highbd_v_predictor_32x32_c, 32, 12)
+#if !CONFIG_ALT_INTRA
+      ,
+  IntraPredFunc(&aom_highbd_tm_predictor_4x4_sse2,
+                &aom_highbd_tm_predictor_4x4_c, 4, 12),
+  IntraPredFunc(&aom_highbd_tm_predictor_8x8_sse2,
+                &aom_highbd_tm_predictor_8x8_c, 8, 12)
+#endif  // !CONFIG_ALT_INTRA
+};
+
+INSTANTIATE_TEST_CASE_P(SSE2_TO_C_12, AV1IntraPredTest,
+                        ::testing::ValuesIn(IntraPredTestVector12));
 
 #endif  // CONFIG_HIGHBITDEPTH
 #endif  // HAVE_SSE2