diff options
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 91042c4fe..d3fb25ace 100644 --- a/vp9/decoder/vp9_detokenize.c +++ b/vp9/decoder/vp9_detokenize.c @@ -110,15 +110,12 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, case TX_8X8: coef_probs = fc->coef_probs_8x8; coef_counts = fc->coef_counts_8x8; -#if CONFIG_CNVCONTEXT above_ec = (A0[aidx] + A0[aidx + 1]) != 0; left_ec = (L0[lidx] + L0[lidx + 1]) != 0; -#endif break; case TX_16X16: coef_probs = fc->coef_probs_16x16; coef_counts = fc->coef_counts_16x16; -#if CONFIG_CNVCONTEXT if (type == PLANE_TYPE_UV) { ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1); ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1); @@ -128,12 +125,10 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, above_ec = (A0[aidx] + A0[aidx + 1] + A0[aidx + 2] + A0[aidx + 3]) != 0; left_ec = (L0[lidx] + L0[lidx + 1] + L0[lidx + 2] + L0[lidx + 3]) != 0; } -#endif break; case TX_32X32: coef_probs = fc->coef_probs_32x32; coef_counts = fc->coef_counts_32x32; -#if CONFIG_CNVCONTEXT if (type == PLANE_TYPE_UV) { ENTROPY_CONTEXT *A1 = (ENTROPY_CONTEXT *) (xd->above_context + 1); ENTROPY_CONTEXT *L1 = (ENTROPY_CONTEXT *) (xd->left_context + 1); @@ -153,7 +148,6 @@ static int decode_coefs(VP9D_COMP *dx, const MACROBLOCKD *xd, left_ec = (L0[lidx] + L0[lidx + 1] + L0[lidx + 2] + L0[lidx + 3] + L1[lidx] + L1[lidx + 1] + L1[lidx + 2] + L1[lidx + 3]) != 0; } -#endif break; } @@ -285,7 +279,7 @@ int vp9_decode_sb_tokens(VP9D_COMP* const pbi, DCT_DCT, get_eob(xd, segment_id, 1024), xd->sb_coeff_data.qcoeff, vp9_default_zig_zag1d_32x32, TX_32X32); - xd->block[0].eob = c; + xd->eobs[0] = c; eobtotal += c; // 16x16 chroma blocks @@ -294,7 +288,7 @@ int vp9_decode_sb_tokens(VP9D_COMP* const pbi, c = decode_coefs(pbi, xd, bc, i, PLANE_TYPE_UV, DCT_DCT, seg_eob, xd->sb_coeff_data.qcoeff + 1024 + (i - 16) * 64, vp9_default_zig_zag1d_16x16, TX_16X16); - xd->block[i].eob = c; + xd->eobs[i] = c; eobtotal += c; } @@ -312,7 +306,7 @@ static int vp9_decode_mb_tokens_16x16(VP9D_COMP* const pbi, get_tx_type(xd, &xd->block[0]), get_eob(xd, segment_id, 256), xd->qcoeff, vp9_default_zig_zag1d_16x16, TX_16X16); - xd->block[0].eob = c; + xd->eobs[0] = c; eobtotal += c; // 8x8 chroma blocks @@ -321,7 +315,7 @@ static int vp9_decode_mb_tokens_16x16(VP9D_COMP* const pbi, c = decode_coefs(pbi, xd, bc, i, PLANE_TYPE_UV, DCT_DCT, seg_eob, xd->block[i].qcoeff, vp9_default_zig_zag1d_8x8, TX_8X8); - xd->block[i].eob = c; + xd->eobs[i] = c; eobtotal += c; } return eobtotal; @@ -340,7 +334,7 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, get_tx_type(xd, xd->block + i), seg_eob, xd->block[i].qcoeff, vp9_default_zig_zag1d_8x8, TX_8X8); - xd->block[i].eob = c; + xd->eobs[i] = c; eobtotal += c; } @@ -353,7 +347,7 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, c = decode_coefs(pbi, xd, bc, i, PLANE_TYPE_UV, DCT_DCT, seg_eob, xd->block[i].qcoeff, vp9_default_zig_zag1d_4x4, TX_4X4); - xd->block[i].eob = c; + xd->eobs[i] = c; eobtotal += c; } } else { @@ -361,7 +355,7 @@ static int vp9_decode_mb_tokens_8x8(VP9D_COMP* const pbi, c = decode_coefs(pbi, xd, bc, i, PLANE_TYPE_UV, DCT_DCT, seg_eob, xd->block[i].qcoeff, vp9_default_zig_zag1d_8x8, TX_8X8); - xd->block[i].eob = c; + xd->eobs[i] = c; eobtotal += c; } } @@ -375,7 +369,7 @@ static int decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd, TX_TYPE tx_type, const int *scan) { int c = decode_coefs(dx, xd, bc, i, type, tx_type, seg_eob, xd->block[i].qcoeff, scan, TX_4X4); - xd->block[i].eob = c; + xd->eobs[i] = c; return c; } |