test_intra_pred_speed.cc : Fix visual studio build.

Visual studio doesn't like nested macros, apparently. This patch should
fix it.

Change-Id: Ifa56fae5be0b3dfd3fecd88a8a443e39135f96ab

diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index b775cda98ed70629a41954198fa2c0381194ffe5..f98a730bce3e4d7fa4970845cee1f03b6a86fbf9 100644 (file)
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -157,32 +157,32 @@ void TestIntraPred32(AvxPredFunc const *pred_funcs) {
 // -----------------------------------------------------------------------------
 // 4x4
 
+#if CONFIG_ALT_INTRA
+#define tm_pred_func aom_paeth_predictor_4x4_c
+#else
+#define tm_pred_func aom_tm_predictor_4x4_c
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(C, TestIntraPred4, aom_dc_predictor_4x4_c,
                 aom_dc_left_predictor_4x4_c, aom_dc_top_predictor_4x4_c,
                 aom_dc_128_predictor_4x4_c, aom_v_predictor_4x4_c,
                 aom_h_predictor_4x4_c, aom_d45_predictor_4x4_c,
                 aom_d135_predictor_4x4_c, aom_d117_predictor_4x4_c,
                 aom_d153_predictor_4x4_c, aom_d207_predictor_4x4_c,
-                aom_d63_predictor_4x4_c,
+                aom_d63_predictor_4x4_c, tm_pred_func)
+#undef tm_pred_func
+
+#if HAVE_SSE2
 #if CONFIG_ALT_INTRA
-                aom_paeth_predictor_4x4_c
+#define tm_pred_func NULL
 #else
-                aom_tm_predictor_4x4_c
+#define tm_pred_func aom_tm_predictor_4x4_sse2
 #endif  // CONFIG_ALT_INTRA
-                )
-
-#if HAVE_SSE2
 INTRA_PRED_TEST(SSE2, TestIntraPred4, aom_dc_predictor_4x4_sse2,
                 aom_dc_left_predictor_4x4_sse2, aom_dc_top_predictor_4x4_sse2,
                 aom_dc_128_predictor_4x4_sse2, aom_v_predictor_4x4_sse2,
                 aom_h_predictor_4x4_sse2, aom_d45_predictor_4x4_sse2, NULL,
-                NULL, NULL, aom_d207_predictor_4x4_sse2, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_4x4_sse2
-#endif  // CONFIG_ALT_INTRA
-                )
+                NULL, NULL, aom_d207_predictor_4x4_sse2, NULL, tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_SSE2
 
 #if HAVE_SSSE3
