diff options
Diffstat (limited to 'third_party/aom/test/convolve_round_test.cc')
| -rw-r--r-- | third_party/aom/test/convolve_round_test.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/third_party/aom/test/convolve_round_test.cc b/third_party/aom/test/convolve_round_test.cc index 4976b03c8..2f801e7d4 100644 --- a/third_party/aom/test/convolve_round_test.cc +++ b/third_party/aom/test/convolve_round_test.cc @@ -11,7 +11,8 @@ #include <assert.h> -#include "./av1_rtcd.h" +#include "config/av1_rtcd.h" + #include "aom/aom_integer.h" #include "aom_ports/aom_timer.h" #include "test/acm_random.h" @@ -51,7 +52,7 @@ void highbd_convolve_rounding_12(CONVOLVE_ROUNDING_PARAM) { typedef enum { LOWBITDEPTH_TEST, HIGHBITDEPTH_TEST } DataPathType; -using std::tr1::tuple; +using ::testing::tuple; typedef tuple<ConvolveRoundFunc, ConvolveRoundFunc, DataPathType> ConvolveRoundParam; @@ -92,11 +93,9 @@ class ConvolveRoundTest : public ::testing::TestWithParam<ConvolveRoundParam> { if (data_path_ == LOWBITDEPTH_TEST) { dst = reinterpret_cast<uint8_t *>(dst_); dst_ref = reinterpret_cast<uint8_t *>(dst_ref_); -#if CONFIG_HIGHBITDEPTH } else if (data_path_ == HIGHBITDEPTH_TEST) { dst = CONVERT_TO_BYTEPTR(dst_); dst_ref = CONVERT_TO_BYTEPTR(dst_ref_); -#endif } else { assert(0); } @@ -163,10 +162,8 @@ class ConvolveRoundTest : public ::testing::TestWithParam<ConvolveRoundParam> { TEST_P(ConvolveRoundTest, BitExactCheck) { ConvolveRoundingRun(); } -using std::tr1::make_tuple; - +using ::testing::make_tuple; #if HAVE_AVX2 -#if CONFIG_HIGHBITDEPTH const ConvolveRoundParam kConvRndParamArray[] = { make_tuple(&av1_convolve_rounding_c, &av1_convolve_rounding_avx2, LOWBITDEPTH_TEST), @@ -180,11 +177,6 @@ const ConvolveRoundParam kConvRndParamArray[] = { &highbd_convolve_rounding_12<av1_highbd_convolve_rounding_avx2>, HIGHBITDEPTH_TEST) }; -#else -const ConvolveRoundParam kConvRndParamArray[] = { make_tuple( - &av1_convolve_rounding_c, &av1_convolve_rounding_avx2, LOWBITDEPTH_TEST) }; -#endif - INSTANTIATE_TEST_CASE_P(AVX2, ConvolveRoundTest, ::testing::ValuesIn(kConvRndParamArray)); #endif // HAVE_AVX2 |