From c3c1c6f40540d45a5f4fcb54050d1cf2814c5fab Mon Sep 17 00:00:00 2001 From: hui su Date: Fri, 4 Mar 2016 16:53:19 -0800 Subject: [PATCH] Cleanup in get_uv_tx_size Change-Id: Ia2aa7558f9f53da7dff970b30fe0a94958159ffb --- vp10/common/blockd.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h index f96aa2e84..2312ff16f 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,