diff options
author | trav90 <travawine@palemoon.org> | 2018-10-19 21:52:15 -0500 |
---|---|---|
committer | trav90 <travawine@palemoon.org> | 2018-10-19 21:52:20 -0500 |
commit | bbcc64772580c8a979288791afa02d30bc476d2e (patch) | |
tree | 437ce94c3fdd7497508e5b55de06c6d011678597 /third_party/aom/test/av1_convolve_2d_test_util.h | |
parent | 14805f6ddbfb173c327768fff9f81f40ce5e81b0 (diff) | |
download | UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.gz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.lz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.xz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.zip |
Update aom to v1.0.0
Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0.
Diffstat (limited to 'third_party/aom/test/av1_convolve_2d_test_util.h')
-rw-r--r-- | third_party/aom/test/av1_convolve_2d_test_util.h | 62 |
1 files changed, 46 insertions, 16 deletions
diff --git a/third_party/aom/test/av1_convolve_2d_test_util.h b/third_party/aom/test/av1_convolve_2d_test_util.h index 013126b4a..3a53dbdfe 100644 --- a/third_party/aom/test/av1_convolve_2d_test_util.h +++ b/third_party/aom/test/av1_convolve_2d_test_util.h @@ -12,11 +12,13 @@ #ifndef TEST_HIPREC_CONVOLVE_TEST_UTIL_H_ #define TEST_HIPREC_CONVOLVE_TEST_UTIL_H_ +#include "config/av1_rtcd.h" +#include "config/aom_dsp_rtcd.h" + #include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "test/acm_random.h" #include "test/util.h" -#include "./av1_rtcd.h" -#include "./aom_dsp_rtcd.h" + #include "test/clear_system_state.h" #include "test/register_state_check.h" @@ -25,62 +27,90 @@ namespace libaom_test { namespace AV1Convolve2D { typedef void (*convolve_2d_func)(const uint8_t *src, int src_stride, - CONV_BUF_TYPE *dst, int dst_stride, int w, - int h, InterpFilterParams *filter_params_x, + uint8_t *dst, int dst_stride, int w, int h, + InterpFilterParams *filter_params_x, InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); -typedef std::tr1::tuple<int, int, convolve_2d_func> Convolve2DParam; +typedef ::testing::tuple<convolve_2d_func, int, int, BLOCK_SIZE> + Convolve2DParam; ::testing::internal::ParamGenerator<Convolve2DParam> BuildParams( - convolve_2d_func filter); + convolve_2d_func filter, int subx_exist, int suby_exist); -class AV1Convolve2DTest : public ::testing::TestWithParam<Convolve2DParam> { +class AV1Convolve2DSrTest : public ::testing::TestWithParam<Convolve2DParam> { public: - virtual ~AV1Convolve2DTest(); + virtual ~AV1Convolve2DSrTest(); virtual void SetUp(); virtual void TearDown(); protected: void RunCheckOutput(convolve_2d_func test_impl); + void RunSpeedTest(convolve_2d_func test_impl); libaom_test::ACMRandom rnd_; }; +class AV1JntConvolve2DTest : public ::testing::TestWithParam<Convolve2DParam> { + public: + virtual ~AV1JntConvolve2DTest(); + virtual void SetUp(); + + virtual void TearDown(); + + protected: + void RunCheckOutput(convolve_2d_func test_impl); + void RunSpeedTest(convolve_2d_func test_impl); + + libaom_test::ACMRandom rnd_; +}; } // namespace AV1Convolve2D -#if CONFIG_HIGHBITDEPTH namespace AV1HighbdConvolve2D { typedef void (*highbd_convolve_2d_func)( - const uint16_t *src, int src_stride, CONV_BUF_TYPE *dst, int dst_stride, - int w, int h, InterpFilterParams *filter_params_x, + const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, + int h, InterpFilterParams *filter_params_x, InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); -typedef std::tr1::tuple<int, int, int, highbd_convolve_2d_func> +typedef ::testing::tuple<int, highbd_convolve_2d_func, int, int, BLOCK_SIZE> HighbdConvolve2DParam; ::testing::internal::ParamGenerator<HighbdConvolve2DParam> BuildParams( - highbd_convolve_2d_func filter); + highbd_convolve_2d_func filter, int subx_exist, int suby_exist); -class AV1HighbdConvolve2DTest +class AV1HighbdConvolve2DSrTest : public ::testing::TestWithParam<HighbdConvolve2DParam> { public: - virtual ~AV1HighbdConvolve2DTest(); + virtual ~AV1HighbdConvolve2DSrTest(); virtual void SetUp(); virtual void TearDown(); protected: void RunCheckOutput(highbd_convolve_2d_func test_impl); + void RunSpeedTest(highbd_convolve_2d_func test_impl); libaom_test::ACMRandom rnd_; }; +class AV1HighbdJntConvolve2DTest + : public ::testing::TestWithParam<HighbdConvolve2DParam> { + public: + virtual ~AV1HighbdJntConvolve2DTest(); + virtual void SetUp(); + + virtual void TearDown(); + + protected: + void RunCheckOutput(highbd_convolve_2d_func test_impl); + void RunSpeedTest(highbd_convolve_2d_func test_impl); + + libaom_test::ACMRandom rnd_; +}; } // namespace AV1HighbdConvolve2D -#endif // CONFIG_HIGHBITDEPTH } // namespace libaom_test |