commit 59b1263ebabe40afe7623d1f73ab37f716e740d5
author Jingning Han <jingning@google.com> Mon Feb 12 10:44:52 2018 -0800
committer Jingning Han <jingning@google.com> Mon Feb 12 22:26:27 2018 +0000
tree c81df30b4d191d21a589b129ae9d03d9828e70b1
parent d2159ea8417f80a0156878d4ce7e81b5f2056154

Remove deprecated macros for inter mode context

This will not cause coding stats change.

Change-Id: I0c527a8906f99170cf66d2360654bf65af81c7e0

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 2b55659..cbee3ca 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -114,10 +114,6 @@
 
     if (mode != GLOBALMV) {
       int16_t refmv_ctx = (mode_ctx >> REFMV_OFFSET) & REFMV_CTX_MASK;
-
-      if (mode_ctx & (1 << SKIP_NEARESTMV_OFFSET)) refmv_ctx = 6;
-      if (mode_ctx & (1 << SKIP_NEARMV_OFFSET)) refmv_ctx = 7;
-      if (mode_ctx & (1 << SKIP_NEARESTMV_SUB8X8_OFFSET)) refmv_ctx = 8;
       aom_write_symbol(w, mode != NEARESTMV, ec_ctx->refmv_cdf[refmv_ctx], 2);
     }
   }
@@ -1750,15 +1746,8 @@
 
       if (mbmi->mode != NEWMV) {
         zeromv_ctx = (mode_ctx >> GLOBALMV_OFFSET) & GLOBALMV_CTX_MASK;
-        if (mode_ctx & (1 << ALL_ZERO_FLAG_OFFSET)) {
-          assert(mbmi->mode == GLOBALMV);
-        }
-        if (mbmi->mode != GLOBALMV) {
+        if (mbmi->mode != GLOBALMV)
           refmv_ctx = (mode_ctx >> REFMV_OFFSET) & REFMV_CTX_MASK;
-          if (mode_ctx & (1 << SKIP_NEARESTMV_OFFSET)) refmv_ctx = 6;
-          if (mode_ctx & (1 << SKIP_NEARMV_OFFSET)) refmv_ctx = 7;
-          if (mode_ctx & (1 << SKIP_NEARESTMV_SUB8X8_OFFSET)) refmv_ctx = 8;
-        }
       }
 
 #if CONFIG_EXT_SKIP