commit 62fcfab022b13d87a9552eab5cc46c5c0b8eee38
author Debargha Mukherjee <debargha@google.com> Thu Nov 09 00:51:17 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Nov 10 20:34:59 2017 +0000
tree 0f6413d20d9096414c57e95518b377b600bc3765
parent ab9d37a322de7026e1cd7f8b29fb1793b7707e2a

MV entropy coding fixes and clean ups.

Consistently uses cdfs for all mv symbols, and resolves
some inconsistencies.

All the legacy code dealing with probabilities and counts
can now be removed.

BDRATE (lowres 30 frames): -0.04% (a slight improvement).

Change-Id: Ie27c8e3594e60080e4d155a3ea11c320caa1d85d

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 8fb19bc..3a0486b 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1285,12 +1285,12 @@
                              int usehp) {
   int mag, d, fr, hp;
 #if CONFIG_NEW_MULTISYMBOL
-  const int sign = aom_read_bit(r, ACCT_STR);
+  const int sign = aom_read_symbol(r, mvcomp->sign_cdf, 2, ACCT_STR);
 #else
   const int sign = aom_read(r, mvcomp->sign, ACCT_STR);
 #endif
   const int mv_class =
-      aom_read_symbol(r, mvcomp->class_cdf, MV_CLASSES, ACCT_STR);
+      aom_read_symbol(r, mvcomp->classes_cdf, MV_CLASSES, ACCT_STR);
   const int class0 = mv_class == MV_CLASS_0;
 
   // Integer part
@@ -1307,7 +1307,7 @@
     d = 0;
 #if CONFIG_NEW_MULTISYMBOL
     for (i = 0; i < n; ++i)
-      d |= aom_read_symbol(r, mvcomp->bits_cdf[(i + 1) / 2], 2, ACCT_STR) << i;
+      d |= aom_read_symbol(r, mvcomp->bits_cdf[i], 2, ACCT_STR) << i;
 #else
     for (i = 0; i < n; ++i) d |= aom_read(r, mvcomp->bits[i], ACCT_STR) << i;
 #endif
@@ -1349,7 +1349,7 @@
   MV_JOINT_TYPE joint_type;
   MV diff = { 0, 0 };
   joint_type =
-      (MV_JOINT_TYPE)aom_read_symbol(r, ctx->joint_cdf, MV_JOINTS, ACCT_STR);
+      (MV_JOINT_TYPE)aom_read_symbol(r, ctx->joints_cdf, MV_JOINTS, ACCT_STR);
 
   if (mv_joint_vertical(joint_type))
     diff.row = read_mv_component(r, &ctx->comps[0],