@@ -192,73 +192,75 @@ INTRA_PRED_TEST(SSSE3, TestIntraPred4, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 #endif  // HAVE_SSSE3
 
 #if HAVE_DSPR2
-INTRA_PRED_TEST(DSPR2, TestIntraPred4, aom_dc_predictor_4x4_dspr2, NULL, NULL,
-                NULL, NULL, aom_h_predictor_4x4_dspr2, NULL, NULL, NULL, NULL,
-                NULL, NULL,
 #if CONFIG_ALT_INTRA
-                NULL
+#define tm_pred_func NULL
 #else
-                aom_tm_predictor_4x4_dspr2
+#define tm_pred_func aom_tm_predictor_4x4_dspr2
 #endif  // CONFIG_ALT_INTRA
-                )
+INTRA_PRED_TEST(DSPR2, TestIntraPred4, aom_dc_predictor_4x4_dspr2, NULL, NULL,
+                NULL, NULL, aom_h_predictor_4x4_dspr2, NULL, NULL, NULL, NULL,
+                NULL, NULL, tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_DSPR2
 
 #if HAVE_NEON
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_4x4_neon
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(NEON, TestIntraPred4, aom_dc_predictor_4x4_neon,
                 aom_dc_left_predictor_4x4_neon, aom_dc_top_predictor_4x4_neon,
                 aom_dc_128_predictor_4x4_neon, aom_v_predictor_4x4_neon,
                 aom_h_predictor_4x4_neon, aom_d45_predictor_4x4_neon,
                 aom_d135_predictor_4x4_neon, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_4x4_neon
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_NEON
 
 #if HAVE_MSA
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_4x4_msa
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(MSA, TestIntraPred4, aom_dc_predictor_4x4_msa,
                 aom_dc_left_predictor_4x4_msa, aom_dc_top_predictor_4x4_msa,
                 aom_dc_128_predictor_4x4_msa, aom_v_predictor_4x4_msa,
                 aom_h_predictor_4x4_msa, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_4x4_msa
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_MSA
 
 // -----------------------------------------------------------------------------
 // 8x8
 
+#if CONFIG_ALT_INTRA
+#define tm_pred_func aom_paeth_predictor_8x8_c
+#else
+#define tm_pred_func aom_tm_predictor_8x8_c
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(C, TestIntraPred8, aom_dc_predictor_8x8_c,
                 aom_dc_left_predictor_8x8_c, aom_dc_top_predictor_8x8_c,
                 aom_dc_128_predictor_8x8_c, aom_v_predictor_8x8_c,
                 aom_h_predictor_8x8_c, aom_d45_predictor_8x8_c,
                 aom_d135_predictor_8x8_c, aom_d117_predictor_8x8_c,
                 aom_d153_predictor_8x8_c, aom_d207_predictor_8x8_c,
-                aom_d63_predictor_8x8_c,
+                aom_d63_predictor_8x8_c, tm_pred_func)
+#undef tm_pred_func
+
+#if HAVE_SSE2
 #if CONFIG_ALT_INTRA
-                aom_paeth_predictor_8x8_c
+#define tm_pred_func NULL
 #else
-                aom_tm_predictor_8x8_c
+#define tm_pred_func aom_tm_predictor_8x8_sse2
 #endif  // CONFIG_ALT_INTRA
-                )
-
-#if HAVE_SSE2
 INTRA_PRED_TEST(SSE2, TestIntraPred8, aom_dc_predictor_8x8_sse2,
                 aom_dc_left_predictor_8x8_sse2, aom_dc_top_predictor_8x8_sse2,
                 aom_dc_128_predictor_8x8_sse2, aom_v_predictor_8x8_sse2,
                 aom_h_predictor_8x8_sse2, aom_d45_predictor_8x8_sse2, NULL,
-                NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_8x8_sse2
-#endif  // CONFIG_ALT_INTRA
-                )
+                NULL, NULL, NULL, NULL, tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_SSE2
 
 #if HAVE_SSSE3
@@ -268,74 +270,75 @@ INTRA_PRED_TEST(SSSE3, TestIntraPred8, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 #endif  // HAVE_SSSE3
 
 #if HAVE_DSPR2
-INTRA_PRED_TEST(DSPR2, TestIntraPred8, aom_dc_predictor_8x8_dspr2, NULL, NULL,
-                NULL, NULL, aom_h_predictor_8x8_dspr2, NULL, NULL, NULL, NULL,
-                NULL, NULL,
 #if CONFIG_ALT_INTRA
-                NULL
+#define tm_pred_func NULL
 #else
-                aom_tm_predictor_8x8_dspr2
+#define tm_pred_func aom_tm_predictor_8x8_dspr2
 #endif  // CONFIG_ALT_INTRA
-                )
+INTRA_PRED_TEST(DSPR2, TestIntraPred8, aom_dc_predictor_8x8_dspr2, NULL, NULL,
+                NULL, NULL, aom_h_predictor_8x8_dspr2, NULL, NULL, NULL, NULL,
+                NULL, NULL, tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_DSPR2
 
 #if HAVE_NEON
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_8x8_neon
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(NEON, TestIntraPred8, aom_dc_predictor_8x8_neon,
                 aom_dc_left_predictor_8x8_neon, aom_dc_top_predictor_8x8_neon,
                 aom_dc_128_predictor_8x8_neon, aom_v_predictor_8x8_neon,
                 aom_h_predictor_8x8_neon, aom_d45_predictor_8x8_neon, NULL,
-                NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_8x8_neon
-#endif  // CONFIG_ALT_INTRA
-                )
-
+                NULL, NULL, NULL, NULL, tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_NEON
 
 #if HAVE_MSA
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_8x8_msa
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(MSA, TestIntraPred8, aom_dc_predictor_8x8_msa,
                 aom_dc_left_predictor_8x8_msa, aom_dc_top_predictor_8x8_msa,
                 aom_dc_128_predictor_8x8_msa, aom_v_predictor_8x8_msa,
                 aom_h_predictor_8x8_msa, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_8x8_msa
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_MSA
 
 // -----------------------------------------------------------------------------
 // 16x16
 
+#if CONFIG_ALT_INTRA
+#define tm_pred_func aom_paeth_predictor_16x16_c
+#else
+#define tm_pred_func aom_tm_predictor_16x16_c
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(C, TestIntraPred16, aom_dc_predictor_16x16_c,
                 aom_dc_left_predictor_16x16_c, aom_dc_top_predictor_16x16_c,
                 aom_dc_128_predictor_16x16_c, aom_v_predictor_16x16_c,
                 aom_h_predictor_16x16_c, aom_d45_predictor_16x16_c,
                 aom_d135_predictor_16x16_c, aom_d117_predictor_16x16_c,
                 aom_d153_predictor_16x16_c, aom_d207_predictor_16x16_c,
-                aom_d63_predictor_16x16_c,
+                aom_d63_predictor_16x16_c, tm_pred_func)
+#undef tm_pred_func
+
+#if HAVE_SSE2
 #if CONFIG_ALT_INTRA
-                aom_paeth_predictor_16x16_c
+#define tm_pred_func NULL
 #else
-                aom_tm_predictor_16x16_c
+#define tm_pred_func aom_tm_predictor_16x16_sse2
 #endif  // CONFIG_ALT_INTRA
-                )
-
-#if HAVE_SSE2
 INTRA_PRED_TEST(SSE2, TestIntraPred16, aom_dc_predictor_16x16_sse2,
                 aom_dc_left_predictor_16x16_sse2,
                 aom_dc_top_predictor_16x16_sse2,
                 aom_dc_128_predictor_16x16_sse2, aom_v_predictor_16x16_sse2,
                 aom_h_predictor_16x16_sse2, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_16x16_sse2
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_SSE2
 
 #if HAVE_SSSE3
@@ -352,62 +355,64 @@ INTRA_PRED_TEST(DSPR2, TestIntraPred16, aom_dc_predictor_16x16_dspr2, NULL,
 #endif  // HAVE_DSPR2
 
 #if HAVE_NEON
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_16x16_neon
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(NEON, TestIntraPred16, aom_dc_predictor_16x16_neon,
                 aom_dc_left_predictor_16x16_neon,
                 aom_dc_top_predictor_16x16_neon,
                 aom_dc_128_predictor_16x16_neon, aom_v_predictor_16x16_neon,
                 aom_h_predictor_16x16_neon, aom_d45_predictor_16x16_neon, NULL,
-                NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_16x16_neon
-#endif  // CONFIG_ALT_INTRA
-                )
+                NULL, NULL, NULL, NULL, tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_NEON
 
 #if HAVE_MSA
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_16x16_msa
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(MSA, TestIntraPred16, aom_dc_predictor_16x16_msa,
                 aom_dc_left_predictor_16x16_msa, aom_dc_top_predictor_16x16_msa,
                 aom_dc_128_predictor_16x16_msa, aom_v_predictor_16x16_msa,
                 aom_h_predictor_16x16_msa, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_16x16_msa
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_MSA
 
 // -----------------------------------------------------------------------------
 // 32x32
 
+#if CONFIG_ALT_INTRA
+#define tm_pred_func aom_paeth_predictor_32x32_c
+#else
+#define tm_pred_func aom_tm_predictor_32x32_c
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(C, TestIntraPred32, aom_dc_predictor_32x32_c,
                 aom_dc_left_predictor_32x32_c, aom_dc_top_predictor_32x32_c,
                 aom_dc_128_predictor_32x32_c, aom_v_predictor_32x32_c,
                 aom_h_predictor_32x32_c, aom_d45_predictor_32x32_c,
                 aom_d135_predictor_32x32_c, aom_d117_predictor_32x32_c,
                 aom_d153_predictor_32x32_c, aom_d207_predictor_32x32_c,
-                aom_d63_predictor_32x32_c,
+                aom_d63_predictor_32x32_c, tm_pred_func)
+#undef tm_pred_func
+
+#if HAVE_SSE2
 #if CONFIG_ALT_INTRA
-                aom_paeth_predictor_32x32_c
+#define tm_pred_func NULL
 #else
-                aom_tm_predictor_32x32_c
+#define tm_pred_func aom_tm_predictor_32x32_sse2
 #endif  // CONFIG_ALT_INTRA
-                )
-
-#if HAVE_SSE2
 INTRA_PRED_TEST(SSE2, TestIntraPred32, aom_dc_predictor_32x32_sse2,
                 aom_dc_left_predictor_32x32_sse2,
                 aom_dc_top_predictor_32x32_sse2,
                 aom_dc_128_predictor_32x32_sse2, aom_v_predictor_32x32_sse2,
                 aom_h_predictor_32x32_sse2, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_32x32_sse2
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_SSE2
 
 #if HAVE_SSSE3
@@ -418,30 +423,32 @@ INTRA_PRED_TEST(SSSE3, TestIntraPred32, NULL, NULL, NULL, NULL, NULL, NULL,
 #endif  // HAVE_SSSE3
 
 #if HAVE_NEON
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_32x32_neon
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(NEON, TestIntraPred32, aom_dc_predictor_32x32_neon,
                 aom_dc_left_predictor_32x32_neon,
                 aom_dc_top_predictor_32x32_neon,
                 aom_dc_128_predictor_32x32_neon, aom_v_predictor_32x32_neon,
                 aom_h_predictor_32x32_neon, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_32x32_neon
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_NEON
 
 #if HAVE_MSA
+#if CONFIG_ALT_INTRA
+#define tm_pred_func NULL
+#else
+#define tm_pred_func aom_tm_predictor_32x32_msa
+#endif  // CONFIG_ALT_INTRA
 INTRA_PRED_TEST(MSA, TestIntraPred32, aom_dc_predictor_32x32_msa,
                 aom_dc_left_predictor_32x32_msa, aom_dc_top_predictor_32x32_msa,
                 aom_dc_128_predictor_32x32_msa, aom_v_predictor_32x32_msa,
                 aom_h_predictor_32x32_msa, NULL, NULL, NULL, NULL, NULL, NULL,
-#if CONFIG_ALT_INTRA
-                NULL
-#else
-                aom_tm_predictor_32x32_msa
-#endif  // CONFIG_ALT_INTRA
-                )
+                tm_pred_func)
+#undef tm_pred_func
 #endif  // HAVE_MSA
 
 #include "test/test_libaom.cc"