diff options
author | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:00 -0500 |
---|---|---|
committer | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:03 -0500 |
commit | d2499ead93dc4298c0882fe98902acb1b5209f99 (patch) | |
tree | cb0b942aed59e5108f9a3e9d64e7b77854383421 /third_party/aom/test/warp_filter_test_util.h | |
parent | 41fbdea457bf50c0a43e1c27c5cbf7f0a3a9eb33 (diff) | |
download | UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.gz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.lz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.xz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.zip |
Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591
Diffstat (limited to 'third_party/aom/test/warp_filter_test_util.h')
-rw-r--r-- | third_party/aom/test/warp_filter_test_util.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/third_party/aom/test/warp_filter_test_util.h b/third_party/aom/test/warp_filter_test_util.h index cf72d9db6..b8998e5c8 100644 --- a/third_party/aom/test/warp_filter_test_util.h +++ b/third_party/aom/test/warp_filter_test_util.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef TEST_WARP_FILTER_TEST_UTIL_H_ -#define TEST_WARP_FILTER_TEST_UTIL_H_ +#ifndef AOM_TEST_WARP_FILTER_TEST_UTIL_H_ +#define AOM_TEST_WARP_FILTER_TEST_UTIL_H_ #include "config/av1_rtcd.h" #include "config/aom_dsp_rtcd.h" @@ -28,7 +28,8 @@ namespace libaom_test { void generate_warped_model(libaom_test::ACMRandom *rnd, int32_t *mat, int16_t *alpha, int16_t *beta, int16_t *gamma, - int16_t *delta); + int16_t *delta, int is_alpha_zero, int is_beta_zero, + int is_gamma_zero, int is_delta_zero); namespace AV1WarpFilter { @@ -41,11 +42,12 @@ typedef void (*warp_affine_func)(const int32_t *mat, const uint8_t *ref, int16_t beta, int16_t gamma, int16_t delta); typedef ::testing::tuple<int, int, int, warp_affine_func> WarpTestParam; +typedef ::testing::tuple<WarpTestParam, int, int, int, int> WarpTestParams; -::testing::internal::ParamGenerator<WarpTestParam> BuildParams( +::testing::internal::ParamGenerator<WarpTestParams> BuildParams( warp_affine_func filter); -class AV1WarpFilterTest : public ::testing::TestWithParam<WarpTestParam> { +class AV1WarpFilterTest : public ::testing::TestWithParam<WarpTestParams> { public: virtual ~AV1WarpFilterTest(); virtual void SetUp(); @@ -73,12 +75,14 @@ typedef void (*highbd_warp_affine_func)(const int32_t *mat, const uint16_t *ref, typedef ::testing::tuple<int, int, int, int, highbd_warp_affine_func> HighbdWarpTestParam; +typedef ::testing::tuple<HighbdWarpTestParam, int, int, int, int> + HighbdWarpTestParams; -::testing::internal::ParamGenerator<HighbdWarpTestParam> BuildParams( +::testing::internal::ParamGenerator<HighbdWarpTestParams> BuildParams( highbd_warp_affine_func filter); class AV1HighbdWarpFilterTest - : public ::testing::TestWithParam<HighbdWarpTestParam> { + : public ::testing::TestWithParam<HighbdWarpTestParams> { public: virtual ~AV1HighbdWarpFilterTest(); virtual void SetUp(); @@ -96,4 +100,4 @@ class AV1HighbdWarpFilterTest } // namespace libaom_test -#endif // TEST_WARP_FILTER_TEST_UTIL_H_ +#endif // AOM_TEST_WARP_FILTER_TEST_UTIL_H_ |