From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/test/av1_fht8x16_test.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'third_party/aom/test/av1_fht8x16_test.cc') diff --git a/third_party/aom/test/av1_fht8x16_test.cc b/third_party/aom/test/av1_fht8x16_test.cc index ace9a8f47..11f085885 100644 --- a/third_party/aom/test/av1_fht8x16_test.cc +++ b/third_party/aom/test/av1_fht8x16_test.cc @@ -24,17 +24,19 @@ using libaom_test::ACMRandom; namespace { typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, - int tx_type); + const TxfmParam *txfm_param); using std::tr1::tuple; using libaom_test::FhtFunc; typedef tuple Ht8x16Param; -void fht8x16_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) { - av1_fht8x16_c(in, out, stride, tx_type); +void fht8x16_ref(const int16_t *in, tran_low_t *out, int stride, + TxfmParam *txfm_param) { + av1_fht8x16_c(in, out, stride, txfm_param); } -void iht8x16_ref(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - av1_iht8x16_128_add_c(in, out, stride, tx_type); +void iht8x16_ref(const tran_low_t *in, uint8_t *out, int stride, + const TxfmParam *txfm_param) { + av1_iht8x16_128_add_c(in, out, stride, txfm_param); } class AV1Trans8x16HT : public libaom_test::TransformTestBase, @@ -45,7 +47,6 @@ class AV1Trans8x16HT : public libaom_test::TransformTestBase, virtual void SetUp() { fwd_txfm_ = GET_PARAM(0); inv_txfm_ = GET_PARAM(1); - tx_type_ = GET_PARAM(2); pitch_ = 8; height_ = 16; inv_txfm_ref = iht8x16_ref; @@ -53,16 +54,17 @@ class AV1Trans8x16HT : public libaom_test::TransformTestBase, bit_depth_ = GET_PARAM(3); mask_ = (1 << bit_depth_) - 1; num_coeffs_ = GET_PARAM(4); + txfm_param_.tx_type = GET_PARAM(2); } virtual void TearDown() { libaom_test::ClearSystemState(); } protected: void RunFwdTxfm(const int16_t *in, tran_low_t *out, int stride) { - fwd_txfm_(in, out, stride, tx_type_); + fwd_txfm_(in, out, stride, &txfm_param_); } void RunInvTxfm(const tran_low_t *out, uint8_t *dst, int stride) { - inv_txfm_(out, dst, stride, tx_type_); + inv_txfm_(out, dst, stride, &txfm_param_); } FhtFunc fwd_txfm_; -- cgit v1.2.3