Commit efeafa85 authored by Urvang Joshi's avatar Urvang Joshi

Re-enable TX64X64 by default.

Incompatibilities with other experiments has been fixed.

BUG=aomedia:1058

Change-Id: Id8358404c8f452bccf05ce3c1d91a633b215f07d
parent a70cd7b5
......@@ -2324,7 +2324,6 @@ static void fhalfright64(const tran_low_t *input, tran_low_t *output) {
// 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 @@ static void fdct64_col(const tran_low_t *input, tran_low_t *output) {
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];
......
......@@ -188,7 +188,7 @@ set(CONFIG_SPATIAL_SEGMENTATION 0 CACHE NUMBER "AV1 experiment flag.")
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.")
......@@ -523,6 +523,7 @@ post_process_cmdline() {
soft_enable segment_globalmv
soft_enable short_filter
soft_enable simplify_tx_mode
soft_enable tx64x64
fi
# Enable low-bitdepth pixel pipeline by default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment