Remove DAALA_TX experiment
This experiment has been abandonned for AV1.
Change-Id: Ief8ed6a51a5e7bac17838ebb7a88d88bbf90a96f
diff --git a/test/av1_dct_test.cc b/test/av1_dct_test.cc
index c8a474f..fd68a54 100644
--- a/test/av1_dct_test.cc
+++ b/test/av1_dct_test.cc
@@ -23,10 +23,6 @@
#define CONFIG_COEFFICIENT_RANGE_CHECKING 1
#define AV1_DCT_GTEST
#include "av1/encoder/dct.c"
-#if CONFIG_DAALA_TX4 || CONFIG_DAALA_TX8 || CONFIG_DAALA_TX16 || \
- CONFIG_DAALA_Tx32
-#include "av1/common/daala_tx.c"
-#endif
using libaom_test::ACMRandom;
diff --git a/test/av1_fht16x16_test.cc b/test/av1_fht16x16_test.cc
index 93440f7..24f4c78 100644
--- a/test/av1_fht16x16_test.cc
+++ b/test/av1_fht16x16_test.cc
@@ -23,7 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -161,7 +160,7 @@
using std::tr1::make_tuple;
-#if HAVE_SSE2 && !CONFIG_DAALA_TX16
+#if HAVE_SSE2
const Ht16x16Param kArrayHt16x16Param_sse2[] = {
make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_sse2, DCT_DCT,
AOM_BITS_8, 256),
@@ -200,7 +199,7 @@
::testing::ValuesIn(kArrayHt16x16Param_sse2));
#endif // HAVE_SSE2
-#if HAVE_AVX2 && !CONFIG_DAALA_TX16
+#if HAVE_AVX2
const Ht16x16Param kArrayHt16x16Param_avx2[] = {
make_tuple(&av1_fht16x16_avx2, &av1_iht16x16_256_add_avx2, DCT_DCT,
AOM_BITS_8, 256),
@@ -239,7 +238,7 @@
::testing::ValuesIn(kArrayHt16x16Param_avx2));
#endif // HAVE_AVX2
-#if HAVE_SSE4_1 && !CONFIG_DAALA_TX16
+#if HAVE_SSE4_1
const HighbdHt16x16Param kArrayHBDHt16x16Param_sse4_1[] = {
make_tuple(&av1_fwd_txfm2d_16x16_sse4_1, DCT_DCT, 10),
make_tuple(&av1_fwd_txfm2d_16x16_sse4_1, DCT_DCT, 12),
@@ -262,7 +261,6 @@
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans16x16HT,
::testing::ValuesIn(kArrayHBDHt16x16Param_sse4_1));
-#endif // HAVE_SSE4_1 && !CONFIG_DAALA_TX16
+#endif // HAVE_SSE4_1
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht16x32_test.cc b/test/av1_fht16x32_test.cc
index 871dc8b..ac89d54 100644
--- a/test/av1_fht16x32_test.cc
+++ b/test/av1_fht16x32_test.cc
@@ -23,8 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
-
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -153,5 +151,3 @@
#endif // HAVE_SSE2
} // namespace
-
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht16x8_test.cc b/test/av1_fht16x8_test.cc
index b32cf8e..991cdb4 100644
--- a/test/av1_fht16x8_test.cc
+++ b/test/av1_fht16x8_test.cc
@@ -23,7 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -150,5 +149,3 @@
#endif // HAVE_SSE2
} // namespace
-
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht32x16_test.cc b/test/av1_fht32x16_test.cc
index 177ddf2..3caa129 100644
--- a/test/av1_fht32x16_test.cc
+++ b/test/av1_fht32x16_test.cc
@@ -23,8 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
-
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -153,4 +151,3 @@
#endif // HAVE_SSE2
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht32x32_test.cc b/test/av1_fht32x32_test.cc
index 2fc4db8..b31d2f4 100644
--- a/test/av1_fht32x32_test.cc
+++ b/test/av1_fht32x32_test.cc
@@ -48,7 +48,7 @@
av1_fwd_txfm2d_32x32_c(in, out, stride, tx_type, bd);
}
-#if (HAVE_SSE2 || HAVE_AVX2) && !CONFIG_DAALA_TX32
+#if (HAVE_SSE2 || HAVE_AVX2)
void dummy_inv_txfm(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param) {
(void)in;
@@ -161,7 +161,7 @@
using std::tr1::make_tuple;
-#if HAVE_SSE2 && !CONFIG_DAALA_TX32
+#if HAVE_SSE2
const Ht32x32Param kArrayHt32x32Param_sse2[] = {
make_tuple(&av1_fht32x32_sse2, &dummy_inv_txfm, DCT_DCT, AOM_BITS_8, 1024),
make_tuple(&av1_fht32x32_sse2, &dummy_inv_txfm, ADST_DCT, AOM_BITS_8, 1024),
@@ -187,9 +187,9 @@
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1Trans32x32HT,
::testing::ValuesIn(kArrayHt32x32Param_sse2));
-#endif // HAVE_SSE2 && !CONFIG_DAALA_TX32
+#endif // HAVE_SSE2
-#if HAVE_AVX2 && !CONFIG_DAALA_TX32
+#if HAVE_AVX2
const Ht32x32Param kArrayHt32x32Param_avx2[] = {
make_tuple(&av1_fht32x32_avx2, &dummy_inv_txfm, DCT_DCT, AOM_BITS_8, 1024),
make_tuple(&av1_fht32x32_avx2, &dummy_inv_txfm, ADST_DCT, AOM_BITS_8, 1024),
@@ -215,5 +215,5 @@
};
INSTANTIATE_TEST_CASE_P(AVX2, AV1Trans32x32HT,
::testing::ValuesIn(kArrayHt32x32Param_avx2));
-#endif // HAVE_AVX2 && !CONFIG_DAALA_TX32
+#endif // HAVE_AVX2
} // namespace
diff --git a/test/av1_fht4x4_test.cc b/test/av1_fht4x4_test.cc
index 91c9798..ef61bce 100644
--- a/test/av1_fht4x4_test.cc
+++ b/test/av1_fht4x4_test.cc
@@ -23,7 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -164,7 +163,7 @@
using std::tr1::make_tuple;
-#if HAVE_SSE2 && !CONFIG_DAALA_TX4
+#if HAVE_SSE2
const Ht4x4Param kArrayHt4x4Param_sse2[] = {
make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_sse2, DCT_DCT, AOM_BITS_8,
16),
@@ -198,7 +197,7 @@
::testing::ValuesIn(kArrayHt4x4Param_sse2));
#endif // HAVE_SSE2
-#if HAVE_SSE4_1 && !CONFIG_DAALA_TX4
+#if HAVE_SSE4_1
const HighbdHt4x4Param kArrayHighbdHt4x4Param[] = {
make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, DCT_DCT, 10),
make_tuple(&av1_fwd_txfm2d_4x4_sse4_1, DCT_DCT, 12),
@@ -223,7 +222,6 @@
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans4x4HT,
::testing::ValuesIn(kArrayHighbdHt4x4Param));
-#endif // HAVE_SSE4_1 && !CONFIG_DAALA_TX4
+#endif // HAVE_SSE4_1
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht4x8_test.cc b/test/av1_fht4x8_test.cc
index 00a2916..8be6aa0 100644
--- a/test/av1_fht4x8_test.cc
+++ b/test/av1_fht4x8_test.cc
@@ -23,7 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -140,4 +139,3 @@
#endif // HAVE_SSE2
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht64x64_test.cc b/test/av1_fht64x64_test.cc
index d833324..a611c5b 100644
--- a/test/av1_fht64x64_test.cc
+++ b/test/av1_fht64x64_test.cc
@@ -20,7 +20,7 @@
#include "test/transform_test_base.h"
#include "test/util.h"
-#if CONFIG_TX64X64 && !CONFIG_DAALA_TX
+#if CONFIG_TX64X64
using libaom_test::ACMRandom;
diff --git a/test/av1_fht8x16_test.cc b/test/av1_fht8x16_test.cc
index a706a98..fc5748d 100644
--- a/test/av1_fht8x16_test.cc
+++ b/test/av1_fht8x16_test.cc
@@ -22,7 +22,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -149,4 +148,3 @@
#endif // HAVE_SSE2
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht8x4_test.cc b/test/av1_fht8x4_test.cc
index 6806edb..e88bc35 100644
--- a/test/av1_fht8x4_test.cc
+++ b/test/av1_fht8x4_test.cc
@@ -22,7 +22,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -139,4 +138,3 @@
#endif // HAVE_SSE2
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_fht8x8_test.cc b/test/av1_fht8x8_test.cc
index a73053f..6510099 100644
--- a/test/av1_fht8x8_test.cc
+++ b/test/av1_fht8x8_test.cc
@@ -23,7 +23,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param);
@@ -164,7 +163,7 @@
using std::tr1::make_tuple;
-#if HAVE_SSE2 && !CONFIG_DAALA_TX8
+#if HAVE_SSE2
const Ht8x8Param kArrayHt8x8Param_sse2[] = {
make_tuple(&av1_fht8x8_sse2, &av1_iht8x8_64_add_sse2, DCT_DCT, AOM_BITS_8,
64),
@@ -198,7 +197,7 @@
::testing::ValuesIn(kArrayHt8x8Param_sse2));
#endif // HAVE_SSE2
-#if HAVE_SSE4_1 && !CONFIG_DAALA_TX8
+#if HAVE_SSE4_1
const HighbdHt8x8Param kArrayHBDHt8x8Param_sse4_1[] = {
make_tuple(&av1_fwd_txfm2d_8x8_sse4_1, DCT_DCT, 10),
make_tuple(&av1_fwd_txfm2d_8x8_sse4_1, DCT_DCT, 12),
@@ -221,7 +220,6 @@
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdTrans8x8HT,
::testing::ValuesIn(kArrayHBDHt8x8Param_sse4_1));
-#endif // HAVE_SSE4_1 && !CONFIG_DAALA_TX8
+#endif // HAVE_SSE4_1
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 81e635a..761193e 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -137,22 +137,16 @@
using std::tr1::make_tuple;
-#if HAVE_SSE4_1 && !(CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16)
-#if !CONFIG_DAALA_TX4
+#if HAVE_SSE4_1
#define PARAM_LIST_4X4 \
&av1_fwd_txfm2d_4x4_c, &av1_inv_txfm2d_add_4x4_sse4_1, \
&av1_inv_txfm2d_add_4x4_c, 16
-#endif
-#if !CONFIG_DAALA_TX8
#define PARAM_LIST_8X8 \
&av1_fwd_txfm2d_8x8_c, &av1_inv_txfm2d_add_8x8_sse4_1, \
&av1_inv_txfm2d_add_8x8_c, 64
-#endif
-#if !CONFIG_DAALA_TX16
#define PARAM_LIST_16X16 \
&av1_fwd_txfm2d_16x16_c, &av1_inv_txfm2d_add_16x16_sse4_1, \
&av1_inv_txfm2d_add_16x16_c, 256
-#endif
#if CONFIG_TX64X64
#define PARAM_LIST_64X64 \
&av1_fwd_txfm2d_64x64_c, &av1_inv_txfm2d_add_64x64_sse4_1, \
@@ -160,8 +154,7 @@
#endif
const IHbdHtParam kArrayIhtParam[] = {
-// 16x16
-#if !CONFIG_DAALA_TX16
+ // 16x16
make_tuple(PARAM_LIST_16X16, DCT_DCT, 10),
make_tuple(PARAM_LIST_16X16, DCT_DCT, 12),
make_tuple(PARAM_LIST_16X16, ADST_DCT, 10),
@@ -180,9 +173,7 @@
make_tuple(PARAM_LIST_16X16, ADST_FLIPADST, 12),
make_tuple(PARAM_LIST_16X16, FLIPADST_ADST, 10),
make_tuple(PARAM_LIST_16X16, FLIPADST_ADST, 12),
-#endif
-// 8x8
-#if !CONFIG_DAALA_TX8
+ // 8x8
make_tuple(PARAM_LIST_8X8, DCT_DCT, 10),
make_tuple(PARAM_LIST_8X8, DCT_DCT, 12),
make_tuple(PARAM_LIST_8X8, ADST_DCT, 10),
@@ -201,9 +192,7 @@
make_tuple(PARAM_LIST_8X8, ADST_FLIPADST, 12),
make_tuple(PARAM_LIST_8X8, FLIPADST_ADST, 10),
make_tuple(PARAM_LIST_8X8, FLIPADST_ADST, 12),
-#endif
-// 4x4
-#if !CONFIG_DAALA_TX4
+ // 4x4
make_tuple(PARAM_LIST_4X4, DCT_DCT, 10),
make_tuple(PARAM_LIST_4X4, DCT_DCT, 12),
make_tuple(PARAM_LIST_4X4, ADST_DCT, 10),
@@ -222,7 +211,6 @@
make_tuple(PARAM_LIST_4X4, ADST_FLIPADST, 12),
make_tuple(PARAM_LIST_4X4, FLIPADST_ADST, 10),
make_tuple(PARAM_LIST_4X4, FLIPADST_ADST, 12),
-#endif
#if CONFIG_TX64X64
make_tuple(PARAM_LIST_64X64, DCT_DCT, 10),
make_tuple(PARAM_LIST_64X64, DCT_DCT, 12),
@@ -231,10 +219,9 @@
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1HighbdInvHTNxN,
::testing::ValuesIn(kArrayIhtParam));
-#endif // HAVE_SSE4_1 &&
- // !(CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16)
+#endif // HAVE_SSE4_1
-#if HAVE_AVX2 && !CONFIG_DAALA_TX32
+#if HAVE_AVX2
#define PARAM_LIST_32X32 \
&av1_fwd_txfm2d_32x32_c, &av1_inv_txfm2d_add_32x32_avx2, \
&av1_inv_txfm2d_add_32x32_c, 1024
diff --git a/test/dct16x16_test.cc b/test/dct16x16_test.cc
index 5ae7d69..572feb8 100644
--- a/test/dct16x16_test.cc
+++ b/test/dct16x16_test.cc
@@ -30,7 +30,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
const int kNumCoeffs = 256;
@@ -753,7 +752,6 @@
::testing::Values(make_tuple(&aom_fdct16x16_sse2,
&aom_idct16x16_256_add_c,
DCT_DCT, AOM_BITS_8)));
-#if !CONFIG_DAALA_TX16
INSTANTIATE_TEST_CASE_P(
SSE2, Trans16x16HT,
::testing::Values(make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_c,
@@ -764,7 +762,5 @@
DCT_ADST, AOM_BITS_8),
make_tuple(&av1_fht16x16_sse2, &av1_iht16x16_256_add_c,
ADST_ADST, AOM_BITS_8)));
-#endif
#endif // HAVE_SSE2
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 0b1052f..aa083d5 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -155,7 +155,7 @@
<< "First failed at test case " << first_failure;
}
-#if (HAVE_SSE2 || HAVE_AVX) && !CONFIG_DAALA_TX
+#if (HAVE_SSE2 || HAVE_AVX)
using std::tr1::make_tuple;
INSTANTIATE_TEST_CASE_P(
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 8d5ce9b..63f1601 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -29,7 +29,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);
typedef void (*IdctFunc)(const tran_low_t *in, uint8_t *out, int stride);
@@ -245,7 +244,7 @@
make_tuple(&av1_fwht4x4_c, &aom_iwht4x4_16_add_c, DCT_DCT,
AOM_BITS_8, 16)));
-#if HAVE_SSE2 && !CONFIG_DAALA_TX4
+#if HAVE_SSE2
INSTANTIATE_TEST_CASE_P(
SSE2, Trans4x4WHT,
::testing::Values(make_tuple(&av1_fwht4x4_c, &aom_iwht4x4_16_add_c, DCT_DCT,
@@ -254,7 +253,7 @@
DCT_DCT, AOM_BITS_8, 16)));
#endif
-#if HAVE_SSE2 && !CONFIG_DAALA_TX4
+#if HAVE_SSE2
INSTANTIATE_TEST_CASE_P(
SSE2, Trans4x4HT,
::testing::Values(make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_c,
@@ -265,7 +264,6 @@
DCT_ADST, AOM_BITS_8, 16),
make_tuple(&av1_fht4x4_sse2, &av1_iht4x4_16_add_c,
ADST_ADST, AOM_BITS_8, 16)));
-#endif // HAVE_SSE2 && !CONFIG_DAALA_TX4
+#endif // HAVE_SSE2
} // namespace
-#endif // !CONFIG_DAALA_TX
diff --git a/test/fdct8x8_test.cc b/test/fdct8x8_test.cc
index 096a3c6..050408f 100644
--- a/test/fdct8x8_test.cc
+++ b/test/fdct8x8_test.cc
@@ -29,7 +29,6 @@
using libaom_test::ACMRandom;
-#if !CONFIG_DAALA_TX
namespace {
const int kNumCoeffs = 64;
@@ -595,7 +594,6 @@
::testing::Values(make_tuple(&aom_fdct8x8_sse2,
&aom_idct8x8_64_add_c,
DCT_DCT, AOM_BITS_8)));
-#if !CONFIG_DAALA_TX8
INSTANTIATE_TEST_CASE_P(
SSE2, FwdTrans8x8HT,
::testing::Values(make_tuple(&av1_fht8x8_sse2, &av1_iht8x8_64_add_c,
@@ -606,7 +604,6 @@
DCT_ADST, AOM_BITS_8),
make_tuple(&av1_fht8x8_sse2, &av1_iht8x8_64_add_c,
ADST_ADST, AOM_BITS_8)));
-#endif // !CONFIG_DAALA_TX8
#endif // HAVE_SSE2
#if HAVE_SSSE3 && ARCH_X86_64
@@ -617,4 +614,3 @@
#endif
} // namespace
-#endif // !CONFIG_DAALA_TX
