commit 0e7b1d7b24fe7ba44b36de84e008cec51ef988df
author Thomas Davies <thdavies@cisco.com> Mon Oct 02 10:54:24 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Mon Oct 02 22:02:01 2017 +0000
tree 1a6d911db472da86c099984037b72d21e94c47b1
parent b98ea58d41cf48f1b7182bb7f06248943223387d

NEW_MULTISYMBOL: adapt remaining bits in the magnitude.

Reduce the number of contexts from 10 to 6.

BUG=aomedia:830

Change-Id: If0ec302816975293b7dbd164c867feb66fa76847

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 2a27928..4591cc9 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1274,9 +1274,13 @@
   } else {
     int i;
     const int n = mv_class + CLASS0_BITS - 1;  // number of bits
-
     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;
+#else
     for (i = 0; i < n; ++i) d |= aom_read(r, mvcomp->bits[i], ACCT_STR) << i;
+#endif
     mag = CLASS0_SIZE << (mv_class + 2);
   }