diff options
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 8 | ||||
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 0a38d6fa1..2cb7fbc0b 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -88,13 +88,12 @@ 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) { + TX_SIZE tx_size, void *arg) { MACROBLOCKD* const xd = arg; 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, tx_size); uint8_t* const dst = raster_block_offset_uint8(xd, bsize, plane, @@ -126,11 +125,10 @@ 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) { + TX_SIZE tx_size, void *arg) { MACROBLOCKD* const xd = arg; 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, tx_size); uint8_t* const dst = raster_block_offset_uint8(xd, bsize, plane, @@ -160,7 +158,7 @@ static void decode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize, if (mi->mbmi.skip_coeff) return; - decode_block(plane, block, bsize, ss_txfrm_size, arg); + decode_block(plane, block, bsize, tx_size, arg); } static int decode_tokens(VP9D_COMP *pbi, BLOCK_SIZE_TYPE bsize, vp9_reader *r) { diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 314c9fdd7..5bd0142c8 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -249,10 +249,8 @@ struct decode_block_args { int *eobtotal; }; -static void decode_block(int plane, int block, - BLOCK_SIZE_TYPE bsize, - int ss_txfrm_size, - void *argv) { +static void decode_block(int plane, int block, BLOCK_SIZE_TYPE bsize, + TX_SIZE tx_size, void *argv) { const struct decode_block_args* const arg = argv; const int bw = b_width_log2(bsize); @@ -261,7 +259,7 @@ static void decode_block(int plane, int block, struct segmentation *seg = &arg->pbi->common.seg; struct macroblockd_plane* pd = &xd->plane[plane]; const int segment_id = xd->mode_info_context->mbmi.segment_id; - const TX_SIZE tx_size = ss_txfrm_size >> 1; + const int ss_txfrm_size = tx_size << 1; const int seg_eob = get_eob(seg, segment_id, 16 << ss_txfrm_size); const int off = block >> ss_txfrm_size; const int mod = bw - tx_size - pd->subsampling_x; |