commit 2b9ec2ea1dd7aa880cf19e9004ffb86743cba460
author Sarah Parker <sarahparker@google.com> Mon Oct 30 17:34:08 2017 -0700
committer Sarah Parker <sarahparker@google.com> Wed Nov 01 23:21:45 2017 +0000
tree 657815b3c15d8fb33b5f53b6da6a4f234477437a
parent e39b3b8b962fa5e563d019c2287c0c6238d9c830

Rename ZEROMV to GLOBALMV

This name better reflects the functionality of the mode.

Change-Id: Idc2372e7c7b226f70f63fa4f272a88cb4d857089

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index d8f231e..41ae432 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -132,18 +132,19 @@
 
   if (mode != NEWMV) {
     if (mode_ctx & (1 << ALL_ZERO_FLAG_OFFSET)) {
-      assert(mode == ZEROMV);
+      assert(mode == GLOBALMV);
       return;
     }
 
-    const int16_t zeromv_ctx = (mode_ctx >> ZEROMV_OFFSET) & ZEROMV_CTX_MASK;
+    const int16_t zeromv_ctx =
+        (mode_ctx >> GLOBALMV_OFFSET) & GLOBALMV_CTX_MASK;
 #if CONFIG_NEW_MULTISYMBOL
-    aom_write_symbol(w, mode != ZEROMV, ec_ctx->zeromv_cdf[zeromv_ctx], 2);
+    aom_write_symbol(w, mode != GLOBALMV, ec_ctx->zeromv_cdf[zeromv_ctx], 2);
 #else
-    aom_write(w, mode != ZEROMV, ec_ctx->zeromv_prob[zeromv_ctx]);
+    aom_write(w, mode != GLOBALMV, ec_ctx->zeromv_prob[zeromv_ctx]);
 #endif
 
-    if (mode != ZEROMV) {
+    if (mode != GLOBALMV) {
       int16_t refmv_ctx = (mode_ctx >> REFMV_OFFSET) & REFMV_CTX_MASK;
 
       if (mode_ctx & (1 << SKIP_NEARESTMV_OFFSET)) refmv_ctx = 6;
@@ -354,7 +355,7 @@
   for (i = 0; i < NEWMV_MODE_CONTEXTS; ++i)
     av1_cond_prob_diff_update(w, &cm->fc->newmv_prob[i], counts->newmv_mode[i],
                               probwt);
-  for (i = 0; i < ZEROMV_MODE_CONTEXTS; ++i)
+  for (i = 0; i < GLOBALMV_MODE_CONTEXTS; ++i)
     av1_cond_prob_diff_update(w, &cm->fc->zeromv_prob[i],
                               counts->zeromv_mode[i], probwt);
   for (i = 0; i < REFMV_MODE_CONTEXTS; ++i)
@@ -801,9 +802,9 @@
     assert(mbmi->ref_frame[0] ==
            get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME));
   }
-#if CONFIG_SEGMENT_ZEROMV
+#if CONFIG_SEGMENT_GLOBALMV
   else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP) ||
-           segfeature_active(&cm->seg, segment_id, SEG_LVL_ZEROMV))
+           segfeature_active(&cm->seg, segment_id, SEG_LVL_GLOBALMV))
 #else
   else if (segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP))
 #endif
@@ -1974,11 +1975,11 @@
       int16_t zeromv_ctx = -1;
       int16_t refmv_ctx = -1;
       if (mbmi->mode != NEWMV) {
-        zeromv_ctx = (mode_ctx >> ZEROMV_OFFSET) & ZEROMV_CTX_MASK;
+        zeromv_ctx = (mode_ctx >> GLOBALMV_OFFSET) & GLOBALMV_CTX_MASK;
         if (mode_ctx & (1 << ALL_ZERO_FLAG_OFFSET)) {
-          assert(mbmi->mode == ZEROMV);
+          assert(mbmi->mode == GLOBALMV);
         }
-        if (mbmi->mode != ZEROMV) {
+        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;