Commit 7cdaa607 authored by James Zern's avatar James Zern
Browse files

get_tx_type: remove dead store

w/ !(FIXED_TX_TYPE || CONFIG_EXT_TX)

BUG=aomedia:445

Change-Id: I4e9e531f1983656030c61d823e16f7704b89cfdd
parent 1b6ccfcf
...@@ -953,11 +953,11 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, const MACROBLOCKD *xd, ...@@ -953,11 +953,11 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, const MACROBLOCKD *xd,
if (is_intrabc_block(mbmi)) return DCT_DCT; if (is_intrabc_block(mbmi)) return DCT_DCT;
#endif // CONFIG_INTRABC #endif // CONFIG_INTRABC
#if !CONFIG_TXK_SEL #if !CONFIG_TXK_SEL
#if FIXED_TX_TYPE
const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
return get_default_tx_type(plane_type, xd, block_raster_idx, tx_size);
#elif CONFIG_EXT_TX
const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block); const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
if (FIXED_TX_TYPE)
return get_default_tx_type(plane_type, xd, block_raster_idx, tx_size);
#if CONFIG_EXT_TX
if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] > TX_32X32 || if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] > TX_32X32 ||
(txsize_sqr_map[tx_size] >= TX_32X32 && !is_inter_block(mbmi))) (txsize_sqr_map[tx_size] >= TX_32X32 && !is_inter_block(mbmi)))
return DCT_DCT; return DCT_DCT;
......
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