Commit cca7adc3 authored by Debargha Mukherjee's avatar Debargha Mukherjee Committed by Fred BARBIER

Remove var_tx_no_tx_mode experiment

Change-Id: I9854d5ec193dadaa455c209b1482ead895982cb7
parent 8089315a
......@@ -120,20 +120,11 @@ static int decode_unsigned_max(struct aom_read_bit_buffer *rb, int max) {
#if CONFIG_SIMPLIFY_TX_MODE
static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
if (cm->all_lossless) return ONLY_4X4;
#if CONFIG_VAR_TX_NO_TX_MODE
(void)rb;
return TX_MODE_SELECT;
#else
return aom_rb_read_bit(rb) ? TX_MODE_SELECT : TX_MODE_LARGEST;
#endif // CONFIG_VAR_TX_NO_TX_MODE
}
#else
static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
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 tx_mode =
aom_rb_read_bit(rb) ? TX_MODE_SELECT : aom_rb_read_literal(rb, 2);
......@@ -142,7 +133,6 @@ static TX_MODE read_tx_mode(AV1_COMMON *cm, struct aom_read_bit_buffer *rb) {
#else
return aom_rb_read_bit(rb) ? TX_MODE_SELECT : aom_rb_read_literal(rb, 2);
#endif // CONFIG_TX64X64
#endif // CONFIG_VAR_TX_NO_TX_MODE
}
#endif // CONFIG_SIMPLIFY_TX_MODE
......
......@@ -2681,11 +2681,6 @@ static void write_tx_mode(AV1_COMMON *cm, TX_MODE *mode,
*mode = ONLY_4X4;
return;
}
#if CONFIG_VAR_TX_NO_TX_MODE
(void)wb;
*mode = TX_MODE_SELECT;
return;
#else
#if CONFIG_SIMPLIFY_TX_MODE
aom_wb_write_bit(wb, *mode == TX_MODE_SELECT);
#else
......@@ -2700,7 +2695,6 @@ static void write_tx_mode(AV1_COMMON *cm, TX_MODE *mode,
if (*mode != TX_MODE_SELECT) aom_wb_write_literal(wb, *mode, 2);
#endif // CONFIG_TX64X64
#endif // CONFIG_SIMPLIFY_TX_MODE
#endif // CONFIG_VAR_TX_NO_TX_MODE
}
static void write_frame_interp_filter(InterpFilter filter,
......
......@@ -3520,9 +3520,6 @@ static MV_REFERENCE_FRAME get_frame_type(const AV1_COMP *cpi) {
#if CONFIG_SIMPLIFY_TX_MODE
static TX_MODE select_tx_mode(const AV1_COMP *cpi) {
if (cpi->common.all_lossless) return ONLY_4X4;
#if CONFIG_VAR_TX_NO_TX_MODE
return TX_MODE_SELECT;
#else
if (cpi->sf.tx_size_search_method == USE_LARGESTALL)
return TX_MODE_LARGEST;
else if (cpi->sf.tx_size_search_method == USE_FULL_RD ||
......@@ -3530,14 +3527,10 @@ static TX_MODE select_tx_mode(const AV1_COMP *cpi) {
return TX_MODE_SELECT;
else
return cpi->common.tx_mode;
#endif // CONFIG_VAR_TX_NO_TX_MODE
}
#else
static TX_MODE select_tx_mode(const AV1_COMP *cpi) {
if (cpi->common.all_lossless) return ONLY_4X4;
#if CONFIG_VAR_TX_NO_TX_MODE
return TX_MODE_SELECT;
#else
if (cpi->sf.tx_size_search_method == USE_LARGESTALL)
return ALLOW_32X32 + CONFIG_TX64X64;
else if (cpi->sf.tx_size_search_method == USE_FULL_RD ||
......@@ -3545,7 +3538,6 @@ static TX_MODE select_tx_mode(const AV1_COMP *cpi) {
return TX_MODE_SELECT;
else
return cpi->common.tx_mode;
#endif // CONFIG_VAR_TX_NO_TX_MODE
}
#endif // CONFIG_SIMPLIFY_TX_MODE
......
......@@ -194,5 +194,4 @@ set(CONFIG_TPL_MV 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.")
set(CONFIG_XIPHRC 0 CACHE NUMBER "AV1 experiment flag.")
......@@ -308,7 +308,6 @@ EXPERIMENT_LIST="
ext_qm
ext_comp_refs
bgsprite
var_tx_no_tx_mode
simplify_tx_mode
mrc_tx
loopfilter_level
......
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