commit 0a7f2f516f19a2d82adf0b43b81dc13213ab715d
author Cheng Chen <chengchen@google.com> Tue Oct 10 15:16:09 2017 -0700
committer Cheng Chen <chengchen@google.com> Fri Oct 27 16:44:22 2017 +0000
tree 6e2f65892d410227798b2eb88515ffe453a48163
parent ca6958c6a1419fad7be6b8c4e7fcad7fb6f1b97f

JNT_COMP: 4. add context and entropy read/write

Change-Id: I0e6f7ab981e31f7120105515f6204568b6dc82d3

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index f30728d..0d2d1ed 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -2354,6 +2354,12 @@
 static const aom_prob default_skip_probs[SKIP_CONTEXTS] = { 192, 128, 64 };
 #endif  // CONFIG_NEW_MULTISYMBOL
 
+#if CONFIG_JNT_COMP
+static const aom_prob default_compound_idx_probs[COMP_INDEX_CONTEXTS] = {
+  192, 128, 64, 192, 128, 64, 192, 128, 64,
+};
+#endif  // CONFIG_JNT_COMP
+
 #if CONFIG_LGT_FROM_PRED
 static const aom_prob default_intra_lgt_prob[LGT_SIZES][INTRA_MODES] = {
   { 255, 208, 208, 180, 230, 208, 194, 214, 220, 255,
@@ -6224,6 +6230,9 @@
 #if CONFIG_NEW_MULTISYMBOL
   av1_copy(fc->txfm_partition_cdf, default_txfm_partition_cdf);
 #endif
+#if CONFIG_JNT_COMP
+  av1_copy(fc->compound_index_probs, default_compound_idx_probs);
+#endif  // CONFIG_JNT_COMP
   av1_copy(fc->newmv_prob, default_newmv_prob);
   av1_copy(fc->zeromv_prob, default_zeromv_prob);
   av1_copy(fc->refmv_prob, default_refmv_prob);
@@ -6455,6 +6464,12 @@
     }
   }
 #endif  // CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE
+
+#if CONFIG_JNT_COMP
+  for (i = 0; i < COMP_INDEX_CONTEXTS; ++i)
+    fc->compound_index_probs[i] = av1_mode_mv_merge_probs(
+        pre_fc->compound_index_probs[i], counts->compound_index[i]);
+#endif  // CONFIG_JNT_COMP
 }
 
 void av1_adapt_intra_frame_probs(AV1_COMMON *cm) {