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/encoder/vp9_tokenize.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/encoder/vp9_tokenize.c')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 8efc97697..1b07359da 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -145,17 +145,14 @@ static void tokenize_b(VP9_COMP *cpi, probs = cpi->common.fc.coef_probs_4x4; break; case TX_8X8: -#if CONFIG_CNVCONTEXT a_ec = (a[0] + a[1]) != 0; l_ec = (l[0] + l[1]) != 0; -#endif seg_eob = 64; scan = vp9_default_zig_zag1d_8x8; counts = cpi->coef_counts_8x8; probs = cpi->common.fc.coef_probs_8x8; break; case TX_16X16: -#if CONFIG_CNVCONTEXT if (type != PLANE_TYPE_UV) { a_ec = (a[0] + a[1] + a[2] + a[3]) != 0; l_ec = (l[0] + l[1] + l[2] + l[3]) != 0; @@ -163,7 +160,6 @@ static void tokenize_b(VP9_COMP *cpi, a_ec = (a[0] + a[1] + a1[0] + a1[1]) != 0; l_ec = (l[0] + l[1] + l1[0] + l1[1]) != 0; } -#endif seg_eob = 256; scan = vp9_default_zig_zag1d_16x16; counts = cpi->coef_counts_16x16; @@ -174,14 +170,12 @@ static void tokenize_b(VP9_COMP *cpi, } break; case TX_32X32: -#if CONFIG_CNVCONTEXT a_ec = a[0] + a[1] + a[2] + a[3] + a1[0] + a1[1] + a1[2] + a1[3]; l_ec = l[0] + l[1] + l[2] + l[3] + l1[0] + l1[1] + l1[2] + l1[3]; a_ec = a_ec != 0; l_ec = l_ec != 0; -#endif seg_eob = 1024; scan = vp9_default_zig_zag1d_32x32; counts = cpi->coef_counts_32x32; @@ -635,15 +629,12 @@ static INLINE void stuff_b(VP9_COMP *cpi, probs = cpi->common.fc.coef_probs_4x4; break; case TX_8X8: -#if CONFIG_CNVCONTEXT a_ec = (a[0] + a[1]) != 0; l_ec = (l[0] + l[1]) != 0; -#endif counts = cpi->coef_counts_8x8; probs = cpi->common.fc.coef_probs_8x8; break; case TX_16X16: -#if CONFIG_CNVCONTEXT if (type != PLANE_TYPE_UV) { a_ec = (a[0] + a[1] + a[2] + a[3]) != 0; l_ec = (l[0] + l[1] + l[2] + l[3]) != 0; @@ -651,19 +642,16 @@ static INLINE void stuff_b(VP9_COMP *cpi, a_ec = (a[0] + a[1] + a1[0] + a1[1]) != 0; l_ec = (l[0] + l[1] + l1[0] + l1[1]) != 0; } -#endif counts = cpi->coef_counts_16x16; probs = cpi->common.fc.coef_probs_16x16; break; case TX_32X32: -#if CONFIG_CNVCONTEXT a_ec = a[0] + a[1] + a[2] + a[3] + a1[0] + a1[1] + a1[2] + a1[3]; l_ec = l[0] + l[1] + l[2] + l[3] + l1[0] + l1[1] + l1[2] + l1[3]; a_ec = a_ec != 0; l_ec = l_ec != 0; -#endif counts = cpi->coef_counts_32x32; probs = cpi->common.fc.coef_probs_32x32; break; |