commit 85b780db915c151f24e19bdf2ec4864fb130d6b5
author Jingning Han <jingning@google.com> Fri Mar 23 15:29:22 2018 -0700
committer Jingning Han <jingning@google.com> Sat Mar 24 00:17:09 2018 +0000
tree 6b249d486024b77ab6abbc711104fbb3c1a04a2a
parent b48e0470a30b9910788b5ef1e8515d0e0f835f23

Drop unused context entry from txfm partition

Remove the last context entry from the transform block partition
probability model.

BUG=aomedia:1654

Change-Id: I0d91fc51b49117ad2edef0da478619cb89aec436

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index d3ee723..c2dd46a 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -532,8 +532,7 @@
       { AOM_CDF2(226 * 128) }, { AOM_CDF2(187 * 128) }, { AOM_CDF2(145 * 128) },
       { AOM_CDF2(236 * 128) }, { AOM_CDF2(204 * 128) }, { AOM_CDF2(150 * 128) },
       { AOM_CDF2(183 * 128) }, { AOM_CDF2(149 * 128) }, { AOM_CDF2(125 * 128) },
-      { AOM_CDF2(181 * 128) }, { AOM_CDF2(146 * 128) }, { AOM_CDF2(113 * 128) },
-      { AOM_CDF2(128 * 128) }
+      { AOM_CDF2(181 * 128) }, { AOM_CDF2(146 * 128) }, { AOM_CDF2(113 * 128) }
     };
 
 static const aom_cdf_prob default_skip_mode_cdfs[SKIP_MODE_CONTEXTS][CDF_SIZE(

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index cc2c283..4321a39 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -545,7 +545,7 @@
 #define COMP_REF_TYPE_CONTEXTS 5
 #define UNI_COMP_REF_CONTEXTS 3
 
-#define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 2)
+#define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 3)
 typedef uint8_t TXFM_CONTEXT;
 
 #define NONE_FRAME -1

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 33c5ba6..83beea7 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -1215,7 +1215,7 @@
   const uint8_t txh = tx_size_high[tx_size];
   const int above = *above_ctx < txw;
   const int left = *left_ctx < txh;
-  int category = TXFM_PARTITION_CONTEXTS - 1;
+  int category = TXFM_PARTITION_CONTEXTS;
 
   // dummy return, not used by others.
   if (tx_size <= TX_4X4) return 0;
@@ -1228,7 +1228,7 @@
         (txsize_sqr_up_map[tx_size] != max_tx_size && max_tx_size > TX_8X8) +
         (TX_SIZES - 1 - max_tx_size) * 2;
   }
-  if (category == TXFM_PARTITION_CONTEXTS - 1) return category;
+  if (category == TXFM_PARTITION_CONTEXTS) return category;
   return category * 3 + above + left;
 }