Fix compiling of tests with emulate-hardware CONFIG_EMULATE_HARDWARE disable SIMD versions of transform functions. This commits added !CONFIG_EMULATE_HARDWARE to get tests that use SIMD versions of transforms to compile. Change-Id: I4b9ef5a46ae8f12c439f4fe18766b95f8a520d34
diff --git a/test/av1_fht4x4_test.cc b/test/av1_fht4x4_test.cc index 6709e4f..6c2189f 100644 --- a/test/av1_fht4x4_test.cc +++ b/test/av1_fht4x4_test.cc
@@ -164,7 +164,7 @@ using std::tr1::make_tuple; -#if HAVE_SSE2 +#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE const Ht4x4Param kArrayHt4x4Param_sse2[] = { make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_sse2, 0, AOM_BITS_8, 16), make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_sse2, 1, AOM_BITS_8, 16), @@ -186,9 +186,9 @@ }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans4x4HT, ::testing::ValuesIn(kArrayHt4x4Param_sse2)); -#endif // HAVE_SSE2 +#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE -#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH +#if HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE const HighbdHt4x4Param kArrayHighbdHt4x4Param[] = { make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, 0, 10), make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, 0, 12), @@ -215,6 +215,6 @@ INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans4x4HT, ::testing::ValuesIn(kArrayHighbdHt4x4Param)); -#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH +#endif // HAVE_SSE4_1 && CONFIG_AOM_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE } // namespace