diff options
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 021eb11e3..fcc204fa2 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -260,19 +260,19 @@ static void decode_block(int plane, int block, MACROBLOCKD *xd = &arg->pbi->mb; struct macroblockd_plane* pd = &xd->plane[plane]; const int segment_id = xd->mode_info_context->mbmi.segment_id; - const TX_SIZE ss_tx_size = ss_txfrm_size / 2; + const TX_SIZE tx_size = ss_txfrm_size >> 1; const int seg_eob = get_eob(&xd->seg, segment_id, 16 << ss_txfrm_size); const int off = block >> ss_txfrm_size; - const int mod = bw - ss_tx_size - pd->subsampling_x; - const int aoff = (off & ((1 << mod) - 1)) << ss_tx_size; - const int loff = (off >> mod) << ss_tx_size; - const int tx_size_in_blocks = 1 << ss_tx_size; + const int mod = bw - tx_size - pd->subsampling_x; + const int aoff = (off & ((1 << mod) - 1)) << tx_size; + const int loff = (off >> mod) << tx_size; + const int tx_size_in_blocks = 1 << tx_size; ENTROPY_CONTEXT *A = pd->above_context + aoff; ENTROPY_CONTEXT *L = pd->left_context + loff; const int eob = decode_coefs(&arg->pbi->common, xd, arg->r, block, pd->plane_type, seg_eob, BLOCK_OFFSET(pd->qcoeff, block), - ss_tx_size, pd->dequant, A, L); + tx_size, pd->dequant, A, L); if (xd->mb_to_right_edge < 0 || xd->mb_to_bottom_edge < 0) { set_contexts_on_border(xd, bsize, plane, tx_size_in_blocks, eob, aoff, loff, |