Commit fe8323c9 authored by Urvang Joshi's avatar Urvang Joshi

Enable TX64X64 by default.

Provisionally adopted on 11/17.

Also, some related tweaks to fix build errors.

Change-Id: I7d5592450e9284d489b46adc274cd0cfccd04b3c
parent a8db0e8d
......@@ -1572,7 +1572,6 @@ void av1_fdct64_new(const int32_t *input, int32_t *output,
// stage 1;
stage++;
cospi = cospi_arr(cos_bit[stage]);
bf1 = output;
bf1[0] = input[0] + input[63];
bf1[1] = input[1] + input[62];
......@@ -2281,7 +2280,6 @@ void av1_fdct64_new(const int32_t *input, int32_t *output,
// stage 11
stage++;
cospi = cospi_arr(cos_bit[stage]);
bf0 = step;
bf1 = output;
bf1[0] = bf0[0];
......
......@@ -1618,7 +1618,6 @@ void av1_idct64_new(const int32_t *input, int32_t *output,
// stage 1;
stage++;
cospi = cospi_arr(cos_bit[stage]);
assert(output != input);
bf1 = output;
bf1[0] = input[0];
......@@ -2328,7 +2327,6 @@ void av1_idct64_new(const int32_t *input, int32_t *output,
// stage 11
stage++;
cospi = cospi_arr(cos_bit[stage]);
bf0 = step;
bf1 = output;
bf1[0] = bf0[0] + bf0[63];
......
......@@ -63,13 +63,13 @@ static void iidtx32_c(const tran_low_t *input, tran_low_t *output) {
}
}
#if CONFIG_TX64X64 && !CONFIG_DAALA_TX64
#if CONFIG_TX64X64 && (!CONFIG_DAALA_TX32 || !CONFIG_DAALA_TX64)
static void iidtx64_c(const tran_low_t *input, tran_low_t *output) {
for (int i = 0; i < 64; ++i) {
output[i] = (tran_low_t)dct_const_round_shift(input[i] * 4 * Sqrt2);
}
}
#endif // CONFIG_TX64X64
#endif // CONFIG_TX64X64 && (!CONFIG_DAALA_TX32 || !CONFIG_DAALA_TX64)
// For use in lieu of ADST
static void ihalfright32_c(const tran_low_t *input, tran_low_t *output) {
......@@ -85,7 +85,7 @@ static void ihalfright32_c(const tran_low_t *input, tran_low_t *output) {
// Note overall scaling factor is 4 times orthogonal
}
#if CONFIG_TX64X64 && !CONFIG_DAALA_TX64
#if CONFIG_TX64X64 && (!CONFIG_DAALA_TX32 || !CONFIG_DAALA_TX64)
static void idct64_col_c(const tran_low_t *input, tran_low_t *output) {
int32_t in[64], out[64];
......@@ -115,7 +115,7 @@ static void ihalfright64_c(const tran_low_t *input, tran_low_t *output) {
aom_idct32_c(inputhalf, output + 32);
// Note overall scaling factor is 4 * sqrt(2) times orthogonal
}
#endif // CONFIG_TX64X64
#endif // CONFIG_TX64X64 && (!CONFIG_DAALA_TX32 || !CONFIG_DAALA_TX64)
// Inverse identity transform and add.
#if !(CONFIG_DAALA_TX4 && CONFIG_DAALA_TX8 && CONFIG_DAALA_TX16 && \
......
......@@ -129,16 +129,14 @@ static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
}
#else
static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
#if CONFIG_TX64X64
TX_MODE tx_mode;
#endif
if (cm->all_lossless) return ONLY_4X4;
#if CONFIG_VAR_TX_NO_TX_MODE
(void)rb;
return TX_MODE_SELECT;
#else
#if CONFIG_TX64X64
tx_mode = aom_rb_read_bit(rb) ? TX_MODE_SELECT : aom_rb_read_literal(rb, 2);
TX_MODE tx_mode =
aom_rb_read_bit(rb) ? TX_MODE_SELECT : aom_rb_read_literal(rb, 2);
if (tx_mode == ALLOW_32X32) tx_mode += aom_rb_read_bit(rb);
return tx_mode;
#else
......
......@@ -2434,6 +2434,10 @@ static int64_t txfm_yrd(const AV1_COMP *const cpi, MACROBLOCK *x,
mbmi->filter_intra_mode_info.use_filter_intra_mode[0] &&
!av1_filter_intra_allowed_txsize(tx_size)) {
rd_stats->rate = INT_MAX;
// Note: Initialize following to avoid uninitialied warnings.
rd_stats->dist = INT64_MAX;
rd_stats->skip = 0;
rd_stats->sse = INT64_MAX;
return INT64_MAX;
}
#endif
......
......@@ -191,7 +191,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_TPL_MV 0 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_VAR_TX_NO_TX_MODE 0 CACHE NUMBER "AV1 experiment flag.")
......
......@@ -525,6 +525,7 @@ post_process_cmdline() {
soft_enable frame_size
soft_enable segment_globalmv
soft_enable short_filter
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