transform tests: Avoid #if inside INSTANTIATE_TEST_CASE_P
BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1200
Change-Id: Ia2dd6bb1ca2dff4422753af4a00156a12e488ed0
diff --git a/test/vp10_fht16x16_test.cc b/test/vp10_fht16x16_test.cc
index 7994d7f..0e1bfa2 100644
--- a/test/vp10_fht16x16_test.cc
+++ b/test/vp10_fht16x16_test.cc
@@ -128,19 +128,7 @@
using std::tr1::make_tuple;
#if HAVE_SSE2
-INSTANTIATE_TEST_CASE_P(
- SSE2, VP10Trans16x16HT,
- ::testing::Values(
-#if !CONFIG_EXT_TX
- make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 0,
- VPX_BITS_8, 256),
- make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 1,
- VPX_BITS_8, 256),
- make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 2,
- VPX_BITS_8, 256),
- make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 3,
- VPX_BITS_8, 256)));
-#else
+const Ht16x16Param kArrayHt16x16Param_sse2[] = {
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 0,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 1,
@@ -149,6 +137,7 @@
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 3,
VPX_BITS_8, 256),
+#if CONFIG_EXT_TX
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 4,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 5,
@@ -170,8 +159,12 @@
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 14,
VPX_BITS_8, 256),
make_tuple(&vp10_fht16x16_sse2, &vp10_iht16x16_256_add_sse2, 15,
- VPX_BITS_8, 256)));
-#endif // !CONFIG_EXT_TX
+ VPX_BITS_8, 256)
+#endif // CONFIG_EXT_TX
+};
+INSTANTIATE_TEST_CASE_P(
+ SSE2, VP10Trans16x16HT,
+ ::testing::ValuesIn(kArrayHt16x16Param_sse2));
#endif // HAVE_SSE2
} // namespace
diff --git a/test/vp10_fht4x4_test.cc b/test/vp10_fht4x4_test.cc
index 9daf063..5b81095 100644
--- a/test/vp10_fht4x4_test.cc
+++ b/test/vp10_fht4x4_test.cc
@@ -157,19 +157,7 @@
using std::tr1::make_tuple;
#if HAVE_SSE2
-INSTANTIATE_TEST_CASE_P(
- SSE2, VP10Trans4x4HT,
- ::testing::Values(
-#if !CONFIG_EXT_TX
- make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 0,
- VPX_BITS_8, 16),
- make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 1,
- VPX_BITS_8, 16),
- make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 2,
- VPX_BITS_8, 16),
- make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 3,
- VPX_BITS_8, 16)));
-#else
+const Ht4x4Param kArrayHt4x4Param_sse2[] = {
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 0,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 1,
@@ -178,6 +166,7 @@
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 3,
VPX_BITS_8, 16),
+#if CONFIG_EXT_TX
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 4,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 5,
@@ -199,15 +188,18 @@
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 14,
VPX_BITS_8, 16),
make_tuple(&vp10_fht4x4_sse2, &vp10_iht4x4_16_add_sse2, 15,
- VPX_BITS_8, 16)));
-#endif // !CONFIG_EXT_TX
+ VPX_BITS_8, 16)
+#endif // CONFIG_EXT_TX
+};
+INSTANTIATE_TEST_CASE_P(
+ SSE2, VP10Trans4x4HT,
+ ::testing::ValuesIn(kArrayHt4x4Param_sse2));
#endif // HAVE_SSE2
#if HAVE_SSE4_1 && CONFIG_VP9_HIGHBITDEPTH
INSTANTIATE_TEST_CASE_P(
SSE4_1, VP10HighbdTrans4x4HT,
::testing::Values(
-#if !CONFIG_EXT_TX
make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 0, 10),
make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 0, 12),
make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 1, 10),
@@ -216,16 +208,6 @@
make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 2, 12),
make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 3, 10),
make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 3, 12)));
-#else
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 0, 10),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 0, 12),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 1, 10),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 1, 12),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 2, 10),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 2, 12),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 3, 10),
- make_tuple(&vp10_fwd_txfm2d_4x4_sse4_1, 3, 12)));
-#endif // !CONFIG_EXT_TX
#endif // HAVE_SSE4_1 && CONFIG_VP9_HIGHBITDEPTH
} // namespace
diff --git a/test/vp10_fht8x8_test.cc b/test/vp10_fht8x8_test.cc
index 07ab61d..df1826f 100644
--- a/test/vp10_fht8x8_test.cc
+++ b/test/vp10_fht8x8_test.cc
@@ -127,19 +127,7 @@
using std::tr1::make_tuple;
#if HAVE_SSE2
-INSTANTIATE_TEST_CASE_P(
- SSE2, VP10Trans8x8HT,
- ::testing::Values(
-#if !CONFIG_EXT_TX
- make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 0,
- VPX_BITS_8, 64),
- make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 1,
- VPX_BITS_8, 64),
- make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 2,
- VPX_BITS_8, 64),
- make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 3,
- VPX_BITS_8, 64)));
-#else
+const Ht8x8Param kArrayHt8x8Param_sse2[] = {
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 0,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 1,
@@ -148,6 +136,7 @@
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 3,
VPX_BITS_8, 64),
+#if CONFIG_EXT_TX
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 4,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 5,
@@ -169,8 +158,12 @@
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 14,
VPX_BITS_8, 64),
make_tuple(&vp10_fht8x8_sse2, &vp10_iht8x8_64_add_sse2, 15,
- VPX_BITS_8, 64)));
-#endif // !CONFIG_EXT_TX
+ VPX_BITS_8, 64)
+#endif // CONFIG_EXT_TX
+};
+INSTANTIATE_TEST_CASE_P(
+ SSE2, VP10Trans8x8HT,
+ ::testing::ValuesIn(kArrayHt8x8Param_sse2));
#endif // HAVE_SSE2
} // namespace
