Re-enable TX64X64 by default.
Incompatibilities with other experiments has been fixed.
BUG=aomedia:1058
Change-Id: Id8358404c8f452bccf05ce3c1d91a633b215f07d
diff --git a/av1/encoder/dct.c b/av1/encoder/dct.c
index a814e7a..e8e4e53 100644
--- a/av1/encoder/dct.c
+++ b/av1/encoder/dct.c
@@ -2324,7 +2324,6 @@
// Note overall scaling factor is 2 times unitary
}
-#if !CONFIG_DAALA_TX64
static void fdct64_col(const tran_low_t *input, tran_low_t *output) {
int32_t in[64], out[64];
int i;
@@ -2332,7 +2331,6 @@
av1_fdct64_new(in, out, fwd_cos_bit_col_dct_64, fwd_stage_range_col_dct_64);
for (i = 0; i < 64; ++i) output[i] = (tran_low_t)out[i];
}
-#endif
static void fdct64_row(const tran_low_t *input, tran_low_t *output) {
int32_t in[64], out[64];
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index b513766..862bb42 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -188,7 +188,7 @@
set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TEMPMV_SIGNALING 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TMV 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_TX64X64 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_TX64X64 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TXK_SEL 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TXMG 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_XIPHRC 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure
index 2625d54..076bc84 100755
--- a/configure
+++ b/configure
@@ -523,6 +523,7 @@
soft_enable segment_globalmv
soft_enable short_filter
soft_enable simplify_tx_mode
+ soft_enable tx64x64
fi
# Enable low-bitdepth pixel pipeline by default
