ref: 134bc822c807e993520a6b0f49e8cab02ae99f08
parent: aeff1f7ec249a38b584255bbdf9b2e88f623a0fd
parent: 8da5088da10240d1208a90de462b34f6032e7701
author: Johann <johannkoenig@google.com>
date: Thu Nov 13 09:49:22 EST 2014
Merge "Revert "Fix SSSE3 partial_idct_test detection""
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -294,6 +294,17 @@
TX_4X4, 1)));
#endif
+#if HAVE_SSSE3 && ARCH_X86_64 && !CONFIG_VP9_HIGHBITDEPTH && \
+ !CONFIG_EMULATE_HARDWARE
+INSTANTIATE_TEST_CASE_P(
+ SSSE3_64, PartialIDctTest,
+ ::testing::Values(
+ make_tuple(&vp9_fdct8x8_c,
+ &vp9_idct8x8_64_add_c,
+ &vp9_idct8x8_12_add_ssse3,
+ TX_8X8, 12)));
+#endif
+
#if HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
INSTANTIATE_TEST_CASE_P(
SSSE3, PartialIDctTest,
@@ -301,14 +312,6 @@
make_tuple(&vp9_fdct16x16_c,
&vp9_idct16x16_256_add_c,
&vp9_idct16x16_10_add_ssse3,
- TX_16X16, 10)
-#if ARCH_X86_64
- ,
- make_tuple(&vp9_fdct8x8_c,
- &vp9_idct8x8_64_add_c,
- &vp9_idct8x8_12_add_ssse3,
- TX_8X8, 12)
-#endif // ARCH_X86_64
- ));
-#endif // HAVE_SSSE3 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
+ TX_16X16, 10)));
+#endif
} // namespace