commit f6ad935501f8d57a013848bc625d4b2aabc71a00
author Thomas Davies <thdavies@cisco.com> Wed Apr 19 11:38:06 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Fri Jun 16 19:18:01 2017 +0000
tree 6d05e4b733e21b51e50be3bf546778153d52d6fa
parent 61e3e372ccea6d39cadf3812fbb027f617080dd0

NEW_MULTISYMBOL: Adapt intra_inter binary symbol.

Adapt the intra_inter binary syntax element symbol-by-symbol
and remove updates from the compressed header.

Change-Id: I9abfd91d4521202f27854ce3e01b670ce15846e9

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index c5aca1d..7bebddc 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1340,6 +1340,16 @@
   9, 102, 187, 225
 };
 
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+    default_intra_inter_cdf[INTRA_INTER_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_ICDF(1152), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(13056), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(23936), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(28800), AOM_ICDF(32768), 0 }
+    };
+#endif
+
 static const aom_prob default_comp_inter_p[COMP_INTER_CONTEXTS] = {
   239, 183, 119, 96, 41
 };
@@ -4556,6 +4566,7 @@
   av1_copy(fc->inter_ext_tx_cdf, default_inter_ext_tx_cdf);
 #if CONFIG_NEW_MULTISYMBOL
   av1_copy(fc->skip_cdfs, default_skip_cdfs);
+  av1_copy(fc->intra_inter_cdf, default_intra_inter_cdf);
 #endif
 #if CONFIG_EXT_INTRA && CONFIG_INTRA_INTERP
   av1_copy(fc->intra_filter_cdf, default_intra_filter_cdf);