ref: 64b3739bf12245b83cab00ec53cc4154891fb0d0
parent: 8e112d9586a9a79227859fc0a39150ac955ff134
parent: 7d07f512cd87446eef541e9af4af19b1e8c6342a
author: Johann <johannkoenig@google.com>
date: Wed Nov 12 07:20:36 EST 2014
Merge "Fix SSSE3 partial_idct_test detection"
--- a/test/partial_idct_test.cc
+++ b/test/partial_idct_test.cc
@@ -294,17 +294,6 @@
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,
@@ -312,6 +301,14 @@
make_tuple(&vp9_fdct16x16_c,
&vp9_idct16x16_256_add_c,
&vp9_idct16x16_10_add_ssse3,
- TX_16X16, 10)));
-#endif
+ 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
} // namespace