diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-09-29 10:40:27 -0700 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-09-30 15:15:11 -0700 |
| commit | 2f8625d824c30627a4f871340a865dd154f42cf9 (patch) | |
| tree | 9e0c7fdf0268ed8f55b4b6bc1ffb3a6af379c32f /vp9/encoder/vp9_encodemb.c | |
| parent | 13888e0eef7c6d9337de2ad6eef86aedffe317a7 (diff) | |
| download | libvpx-2f8625d824c30627a4f871340a865dd154f42cf9.tar libvpx-2f8625d824c30627a4f871340a865dd154f42cf9.tar.gz libvpx-2f8625d824c30627a4f871340a865dd154f42cf9.tar.bz2 libvpx-2f8625d824c30627a4f871340a865dd154f42cf9.zip | |
VP9: remove plane_type from macroblockd_plane
Change-Id: Ia5072a3a92212d8565f33359f6c146469bdfbbec
Diffstat (limited to 'vp9/encoder/vp9_encodemb.c')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 00e4c610b..3c6a9283c 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -99,7 +99,7 @@ static int optimize_b(MACROBLOCK *mb, int plane, int block, tran_low_t *const qcoeff = BLOCK_OFFSET(p->qcoeff, block); tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block); const int eob = p->eobs[block]; - const PLANE_TYPE type = pd->plane_type; + const PLANE_TYPE type = get_plane_type(plane); const int default_eob = 16 << (tx_size << 1); const int mul = 1 + (tx_size == TX_32X32); const int16_t *dequant_ptr = pd->dequant; @@ -789,7 +789,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, src_diff = &p->src_diff[4 * (j * diff_stride + i)]; if (tx_size == TX_4X4) { - tx_type = get_tx_type_4x4(pd->plane_type, xd, block); + tx_type = get_tx_type_4x4(get_plane_type(plane), xd, block); scan_order = &vp9_scan_orders[TX_4X4][tx_type]; mode = plane == 0 ? get_y_mode(xd->mi[0], block) : mbmi->uv_mode; } else { @@ -797,7 +797,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize, if (tx_size == TX_32X32) { scan_order = &vp9_default_scan_orders[TX_32X32]; } else { - tx_type = get_tx_type(pd->plane_type, xd); + tx_type = get_tx_type(get_plane_type(plane), xd); scan_order = &vp9_scan_orders[tx_size][tx_type]; } } |