Commit 978152a9 authored by Urvang Joshi's avatar Urvang Joshi

Remove flag ALLOW_INTRA_EXT_TX

Change-Id: Ic68c6e8d54782f47fe9d1d1775b861edeb52bf35
parent 2f052eea
......@@ -718,8 +718,6 @@ static INLINE int block_signals_txsize(BLOCK_SIZE bsize) {
return bsize > BLOCK_4X4;
}
#define ALLOW_INTRA_EXT_TX 1
// Number of transform types in each set type
static const int av1_num_ext_tx_set[EXT_TX_SET_TYPES] = {
1, 2, 5, 7, 7, 10, 12, 16, 16,
......@@ -992,10 +990,7 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
#endif
return DCT_DCT;
if (plane_type == PLANE_TYPE_Y) {
#if !ALLOW_INTRA_EXT_TX
if (is_inter_block(mbmi))
#endif // ALLOW_INTRA_EXT_TX
return mbmi->tx_type;
return mbmi->tx_type;
}
if (is_inter_block(mbmi)) {
......
......@@ -936,7 +936,7 @@ void av1_read_tx_type(const AV1_COMMON *const cm, MACROBLOCKD *xd,
*tx_type = av1_ext_tx_inv[tx_set_type][aom_read_symbol(
r, ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
av1_num_ext_tx_set[tx_set_type], ACCT_STR)];
} else if (ALLOW_INTRA_EXT_TX) {
} else {
#if CONFIG_FILTER_INTRA
PREDICTION_MODE intra_dir;
if (mbmi->filter_intra_mode_info.use_filter_intra)
......
......@@ -1070,7 +1070,7 @@ void av1_write_tx_type(const AV1_COMMON *const cm, const MACROBLOCKD *xd,
aom_write_symbol(w, av1_ext_tx_ind[tx_set_type][tx_type],
ec_ctx->inter_ext_tx_cdf[eset][square_tx_size],
av1_num_ext_tx_set[tx_set_type]);
} else if (ALLOW_INTRA_EXT_TX) {
} else {
#if CONFIG_FILTER_INTRA
PREDICTION_MODE intra_dir;
if (mbmi->filter_intra_mode_info.use_filter_intra)
......
......@@ -2151,7 +2151,7 @@ int av1_tx_type_cost(const AV1_COMMON *cm, const MACROBLOCK *x,
if (ext_tx_set > 0)
return x->inter_tx_type_costs[ext_tx_set][square_tx_size][tx_type];
} else {
if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX) {
if (ext_tx_set > 0) {
#if CONFIG_FILTER_INTRA
PREDICTION_MODE intra_dir;
if (mbmi->filter_intra_mode_info.use_filter_intra)
......@@ -2248,11 +2248,6 @@ static int skip_txfm_search(const AV1_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs,
if (!do_tx_type_search(tx_type, prune, cpi->sf.tx_type_search.prune_mode))
return 1;
}
} else {
if (!ALLOW_INTRA_EXT_TX && bs >= BLOCK_8X8) {
if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y))
return 1;
}
}
return 0;
}
......@@ -2318,10 +2313,6 @@ static void choose_largest_tx_size(const AV1_COMP *const cpi, MACROBLOCK *x,
if (x->use_default_intra_tx_type &&
tx_type != get_default_tx_type(0, xd, mbmi->tx_size))
continue;
if (!ALLOW_INTRA_EXT_TX && bs >= BLOCK_8X8) {
if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y))
continue;
}
}
mbmi->tx_type = tx_type;
......@@ -4682,11 +4673,6 @@ static void select_tx_type_yrd(const AV1_COMP *cpi, MACROBLOCK *x,
cpi->sf.tx_type_search.prune_mode))
continue;
}
} else {
if (!ALLOW_INTRA_EXT_TX && bsize >= BLOCK_8X8) {
if (tx_type != intra_mode_to_tx_type_context(mbmi, PLANE_TYPE_Y)
continue;
}
}
*/
if (is_inter && x->use_default_inter_tx_type &&
......
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