generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Cleanup in get_uv_tx_size" into nextgenv2

Browse Source
This commit is contained in:
Hui Su
2016-03-05 07:42:26 +00:00
committed by Gerrit Code Review
parent 10cdeab42a c3c1c6f405
commit 5e5bef6c18
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vp10/common/blockd.h
View File

@@ -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, static INLINE TX_SIZE get_uv_tx_size(const MB_MODE_INFO *mbmi,
const struct macroblockd_plane *pd) { const struct macroblockd_plane *pd) {
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
if (!supertx_enabled(mbmi)) { if (supertx_enabled(mbmi))
return get_uv_tx_size_impl(mbmi->tx_size, mbmi->sb_type, pd->subsampling_x,
pd->subsampling_y);
} else {
return uvsupertx_size_lookup[mbmi->tx_size][pd->subsampling_x] return uvsupertx_size_lookup[mbmi->tx_size][pd->subsampling_x]
[pd->subsampling_y]; [pd->subsampling_y];
} #endif // CONFIG_SUPERTX
#else
return get_uv_tx_size_impl(mbmi->tx_size, mbmi->sb_type, pd->subsampling_x, return get_uv_tx_size_impl(mbmi->tx_size, mbmi->sb_type, pd->subsampling_x,
pd->subsampling_y); pd->subsampling_y);
#endif // CONFIG_SUPERTX
} }
static INLINE BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize, static INLINE BLOCK_SIZE get_plane_block_size(BLOCK_SIZE bsize,