diff options
Diffstat (limited to 'media/libaom/src/test/hiprec_convolve_test.cc')
| -rw-r--r-- | media/libaom/src/test/hiprec_convolve_test.cc | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/media/libaom/src/test/hiprec_convolve_test.cc b/media/libaom/src/test/hiprec_convolve_test.cc index f94a0730c..59d28e883 100644 --- a/media/libaom/src/test/hiprec_convolve_test.cc +++ b/media/libaom/src/test/hiprec_convolve_test.cc @@ -9,14 +9,18 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ +#include <tuple> + #include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "test/hiprec_convolve_test_util.h" -using ::testing::make_tuple; -using ::testing::tuple; using libaom_test::ACMRandom; +#if CONFIG_AV1_HIGHBITDEPTH using libaom_test::AV1HighbdHiprecConvolve::AV1HighbdHiprecConvolveTest; +#endif using libaom_test::AV1HiprecConvolve::AV1HiprecConvolveTest; +using std::make_tuple; +using std::tuple; namespace { @@ -25,21 +29,22 @@ TEST_P(AV1HiprecConvolveTest, DISABLED_SpeedTest) { RunSpeedTest(GET_PARAM(3)); } #if HAVE_SSE2 -INSTANTIATE_TEST_CASE_P(SSE2, AV1HiprecConvolveTest, - libaom_test::AV1HiprecConvolve::BuildParams( - av1_wiener_convolve_add_src_sse2)); +INSTANTIATE_TEST_SUITE_P(SSE2, AV1HiprecConvolveTest, + libaom_test::AV1HiprecConvolve::BuildParams( + av1_wiener_convolve_add_src_sse2)); #endif #if HAVE_AVX2 -INSTANTIATE_TEST_CASE_P(AVX2, AV1HiprecConvolveTest, - libaom_test::AV1HiprecConvolve::BuildParams( - av1_wiener_convolve_add_src_avx2)); +INSTANTIATE_TEST_SUITE_P(AVX2, AV1HiprecConvolveTest, + libaom_test::AV1HiprecConvolve::BuildParams( + av1_wiener_convolve_add_src_avx2)); #endif #if HAVE_NEON -INSTANTIATE_TEST_CASE_P(NEON, AV1HiprecConvolveTest, - libaom_test::AV1HiprecConvolve::BuildParams( - av1_wiener_convolve_add_src_neon)); +INSTANTIATE_TEST_SUITE_P(NEON, AV1HiprecConvolveTest, + libaom_test::AV1HiprecConvolve::BuildParams( + av1_wiener_convolve_add_src_neon)); #endif +#if CONFIG_AV1_HIGHBITDEPTH #if HAVE_SSSE3 || HAVE_AVX2 TEST_P(AV1HighbdHiprecConvolveTest, CheckOutput) { RunCheckOutput(GET_PARAM(4)); @@ -48,15 +53,16 @@ TEST_P(AV1HighbdHiprecConvolveTest, DISABLED_SpeedTest) { RunSpeedTest(GET_PARAM(4)); } #if HAVE_SSSE3 -INSTANTIATE_TEST_CASE_P(SSSE3, AV1HighbdHiprecConvolveTest, - libaom_test::AV1HighbdHiprecConvolve::BuildParams( - av1_highbd_wiener_convolve_add_src_ssse3)); +INSTANTIATE_TEST_SUITE_P(SSSE3, AV1HighbdHiprecConvolveTest, + libaom_test::AV1HighbdHiprecConvolve::BuildParams( + av1_highbd_wiener_convolve_add_src_ssse3)); #endif #if HAVE_AVX2 -INSTANTIATE_TEST_CASE_P(AVX2, AV1HighbdHiprecConvolveTest, - libaom_test::AV1HighbdHiprecConvolve::BuildParams( - av1_highbd_wiener_convolve_add_src_avx2)); +INSTANTIATE_TEST_SUITE_P(AVX2, AV1HighbdHiprecConvolveTest, + libaom_test::AV1HighbdHiprecConvolve::BuildParams( + av1_highbd_wiener_convolve_add_src_avx2)); #endif #endif +#endif // CONFIG_AV1_HIGHBITDEPTH } // namespace |