Disable sse2 for inverse tx with emulate-hardware This fixes compile errors when both rect-tx and emulate-hardware are enabled. Change-Id: I19125916bc90caf348caefe906335f9b765a2487
diff --git a/test/av1_fht16x32_test.cc b/test/av1_fht16x32_test.cc index 43d0253..b578a85 100644 --- a/test/av1_fht16x32_test.cc +++ b/test/av1_fht16x32_test.cc
@@ -100,7 +100,7 @@ INSTANTIATE_TEST_CASE_P(C, AV1Trans16x32HT, ::testing::ValuesIn(kArrayHt16x32Param_c)); -#if HAVE_SSE2 +#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE const Ht16x32Param kArrayHt16x32Param_sse2[] = { make_tuple(&av1_fht16x32_sse2, &av1_iht16x32_512_add_sse2, 0, AOM_BITS_8, 512), @@ -139,6 +139,6 @@ }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans16x32HT, ::testing::ValuesIn(kArrayHt16x32Param_sse2)); -#endif // HAVE_SSE2 +#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE } // namespace
diff --git a/test/av1_fht16x8_test.cc b/test/av1_fht16x8_test.cc index d99bec5..bd382ac 100644 --- a/test/av1_fht16x8_test.cc +++ b/test/av1_fht16x8_test.cc
@@ -101,7 +101,7 @@ INSTANTIATE_TEST_CASE_P(C, AV1Trans16x8HT, ::testing::ValuesIn(kArrayHt16x8Param_c)); -#if HAVE_SSE2 +#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE const Ht16x8Param kArrayHt16x8Param_sse2[] = { make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 0, AOM_BITS_8, 128), make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 1, AOM_BITS_8, 128), @@ -124,6 +124,6 @@ }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans16x8HT, ::testing::ValuesIn(kArrayHt16x8Param_sse2)); -#endif // HAVE_SSE2 +#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE } // namespace
diff --git a/test/av1_fht32x16_test.cc b/test/av1_fht32x16_test.cc index e38283f..56c4e13 100644 --- a/test/av1_fht32x16_test.cc +++ b/test/av1_fht32x16_test.cc
@@ -100,7 +100,7 @@ INSTANTIATE_TEST_CASE_P(C, AV1Trans32x16HT, ::testing::ValuesIn(kArrayHt32x16Param_c)); -#if HAVE_SSE2 +#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE const Ht32x16Param kArrayHt32x16Param_sse2[] = { make_tuple(&av1_fht32x16_sse2, &av1_iht32x16_512_add_sse2, 0, AOM_BITS_8, 512), @@ -139,6 +139,6 @@ }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans32x16HT, ::testing::ValuesIn(kArrayHt32x16Param_sse2)); -#endif // HAVE_SSE2 +#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE } // namespace
diff --git a/test/av1_fht4x8_test.cc b/test/av1_fht4x8_test.cc index a899c87..21fc468 100644 --- a/test/av1_fht4x8_test.cc +++ b/test/av1_fht4x8_test.cc
@@ -101,7 +101,7 @@ INSTANTIATE_TEST_CASE_P(C, AV1Trans4x8HT, ::testing::ValuesIn(kArrayHt4x8Param_c)); -#if HAVE_SSE2 +#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE const Ht4x8Param kArrayHt4x8Param_sse2[] = { make_tuple(&av1_fht4x8_sse2, &av1_iht4x8_32_add_sse2, 0, AOM_BITS_8, 32), make_tuple(&av1_fht4x8_sse2, &av1_iht4x8_32_add_sse2, 1, AOM_BITS_8, 32), @@ -124,6 +124,6 @@ }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans4x8HT, ::testing::ValuesIn(kArrayHt4x8Param_sse2)); -#endif // HAVE_SSE2 +#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE } // namespace
diff --git a/test/av1_fht8x4_test.cc b/test/av1_fht8x4_test.cc index 9bf4ff6..8db495e 100644 --- a/test/av1_fht8x4_test.cc +++ b/test/av1_fht8x4_test.cc
@@ -100,7 +100,7 @@ INSTANTIATE_TEST_CASE_P(C, AV1Trans8x4HT, ::testing::ValuesIn(kArrayHt8x4Param_c)); -#if HAVE_SSE2 +#if HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE const Ht8x4Param kArrayHt8x4Param_sse2[] = { make_tuple(&av1_fht8x4_sse2, &av1_iht8x4_32_add_sse2, 0, AOM_BITS_8, 32), make_tuple(&av1_fht8x4_sse2, &av1_iht8x4_32_add_sse2, 1, AOM_BITS_8, 32), @@ -123,6 +123,6 @@ }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans8x4HT, ::testing::ValuesIn(kArrayHt8x4Param_sse2)); -#endif // HAVE_SSE2 +#endif // HAVE_SSE2 && !CONFIG_EMULATE_HARDWARE } // namespace