diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-26 10:37:49 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-02-26 10:40:15 -0800 |
| commit | b1641150b10d6c91a9db1952f4fa67c73f0f4dac (patch) | |
| tree | be484a9da4b914c3a0d9cd7ebc6f2375552de1e5 /vp9/decoder/vp9_detokenize.c | |
| parent | f3fdb4c37dc507d8176578ef7963ec14eb7f3ff6 (diff) | |
| download | libvpx-b1641150b10d6c91a9db1952f4fa67c73f0f4dac.tar libvpx-b1641150b10d6c91a9db1952f4fa67c73f0f4dac.tar.gz libvpx-b1641150b10d6c91a9db1952f4fa67c73f0f4dac.tar.bz2 libvpx-b1641150b10d6c91a9db1952f4fa67c73f0f4dac.zip | |
Merge cnvcontext experiment.
Change-Id: I35e64998b25694a3bb4a62164bba3c03c1db4bc7
Diffstat (limited to 'vp9/decoder/vp9_detokenize.c')
| -rw-r--r-- | vp9/decoder/vp9_detokenize.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp9/decoder/vp9_detokenize.c b/vp9/decoder/vp9_detokenize.c index 91042c4fe..599c5bb57 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; } |