commit d6ee8a8ccb6380fa6a230c78dc0c27a570c40c2f
author Thomas Davies <thdavies@cisco.com> Thu Mar 02 14:42:50 2017 +0000
committer Thomas Davies <thdavies@cisco.com> Tue Mar 07 21:47:46 2017 +0000
tree 86630d0276406a794de2a957ddef426ecc52fbe4
parent 73126c08c7da6a4da9e394b60ecb3aedbb47892f

Add a CDF for coding delta_q.

Also remove forward updates for delta_q when EC_ADAPT
is enabled.

Change-Id: Idf71b57bfe7763bc60595bc45768e624dd7b67bd

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index e13dfb9..eba62c9 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -67,16 +67,33 @@
   const int b_col = mi_col & MAX_MIB_MASK;
   const int b_row = mi_row & MAX_MIB_MASK;
   const int read_delta_q_flag = (b_col == 0 && b_row == 0);
-  int rem_bits, thr, bit = 1;
+  int rem_bits, thr;
+  int i, smallval;
+#if CONFIG_EC_ADAPT
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  (void)cm;
+#else
+  FRAME_CONTEXT *ec_ctx = cm->fc;
+#endif
 
   if ((bsize != BLOCK_64X64 || mbmi->skip == 0) && read_delta_q_flag) {
+#if !CONFIG_EC_MULTISYMBOL
+    int bit = 1;
     abs = 0;
     while (abs < DELTA_Q_SMALL && bit) {
-      bit = aom_read(r, cm->fc->delta_q_prob[abs], ACCT_STR);
-      if (counts) counts->delta_q[abs][bit]++;
+      bit = aom_read(r, ec_ctx->delta_q_prob[abs], ACCT_STR);
       abs += bit;
     }
-    if (abs == DELTA_Q_SMALL) {
+#else
+    abs = aom_read_symbol(r, ec_ctx->delta_q_cdf, DELTA_Q_PROBS + 1, ACCT_STR);
+#endif
+    smallval = (abs < DELTA_Q_SMALL);
+    if (counts) {
+      for (i = 0; i < abs; ++i) counts->delta_q[i][1]++;
+      if (smallval) counts->delta_q[abs][0]++;
+    }
+
+    if (!smallval) {
       rem_bits = aom_read_literal(r, 3, ACCT_STR);
       thr = (1 << rem_bits) + 1;
       abs = aom_read_literal(r, rem_bits, ACCT_STR) + thr;