commit cff9171e3b7ded48c5f84ac2a9f97b0f2fbee391
author Thomas Davies <thdavies@cisco.com> Fri Jul 07 11:49:55 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Fri Jul 07 18:56:04 2017 +0000
tree 7cf6c1fcf6689401c44a962853a3e0740595bad4
parent 299ff04f223956525db1fe4917d2ba2bcda71d8f

NEW_MULTISYMBOL: adapt remaining INTERINTRA syntax elements.

AWCY, objective-1-fast, High Latency :
-0.14% all metrics with NEW_MULTISYMBOL on (reference
    with NEW_MULTISYMBOL off).

Change-Id: I7cb3d05977d5e424fd38a40ab558c87c5d811f14

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 8308c02..4169ad4 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1226,6 +1226,14 @@
 static const aom_prob default_interintra_prob[BLOCK_SIZE_GROUPS] = {
   208, 208, 208, 208,
 };
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob default_interintra_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
+    2)] = { { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+            { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 } };
+#endif
+
 static const aom_prob
     default_interintra_mode_prob[BLOCK_SIZE_GROUPS][INTERINTRA_MODES - 1] = {
       { 88, 16, 150 },  // block_size < 8x8
@@ -1254,6 +1262,35 @@
 #endif  // CONFIG_EXT_PARTITION
 };
 
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+    default_wedge_interintra_cdf[BLOCK_SIZES][CDF_SIZE(2)] = {
+#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+#endif
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(216 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(216 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(216 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(224 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(224 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(224 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(240 * 128), AOM_ICDF(32768), 0 },
+#if CONFIG_EXT_PARTITION
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(208 * 128), AOM_ICDF(32768), 0 },
+#endif  // CONFIG_EXT_PARTITION
+    };
+#endif  // CONFIG_NEW_MULTISYMBOL
+
 #endif  // CONFIG_INTERINTRA
 #endif  // CONFIG_EXT_INTER
 
@@ -4880,6 +4917,10 @@
 #if CONFIG_INTERINTRA
   av1_copy(fc->interintra_prob, default_interintra_prob);
   av1_copy(fc->wedge_interintra_prob, default_wedge_interintra_prob);
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->interintra_cdf, default_interintra_cdf);
+  av1_copy(fc->wedge_interintra_cdf, default_wedge_interintra_cdf);
+#endif  // CONFIG_NEW_MULTISYMBOL
   av1_copy(fc->interintra_mode_prob, default_interintra_mode_prob);
 #if CONFIG_EC_ADAPT
   av1_copy(fc->interintra_mode_cdf, default_interintra_mode_cdf);