commit 894cc81312146d5907be9ffa0597d57e3329e841
author Thomas Davies <thdavies@cisco.com> Thu Jun 22 17:51:33 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Wed Jun 28 09:50:17 2017 +0000
tree ed6f391084a43cb9e598ed0063c7cf6722ab4ca7
parent 243b66bc32032503319de9177a6a02265eb6d25c

NEW_MULTISYMBOL: adapt comp_ref and bwd_ref.

Change-Id: I711cd173af501ba955e889d1e2205125615a99fd

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 9177e9a..a8af114 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1428,10 +1428,49 @@
 static const aom_prob default_comp_bwdref_p[REF_CONTEXTS][BWD_REFS - 1] = {
   { 16 }, { 74 }, { 142 }, { 170 }, { 247 }
 };
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+    default_comp_ref_cdf[REF_CONTEXTS][FWD_REFS - 1][CDF_SIZE(2)] = {
+      // TODO(zoeliu): To adjust the initial prob values.
+      { { AOM_ICDF(33 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(16 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(16 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(77 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(74 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(74 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(142 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(142 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(142 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(172 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(170 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(170 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(238 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(247 * 128), AOM_ICDF(32768), 0 },
+        { AOM_ICDF(247 * 128), AOM_ICDF(32768), 0 } }
+    };
+static const aom_cdf_prob
+    default_comp_bwdref_cdf[REF_CONTEXTS][BWD_REFS - 1][CDF_SIZE(2)] = {
+      { { AOM_ICDF(16 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(74 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(142 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(170 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(247 * 128), AOM_ICDF(32768), 0 } }
+    };
+#endif  // CONFIG_NEW_MULTISYMBOL
 #else
 static const aom_prob default_comp_ref_p[REF_CONTEXTS][COMP_REFS - 1] = {
   { 50 }, { 126 }, { 123 }, { 221 }, { 226 }
 };
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+    default_comp_ref_cdf[REF_CONTEXTS][COMP_REFS - 1][CDF_SIZE(2)] = {
+      { { AOM_ICDF(50 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(126 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(123 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(221 * 128), AOM_ICDF(32768), 0 } },
+      { { AOM_ICDF(226 * 128), AOM_ICDF(32768), 0 } }
+    };
+#endif  // CONFIG_NEW_MULTISYMBOL
 #endif  // CONFIG_EXT_REFS
 
 static const aom_prob default_single_ref_p[REF_CONTEXTS][SINGLE_REFS - 1] = {
@@ -4605,6 +4644,9 @@
   av1_copy(fc->uni_comp_ref_prob, default_uni_comp_ref_p);
 #endif  // CONFIG_EXT_COMP_REFS
   av1_copy(fc->comp_ref_prob, default_comp_ref_p);
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->comp_ref_cdf, default_comp_ref_cdf);
+#endif
 #if CONFIG_LV_MAP
   av1_copy(fc->txb_skip, default_txb_skip);
   av1_copy(fc->nz_map, default_nz_map);
@@ -4615,6 +4657,9 @@
 #endif
 #if CONFIG_EXT_REFS
   av1_copy(fc->comp_bwdref_prob, default_comp_bwdref_p);
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->comp_bwdref_cdf, default_comp_bwdref_cdf);
+#endif
 #endif  // CONFIG_EXT_REFS
   av1_copy(fc->single_ref_prob, default_single_ref_p);
 #if CONFIG_NEW_MULTISYMBOL