From bbcc64772580c8a979288791afa02d30bc476d2e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:52:15 -0500 Subject: Update aom to v1.0.0 Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0. --- third_party/aom/test/warp_filter_test.cc | 36 ++++++++++++-------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'third_party/aom/test/warp_filter_test.cc') diff --git a/third_party/aom/test/warp_filter_test.cc b/third_party/aom/test/warp_filter_test.cc index 0353c074e..15f8a285c 100644 --- a/third_party/aom/test/warp_filter_test.cc +++ b/third_party/aom/test/warp_filter_test.cc @@ -8,39 +8,29 @@ * Media Patent License 1.0 was not distributed with this source code in the * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ - #include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "test/warp_filter_test_util.h" - -using std::tr1::tuple; -using std::tr1::make_tuple; +using ::testing::make_tuple; +using ::testing::tuple; using libaom_test::ACMRandom; -using libaom_test::AV1WarpFilter::AV1WarpFilterTest; -#if CONFIG_HIGHBITDEPTH using libaom_test::AV1HighbdWarpFilter::AV1HighbdWarpFilterTest; -#endif +using libaom_test::AV1WarpFilter::AV1WarpFilterTest; namespace { - +#if HAVE_SSE4_1 TEST_P(AV1WarpFilterTest, CheckOutput) { RunCheckOutput(GET_PARAM(3)); } +TEST_P(AV1WarpFilterTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(3)); } INSTANTIATE_TEST_CASE_P( - SSE2, AV1WarpFilterTest, - libaom_test::AV1WarpFilter::BuildParams(av1_warp_affine_sse2)); - -#if HAVE_SSSE3 -INSTANTIATE_TEST_CASE_P( - SSSE3, AV1WarpFilterTest, - libaom_test::AV1WarpFilter::BuildParams(av1_warp_affine_ssse3)); -#endif + SSE4_1, AV1WarpFilterTest, + libaom_test::AV1WarpFilter::BuildParams(av1_warp_affine_sse4_1)); -#if CONFIG_HIGHBITDEPTH && HAVE_SSSE3 -TEST_P(AV1HighbdWarpFilterTest, CheckOutput) { - RunCheckOutput(av1_highbd_warp_affine_ssse3); -} +TEST_P(AV1HighbdWarpFilterTest, CheckOutput) { RunCheckOutput(GET_PARAM(4)); } +TEST_P(AV1HighbdWarpFilterTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(4)); } -INSTANTIATE_TEST_CASE_P(SSSE3, AV1HighbdWarpFilterTest, - libaom_test::AV1HighbdWarpFilter::GetDefaultParams()); -#endif +INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdWarpFilterTest, + libaom_test::AV1HighbdWarpFilter::BuildParams( + av1_highbd_warp_affine_sse4_1)); +#endif // HAVE_SSE4_1 } // namespace -- cgit v1.2.3