commit 46970619f48e0a6dbaad2433030ef8c6165e6035
author Cheng Chen <chengchen@google.com> Tue Oct 24 14:53:36 2017 -0700
committer Cheng Chen <chengchen@google.com> Fri Nov 10 05:42:06 2017 +0000
tree eeef1376305fa1a830675f76c153abeb3cd5416b
parent 267e327242fc39bf873cccfd260f04acbb9529be

JNT_COMP: Support new_multisymbol

Support cdf for jnt_comp read/write.

Change-Id: I2c29277a8b06b3e9f571355946b70ce0d492fbb2

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 5ac7e15..548d7d2 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1652,6 +1652,20 @@
 #endif  // CONFIG_NEW_MULTISYMBOL
 
 #if CONFIG_JNT_COMP
+#if CONFIG_NEW_MULTISYMBOL
+static const aom_cdf_prob
+    default_compound_idx_cdfs[COMP_INDEX_CONTEXTS][CDF_SIZE(2)] = {
+      { AOM_ICDF(24576), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(16384), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(8192), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(24576), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(16384), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(8192), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(24576), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(16384), AOM_ICDF(32768), 0 },
+      { AOM_ICDF(8192), AOM_ICDF(32768), 0 }
+    };
+#endif  // CONFIG_NEW_MULTISYMBOL
 static const aom_prob default_compound_idx_probs[COMP_INDEX_CONTEXTS] = {
   192, 128, 64, 192, 128, 64, 192, 128, 64,
 };
@@ -3446,6 +3460,9 @@
   av1_copy(fc->txfm_partition_cdf, default_txfm_partition_cdf);
 #endif
 #if CONFIG_JNT_COMP
+#if CONFIG_NEW_MULTISYMBOL
+  av1_copy(fc->compound_index_cdf, default_compound_idx_cdfs);
+#endif  // CONFIG_NEW_MULTISYMBOL
   av1_copy(fc->compound_index_probs, default_compound_idx_probs);
 #endif  // CONFIG_JNT_COMP
   av1_copy(fc->newmv_prob, default_newmv_prob);