commit 1de6c88a676c6087ac52a6da7ea7f9ebd0be5fb6
author Thomas Davies <thdavies@cisco.com> Wed Jan 11 17:47:49 2017 +0000
committer Thomas Davies <thdavies@cisco.com> Fri Jan 20 15:30:27 2017 +0000
tree f047bc87969a7680c690e7957b014c2ca14c8bf8
parent cef09627cf20bdde9c7c130e195e71a8d3e6b649

EC_ADAPT: use tile context for inter mode.

Change-Id: I522dfe77cbe0ea4833d11e25386586d7312c463f

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index e2e7188..105d3f1 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -151,15 +151,16 @@
 }
 #endif  // CONFIG_EXT_INTER
 
-static PREDICTION_MODE read_inter_mode(AV1_COMMON *cm, MACROBLOCKD *xd,
+static PREDICTION_MODE read_inter_mode(FRAME_CONTEXT *ec_ctx, MACROBLOCKD *xd,
 #if CONFIG_REF_MV && CONFIG_EXT_INTER
                                        MB_MODE_INFO *mbmi,
 #endif
                                        aom_reader *r, int16_t ctx) {
+
 #if CONFIG_REF_MV
   FRAME_COUNTS *counts = xd->counts;
   int16_t mode_ctx = ctx & NEWMV_CTX_MASK;
-  aom_prob mode_prob = cm->fc->newmv_prob[mode_ctx];
+  aom_prob mode_prob = ec_ctx->newmv_prob[mode_ctx];
 
   if (aom_read(r, mode_prob, ACCT_STR) == 0) {
     if (counts) ++counts->newmv_mode[mode_ctx][0];
@@ -170,7 +171,7 @@
       return NEWMV;
 #if CONFIG_EXT_INTER
     } else {
-      mode_prob = cm->fc->new2mv_prob;
+      mode_prob = ec_ctx->new2mv_prob;
       if (aom_read(r, mode_prob, ACCT_STR) == 0) {
         if (counts) ++counts->new2mv_mode[0];
         return NEWMV;
@@ -187,7 +188,7 @@
 
   mode_ctx = (ctx >> ZEROMV_OFFSET) & ZEROMV_CTX_MASK;
 
-  mode_prob = cm->fc->zeromv_prob[mode_ctx];
+  mode_prob = ec_ctx->zeromv_prob[mode_ctx];
   if (aom_read(r, mode_prob, ACCT_STR) == 0) {
     if (counts) ++counts->zeromv_mode[mode_ctx][0];
     return ZEROMV;
@@ -200,7 +201,7 @@
   if (ctx & (1 << SKIP_NEARMV_OFFSET)) mode_ctx = 7;
   if (ctx & (1 << SKIP_NEARESTMV_SUB8X8_OFFSET)) mode_ctx = 8;
 
-  mode_prob = cm->fc->refmv_prob[mode_ctx];
+  mode_prob = ec_ctx->refmv_prob[mode_ctx];
 
   if (aom_read(r, mode_prob, ACCT_STR) == 0) {
     if (counts) ++counts->refmv_mode[mode_ctx][0];
@@ -216,10 +217,10 @@
 #else
 #if CONFIG_EC_MULTISYMBOL
   const int mode = av1_inter_mode_inv[aom_read_symbol(
-      r, cm->fc->inter_mode_cdf[ctx], INTER_MODES, ACCT_STR)];
+      r, ec_ctx->inter_mode_cdf[ctx], INTER_MODES, ACCT_STR)];
 #else
   const int mode = aom_read_tree(r, av1_inter_mode_tree,
-                                 cm->fc->inter_mode_probs[ctx], ACCT_STR);
+                                 ec_ctx->inter_mode_probs[ctx], ACCT_STR);
 #endif
   FRAME_COUNTS *counts = xd->counts;
   if (counts) ++counts->inter_mode[ctx][mode];
@@ -1503,6 +1504,11 @@
 #if CONFIG_WARPED_MOTION
   double pts[144], pts_inref[144];
 #endif  // CONFIG_WARPED_MOTION
+#if CONFIG_EC_ADAPT
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+#else
+  FRAME_CONTEXT *ec_ctx = cm->fc;
+#endif
 
 #if CONFIG_PALETTE
   mbmi->palette_mode_info.palette_size[0] = 0;
@@ -1592,7 +1598,7 @@
         mbmi->mode = read_inter_compound_mode(cm, xd, r, mode_ctx);
       else
 #endif  // CONFIG_EXT_INTER
-        mbmi->mode = read_inter_mode(cm, xd,
+        mbmi->mode = read_inter_mode(ec_ctx, xd,
 #if CONFIG_REF_MV && CONFIG_EXT_INTER
                                      mbmi,
 #endif  // CONFIG_REF_MV && CONFIG_EXT_INTER
@@ -1710,7 +1716,7 @@
           b_mode = read_inter_compound_mode(cm, xd, r, mode_ctx);
         else
 #endif  // CONFIG_EXT_INTER
-          b_mode = read_inter_mode(cm, xd,
+          b_mode = read_inter_mode(ec_ctx, xd,
 #if CONFIG_REF_MV && CONFIG_EXT_INTER
                                    mbmi,
 #endif  // CONFIG_REF_MV && CONFIG_EXT_INTER