commit 2ef24ea26575d0c27cee9817abfe461978aef581
author Cheng Chen <chengchen@google.com> Wed Nov 29 12:22:24 2017 -0800
committer Cheng Chen <chengchen@google.com> Tue Dec 05 20:34:22 2017 +0000
tree 01651d4e34ef6ff22af23dfd2746db4837d93521
parent 33a13d9fe8466808564f472cf368b69b3fc19392

JNT_COMP: change COMPOUND_AVERAGE in cdf

Remove COMPOUND_AVERAGE from compound_type_cdfs since it is now grouped
to compound_idx. However, COMPOUND_AVERAGE is still used elsewhere.

Change-Id: Ie0d460aabf9252e80eb4130cfef9aaf0efc3969d

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 4f05d99..c669a4c 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -70,7 +70,11 @@
 }
 
 static struct av1_token interintra_mode_encodings[INTERINTRA_MODES];
+#if CONFIG_JNT_COMP
+static struct av1_token compound_type_encodings[COMPOUND_TYPES - 1];
+#else
 static struct av1_token compound_type_encodings[COMPOUND_TYPES];
+#endif  // CONFIG_JNT_COMP
 #if CONFIG_LOOP_RESTORATION
 static void loop_restoration_write_sb_coeffs(const AV1_COMMON *const cm,
                                              MACROBLOCKD *xd,
@@ -1469,11 +1473,11 @@
         if (cpi->common.reference_mode != SINGLE_REFERENCE &&
             is_inter_compound_mode(mbmi->mode) &&
             mbmi->motion_mode == SIMPLE_TRANSLATION &&
-            is_any_masked_compound_used(bsize) && cm->allow_masked_compound &&
-            mbmi->comp_group_idx) {
+            is_any_masked_compound_used(bsize) && cm->allow_masked_compound) {
           if (is_interinter_compound_used(COMPOUND_WEDGE, bsize))
-            aom_write_symbol(w, mbmi->interinter_compound_type,
-                             ec_ctx->compound_type_cdf[bsize], COMPOUND_TYPES);
+            aom_write_symbol(w, mbmi->interinter_compound_type - 1,
+                             ec_ctx->compound_type_cdf[bsize],
+                             COMPOUND_TYPES - 1);
 
           if (is_interinter_compound_used(COMPOUND_WEDGE, bsize) &&
               mbmi->interinter_compound_type == COMPOUND_WEDGE) {