diff options
Diffstat (limited to 'third_party/aom/test/av1_fht64x64_test.cc')
-rw-r--r-- | third_party/aom/test/av1_fht64x64_test.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/third_party/aom/test/av1_fht64x64_test.cc b/third_party/aom/test/av1_fht64x64_test.cc index cde1d0ca3..61ea9f1f3 100644 --- a/third_party/aom/test/av1_fht64x64_test.cc +++ b/third_party/aom/test/av1_fht64x64_test.cc @@ -26,18 +26,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<FhtFunc, IhtFunc, int, aom_bit_depth_t, int> Ht64x64Param; -void fht64x64_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) { - av1_fht64x64_c(in, out, stride, tx_type); +void fht64x64_ref(const int16_t *in, tran_low_t *out, int stride, + TxfmParam *txfm_param) { + av1_fht64x64_c(in, out, stride, txfm_param); } void iht64x64_ref(const tran_low_t *in, uint8_t *dest, int stride, - int tx_type) { - av1_iht64x64_4096_add_c(in, dest, stride, tx_type); + const TxfmParam *txfm_param) { + av1_iht64x64_4096_add_c(in, dest, stride, txfm_param); } class AV1Trans64x64HT : public libaom_test::TransformTestBase, @@ -48,7 +49,6 @@ class AV1Trans64x64HT : public libaom_test::TransformTestBase, virtual void SetUp() { fwd_txfm_ = GET_PARAM(0); inv_txfm_ = GET_PARAM(1); - tx_type_ = GET_PARAM(2); pitch_ = 64; height_ = 64; fwd_txfm_ref = fht64x64_ref; @@ -56,16 +56,17 @@ class AV1Trans64x64HT : 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_; |