commit 17f4f73eb8d271f68b761ec6294a261f9eee8d16
author Jingning Han <jingning@google.com> Fri Mar 23 10:43:59 2018 -0700
committer Jingning Han <jingning@google.com> Fri Mar 23 20:53:40 2018 +0000
tree 96e01a39545612fb047586533d7246f8c0f612ce
parent 683e84b659fd9f9e47d914fc1c8deaaf7da9e7c5

Remove unused cdf entries for newmv cdf

Reduce the context model size for newmv flag from 6 to 5. No
codec behavior will be changed.

Change-Id: If54fc58cee01811f1f8c786fa2db0a67e9d11852

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index f640718..438ea18 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -18,9 +18,10 @@
 #include "av1/common/txb_common.h"
 
 static const aom_cdf_prob default_newmv_cdf[NEWMV_MODE_CONTEXTS][CDF_SIZE(2)] =
-    { { AOM_CDF2(128 * 155) }, { AOM_CDF2(128 * 116) }, { AOM_CDF2(128 * 94) },
-      { AOM_CDF2(128 * 32) },  { AOM_CDF2(128 * 96) },  { AOM_CDF2(128 * 56) },
-      { AOM_CDF2(128 * 30) } };
+    {
+      { AOM_CDF2(128 * 155) }, { AOM_CDF2(128 * 116) }, { AOM_CDF2(128 * 94) },
+      { AOM_CDF2(128 * 32) },  { AOM_CDF2(128 * 96) },  { AOM_CDF2(128 * 30) }
+    };
 static const aom_cdf_prob default_zeromv_cdf[GLOBALMV_MODE_CONTEXTS][CDF_SIZE(
     2)] = { { AOM_CDF2(128 * 45) }, { AOM_CDF2(128 * 13) } };
 static const aom_cdf_prob default_refmv_cdf[REFMV_MODE_CONTEXTS][CDF_SIZE(2)] =

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index dede8bd..7b440de 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -508,7 +508,7 @@
 
 #define NMV_CONTEXTS 3
 
-#define NEWMV_MODE_CONTEXTS 7
+#define NEWMV_MODE_CONTEXTS 6
 #define GLOBALMV_MODE_CONTEXTS 2
 #define REFMV_MODE_CONTEXTS 9
 #define DRL_MODE_CONTEXTS 3

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 114c7f7..3f4e08c 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -714,7 +714,7 @@
       if (newmv_count[ref_frame] >= 1)
         mode_context[ref_frame] |= 4;
       else
-        mode_context[ref_frame] |= 6;
+        mode_context[ref_frame] |= 5;
 
       mode_context[ref_frame] |= (5 << REFMV_OFFSET);
       break;