diff --git a/test/av1_fht16x8_test.cc b/test/av1_fht16x8_test.cc index df429e156..c2878c41d 100644 --- a/test/av1_fht16x8_test.cc +++ b/test/av1_fht16x8_test.cc @@ -33,6 +33,10 @@ void fht16x8_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) { av1_fht16x8_c(in, out, stride, tx_type); } +void iht16x8_ref(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { + av1_iht16x8_128_add_c(in, out, stride, tx_type); +} + class AV1Trans16x8HT : public libaom_test::TransformTestBase, public ::testing::TestWithParam { public: @@ -44,6 +48,7 @@ class AV1Trans16x8HT : public libaom_test::TransformTestBase, tx_type_ = GET_PARAM(2); pitch_ = 16; height_ = 8; + inv_txfm_ref = iht16x8_ref; fwd_txfm_ref = fht16x8_ref; bit_depth_ = GET_PARAM(3); mask_ = (1 << bit_depth_) - 1; @@ -65,28 +70,29 @@ class AV1Trans16x8HT : public libaom_test::TransformTestBase, }; TEST_P(AV1Trans16x8HT, CoeffCheck) { RunCoeffCheck(); } +TEST_P(AV1Trans16x8HT, InvCoeffCheck) { RunInvCoeffCheck(); } using std::tr1::make_tuple; #if HAVE_SSE2 const Ht16x8Param kArrayHt16x8Param_sse2[] = { - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 0, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 1, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 2, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 3, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 0, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 1, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 2, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 3, AOM_BITS_8, 128), #if CONFIG_EXT_TX - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 4, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 5, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 6, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 7, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 8, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 9, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 10, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 11, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 12, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 13, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 14, AOM_BITS_8, 128), - make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_c, 15, AOM_BITS_8, 128) + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 4, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 5, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 6, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 7, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 8, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 9, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 10, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 11, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 12, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 13, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 14, AOM_BITS_8, 128), + make_tuple(&av1_fht16x8_sse2, &av1_iht16x8_128_add_sse2, 15, AOM_BITS_8, 128) #endif // CONFIG_EXT_TX }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans16x8HT, diff --git a/test/av1_fht8x16_test.cc b/test/av1_fht8x16_test.cc index 40390e5b2..42907fd54 100644 --- a/test/av1_fht8x16_test.cc +++ b/test/av1_fht8x16_test.cc @@ -33,6 +33,10 @@ 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 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); +} + class AV1Trans8x16HT : public libaom_test::TransformTestBase, public ::testing::TestWithParam { public: @@ -44,6 +48,7 @@ class AV1Trans8x16HT : public libaom_test::TransformTestBase, tx_type_ = GET_PARAM(2); pitch_ = 8; height_ = 16; + inv_txfm_ref = iht8x16_ref; fwd_txfm_ref = fht8x16_ref; bit_depth_ = GET_PARAM(3); mask_ = (1 << bit_depth_) - 1; @@ -65,28 +70,29 @@ class AV1Trans8x16HT : public libaom_test::TransformTestBase, }; TEST_P(AV1Trans8x16HT, CoeffCheck) { RunCoeffCheck(); } +TEST_P(AV1Trans8x16HT, InvCoeffCheck) { RunInvCoeffCheck(); } using std::tr1::make_tuple; #if HAVE_SSE2 const Ht8x16Param kArrayHt8x16Param_sse2[] = { - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 0, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 1, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 2, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 3, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 0, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 1, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 2, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 3, AOM_BITS_8, 128), #if CONFIG_EXT_TX - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 4, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 5, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 6, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 7, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 8, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 9, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 10, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 11, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 12, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 13, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 14, AOM_BITS_8, 128), - make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_c, 15, AOM_BITS_8, 128) + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 4, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 5, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 6, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 7, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 8, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 9, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 10, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 11, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 12, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 13, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 14, AOM_BITS_8, 128), + make_tuple(&av1_fht8x16_sse2, &av1_iht8x16_128_add_sse2, 15, AOM_BITS_8, 128) #endif // CONFIG_EXT_TX }; INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans8x16HT, diff --git a/test/av1_iht16x8_test.cc b/test/av1_iht16x8_test.cc deleted file mode 100644 index 60adb333f..000000000 --- a/test/av1_iht16x8_test.cc +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2016 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "third_party/googletest/src/include/gtest/gtest.h" - -#include "./aom_dsp_rtcd.h" -#include "./av1_rtcd.h" - -#include "aom_ports/mem.h" -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" -#include "test/transform_test_base.h" -#include "test/util.h" - -using libaom_test::ACMRandom; - -namespace { -using std::tr1::tuple; -using libaom_test::FhtFunc; -using libaom_test::IhtFunc; -typedef tuple Ht16x8Param; - -void fht16x8_ref(const int16_t *in, tran_low_t *out, int stride, int tx_type) { - av1_fht16x8_c(in, out, stride, tx_type); -} - -void iht16x8_ref(const tran_low_t *in, uint8_t *out, int stride, int tx_type) { - av1_iht16x8_128_add_c(in, out, stride, tx_type); -} - -class AV1Trans16x8IHT : public libaom_test::TransformTestBase, - public ::testing::TestWithParam { - public: - virtual ~AV1Trans16x8IHT() {} - - virtual void SetUp() { - inv_txfm_ = GET_PARAM(0); - tx_type_ = GET_PARAM(1); - pitch_ = 16; - height_ = 8; - inv_txfm_ref = iht16x8_ref; - fwd_txfm_ref = fht16x8_ref; - bit_depth_ = GET_PARAM(2); - mask_ = (1 << bit_depth_) - 1; - num_coeffs_ = GET_PARAM(3); - } - virtual void TearDown() { libaom_test::ClearSystemState(); } - - protected: - void RunFwdTxfm(const int16_t *in, tran_low_t *out, int stride) { - (void)in; - (void)out; - (void)stride; - } - - void RunInvTxfm(const tran_low_t *out, uint8_t *dst, int stride) { - inv_txfm_(out, dst, stride, tx_type_); - } - - IhtFunc inv_txfm_; -}; - -TEST_P(AV1Trans16x8IHT, InvCoeffCheck) { RunInvCoeffCheck(); } - -using std::tr1::make_tuple; - -#if HAVE_SSE2 -const Ht16x8Param kArrayHt16x8Param_sse2[] = { - make_tuple(&av1_iht16x8_128_add_sse2, 0, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 1, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 2, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 3, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 4, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 5, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 6, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 7, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 8, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 9, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 10, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 11, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 12, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 13, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 14, AOM_BITS_8, 128), - make_tuple(&av1_iht16x8_128_add_sse2, 15, AOM_BITS_8, 128) -}; -INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans16x8IHT, - ::testing::ValuesIn(kArrayHt16x8Param_sse2)); -#endif // HAVE_SSE2 -} // namespace diff --git a/test/av1_iht8x16_test.cc b/test/av1_iht8x16_test.cc deleted file mode 100644 index feb573577..000000000 --- a/test/av1_iht8x16_test.cc +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2016 The WebM project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "third_party/googletest/src/include/gtest/gtest.h" - -#include "./aom_dsp_rtcd.h" -#include "./av1_rtcd.h" - -#include "aom_ports/mem.h" -#include "test/acm_random.h" -#include "test/clear_system_state.h" -#include "test/register_state_check.h" -#include "test/transform_test_base.h" -#include "test/util.h" - -using libaom_test::ACMRandom; - -namespace { -using std::tr1::tuple; -using libaom_test::FhtFunc; -using libaom_test::IhtFunc; -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 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); -} - -class AV1Trans8x16IHT : public libaom_test::TransformTestBase, - public ::testing::TestWithParam { - public: - virtual ~AV1Trans8x16IHT() {} - - virtual void SetUp() { - inv_txfm_ = GET_PARAM(0); - tx_type_ = GET_PARAM(1); - pitch_ = 8; - height_ = 16; - inv_txfm_ref = iht8x16_ref; - fwd_txfm_ref = fht8x16_ref; - bit_depth_ = GET_PARAM(2); - mask_ = (1 << bit_depth_) - 1; - num_coeffs_ = GET_PARAM(3); - } - virtual void TearDown() { libaom_test::ClearSystemState(); } - - protected: - void RunFwdTxfm(const int16_t *in, tran_low_t *out, int stride) { - (void)in; - (void)out; - (void)stride; - } - - void RunInvTxfm(const tran_low_t *out, uint8_t *dst, int stride) { - inv_txfm_(out, dst, stride, tx_type_); - } - - IhtFunc inv_txfm_; -}; - -TEST_P(AV1Trans8x16IHT, InvCoeffCheck) { RunInvCoeffCheck(); } - -using std::tr1::make_tuple; - -#if HAVE_SSE2 -const Ht8x16Param kArrayHt8x16Param_sse2[] = { - make_tuple(&av1_iht8x16_128_add_sse2, 0, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 1, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 2, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 3, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 4, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 5, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 6, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 7, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 8, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 9, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 10, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 11, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 12, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 13, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 14, AOM_BITS_8, 128), - make_tuple(&av1_iht8x16_128_add_sse2, 15, AOM_BITS_8, 128) -}; -INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans8x16IHT, - ::testing::ValuesIn(kArrayHt8x16Param_sse2)); -#endif // HAVE_SSE2 - -} // namespace diff --git a/test/test.mk b/test/test.mk index 44bf6faea..42ff2baa3 100644 --- a/test/test.mk +++ b/test/test.mk @@ -144,8 +144,6 @@ LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_fht8x16_test.cc LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_fht16x8_test.cc LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_fht16x32_test.cc LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_fht32x16_test.cc -LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_iht8x16_test.cc -LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += av1_iht16x8_test.cc LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += fht32x32_test.cc endif LIBAOM_TEST_SRCS-$(CONFIG_EXT_TILE) += av1_ext_tile_test.cc