commit e3f6978d4856cb041325d1392e7a0df6b3f1de16
author Thomas Davies <thdavies@cisco.com> Tue Oct 03 10:43:17 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Thu Oct 05 21:29:35 2017 +0000
tree f1f2d70f68cca428e911d1831e333c752adea1cc
parent 05685a2f1284f735188809b27a7dfccd7ebb6520

NEW_MULTISYMBOL: support RECT_TX_EXT.

Change-Id: I0b6f56d2bf0482cfbf45525828d6daa6aea187e5

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index f646a45..0cdbc13 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -2484,6 +2484,11 @@
 
 #if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
 static const aom_prob default_quarter_tx_size_prob = 192;
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob default_quarter_tx_size_cdf[CDF_SIZE(2)] = {
+  AOM_ICDF(192 * 128), AOM_ICDF(32768), 0
+};
+#endif
 #endif
 
 #if CONFIG_LOOP_RESTORATION
@@ -5583,6 +5588,9 @@
 #endif  // CONFIG_COMPOUND_SINGLEREF
 #if CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)
   fc->quarter_tx_size_prob = default_quarter_tx_size_prob;
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->quarter_tx_size_cdf, default_quarter_tx_size_cdf);
+#endif  // CONFIG_NEW_MULTISYMBOL
 #endif
 #if CONFIG_VAR_TX
   av1_copy(fc->txfm_partition_prob, default_txfm_partition_probs);