diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-01-19 16:40:20 -0800 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2016-01-19 16:40:20 -0800 |
| commit | 5232326716af469eafa6d98fba64f8154c69d9f8 (patch) | |
| tree | be0511ba21d18a0a2b1e389deefae092030ea9b6 /vp9/common/vp9_blockd.c | |
| parent | c0307e6cea0fcd79577eaa107f76b07acaf1d4e6 (diff) | |
| download | libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.tar libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.tar.gz libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.tar.bz2 libvpx-5232326716af469eafa6d98fba64f8154c69d9f8.zip | |
VP9: Eliminate MB_MODE_INFO
Change-Id: Ifa607dd2bb366ce09fa16dfcad3cc45a2440c185
Diffstat (limited to 'vp9/common/vp9_blockd.c')
| -rw-r--r-- | vp9/common/vp9_blockd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index 0e104ee59..7bab27d4f 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -13,7 +13,7 @@ PREDICTION_MODE vp9_left_block_mode(const MODE_INFO *cur_mi, const MODE_INFO *left_mi, int b) { if (b == 0 || b == 2) { - if (!left_mi || is_inter_block(&left_mi->mbmi)) + if (!left_mi || is_inter_block(left_mi)) return DC_PRED; return get_y_mode(left_mi, b + 1); @@ -26,7 +26,7 @@ PREDICTION_MODE vp9_left_block_mode(const MODE_INFO *cur_mi, PREDICTION_MODE vp9_above_block_mode(const MODE_INFO *cur_mi, const MODE_INFO *above_mi, int b) { if (b == 0 || b == 1) { - if (!above_mi || is_inter_block(&above_mi->mbmi)) + if (!above_mi || is_inter_block(above_mi)) return DC_PRED; return get_y_mode(above_mi, b + 2); @@ -40,12 +40,12 @@ void vp9_foreach_transformed_block_in_plane( const MACROBLOCKD *const xd, BLOCK_SIZE bsize, int plane, foreach_transformed_block_visitor visit, void *arg) { const struct macroblockd_plane *const pd = &xd->plane[plane]; - const MB_MODE_INFO* mbmi = &xd->mi[0]->mbmi; + const MODE_INFO* mi = xd->mi[0]; // block and transform sizes, in number of 4x4 blocks log 2 ("*_b") // 4x4=0, 8x8=2, 16x16=4, 32x32=6, 64x64=8 // transform size varies per plane, look it up in a common way. - const TX_SIZE tx_size = plane ? get_uv_tx_size(mbmi, pd) - : mbmi->tx_size; + const TX_SIZE tx_size = plane ? get_uv_tx_size(mi, pd) + : mi->tx_size; const BLOCK_SIZE plane_bsize = get_plane_block_size(bsize, pd); const int num_4x4_w = num_4x4_blocks_wide_lookup[plane_bsize]; const int num_4x4_h = num_4x4_blocks_high_lookup[plane_bsize]; |