diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h index f96aa2e840423d26e9c9e23949371c0a04d603e0..2312ff16fcdc64361eea3050d8d821647a1a8785 100644 --- a/vp10/common/blockd.h +++ b/vp10/common/blockd.h @@ -580,17 +580,12 @@ static INLINE TX_SIZE get_uv_tx_size_impl(TX_SIZE y_tx_size, BLOCK_SIZE bsize, static INLINE TX_SIZE get_uv_tx_size(const MB_MODE_INFO *mbmi, const struct macroblockd_plane *pd) { #if CONFIG_SUPERTX - if (!supertx_enabled(mbmi)) { - return get_uv_tx_size_impl(mbmi->tx_size, mbmi->sb_type, pd->subsampling_x, - pd->subsampling_y); - } else { + if (supertx_enabled(mbmi)) return uvsupertx_size_lookup[mbmi->tx_size][pd->subsampling_x] [pd->subsampling_y]; - } -#else +#endif // CONFIG_SUPERTX return get_uv_tx_size_impl(mbmi->tx_size, mbmi->sb_type, pd->subsampling_x, pd->subsampling_y); -#endif // CONFIG_SUPERTX } static INLINE BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize,