diff options
Diffstat (limited to 'vp9/decoder/vp9_decodframe.c')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index a1c396970..f52e2666c 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -90,17 +90,16 @@ static void init_dequantizer(VP9_COMMON *cm, MACROBLOCKD *xd) { static void decode_block(int plane, int block, BLOCK_SIZE_TYPE bsize, int ss_txfrm_size, void *arg) { MACROBLOCKD* const xd = arg; - struct macroblockd_plane *pd = &xd->plane[plane]; + struct macroblockd_plane *const pd = &xd->plane[plane]; int16_t* const qcoeff = BLOCK_OFFSET(pd->qcoeff, block); const int stride = pd->dst.stride; const int eob = pd->eobs[block]; + const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size >> 1); const int raster_block = txfrm_block_to_raster_block(xd, bsize, plane, - block, ss_txfrm_size); + block, tx_size); uint8_t* const dst = raster_block_offset_uint8(xd, bsize, plane, raster_block, pd->dst.buf, stride); - const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size >> 1); - switch (tx_size) { case TX_4X4: { const TX_TYPE tx_type = get_tx_type_4x4(pd->plane_type, xd, raster_block); @@ -129,20 +128,18 @@ static void decode_block(int plane, int block, BLOCK_SIZE_TYPE bsize, static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, int ss_txfrm_size, void *arg) { MACROBLOCKD* const xd = arg; - struct macroblockd_plane *pd = &xd->plane[plane]; + struct macroblockd_plane *const pd = &xd->plane[plane]; MODE_INFO *const mi = xd->mode_info_context; - + const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size >> 1); const int raster_block = txfrm_block_to_raster_block(xd, bsize, plane, - block, ss_txfrm_size); + block, tx_size); uint8_t* const dst = raster_block_offset_uint8(xd, bsize, plane, raster_block, pd->dst.buf, pd->dst.stride); - const TX_SIZE tx_size = (TX_SIZE)(ss_txfrm_size >> 1); int b_mode; int plane_b_size; const int tx_ib = raster_block >> tx_size; - const int mode = plane == 0 ? mi->mbmi.mode - : mi->mbmi.uv_mode; + const int mode = (plane == 0) ? mi->mbmi.mode : mi->mbmi.uv_mode; if (plane == 0 && mi->mbmi.sb_type < BLOCK_8X8) { assert(bsize == BLOCK_8X8); @@ -152,7 +149,7 @@ static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, } if (xd->mb_to_right_edge < 0 || xd->mb_to_bottom_edge < 0) - extend_for_intra(xd, plane, block, bsize, ss_txfrm_size); + extend_for_intra(xd, bsize, plane, block, tx_size); plane_b_size = b_width_log2(bsize) - pd->subsampling_x; vp9_predict_intra_block(xd, tx_ib, plane_b_size, tx_size, b_mode, |