commit 985bfc38b04dc9b81eea160ed1faf3f3f0d1741b
author Thomas Davies <thdavies@cisco.com> Tue Jun 27 16:51:26 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Mon Jul 10 22:09:16 2017 +0000
tree 0044717b496eec94b3e68010458bfe19b69b2a3c
parent 708c1ec5abf92c3762be1359f7340b39afcc5412

NEW_MULTISYMBOL: adapt transform partition split.

Change-Id: I9c8201c7053dba11e9ac0f02c1bffbb4a322e654

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index 98732a8..69966a7 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -5654,12 +5654,6 @@
 
   AVERAGE_TILE_CDFS(tx_size_cdf);
 
-#if CONFIG_VAR_TX
-// FIXME: txfm_partition probs
-#endif
-
-  // FIXME: skip probs
-
   AVERAGE_TILE_CDFS(intra_ext_tx_cdf)
   AVERAGE_TILE_CDFS(inter_ext_tx_cdf);
 
@@ -5680,6 +5674,9 @@
 
 #if CONFIG_NEW_MULTISYMBOL
   AVERAGE_TILE_CDFS(skip_cdfs)
+#if CONFIG_VAR_TX
+  AVERAGE_TILE_CDFS(txfm_partition_cdf)
+#endif
 #endif
 }
 

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 4169ad4..c16f0e4 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -2130,6 +2130,27 @@
 static const aom_prob default_txfm_partition_probs[TXFM_PARTITION_CONTEXTS] = {
   250, 231, 212, 241, 166, 66, 241, 230, 135, 243, 154, 64, 248, 161, 63, 128,
 };
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+    default_txfm_partition_cdf[TXFM_PARTITION_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_ICDF(250 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(231 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(212 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(241 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(166 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(66 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(241 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(230 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(135 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(243 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(154 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(64 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(248 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(161 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(63 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(128 * 128), AOM_ICDF(32768), 0 }
+    };
+#endif  // CONFIG_NEW_MULTISYMBOL
 #endif
 
 static const aom_prob default_skip_probs[SKIP_CONTEXTS] = { 192, 128, 64 };
@@ -4880,6 +4901,9 @@
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
 #if CONFIG_VAR_TX
   av1_copy(fc->txfm_partition_prob, default_txfm_partition_probs);
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->txfm_partition_cdf, default_txfm_partition_cdf);
+#endif
 #endif
   av1_copy(fc->skip_probs, default_skip_probs);
   av1_copy(fc->newmv_prob, default_newmv_prob);

av1/common/entropymode.h

diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 0f3b65a..c8a1a3c 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -266,7 +266,10 @@
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_RECT_TX_EXT
 #if CONFIG_VAR_TX
   aom_prob txfm_partition_prob[TXFM_PARTITION_CONTEXTS];
+#if CONFIG_NEW_MULTISYMBOL
+  aom_cdf_prob txfm_partition_cdf[TXFM_PARTITION_CONTEXTS][CDF_SIZE(2)];
 #endif
+#endif  // CONFIG_VAR_TX
   aom_prob skip_probs[SKIP_CONTEXTS];
 #if CONFIG_NEW_MULTISYMBOL
   aom_cdf_prob skip_cdfs[SKIP_CONTEXTS][CDF_SIZE(2)];