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/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index 8de0a78..ec99b38 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -271,7 +271,11 @@
   int drl_mode_cost0[DRL_MODE_CONTEXTS][2];
 
   int inter_compound_mode_cost[INTER_MODE_CONTEXTS][INTER_COMPOUND_MODES];
+#if CONFIG_JNT_COMP
+  int compound_type_cost[BLOCK_SIZES_ALL][COMPOUND_TYPES - 1];
+#else
   int compound_type_cost[BLOCK_SIZES_ALL][COMPOUND_TYPES];
+#endif  // CONFIG_JNT_COMP
   int interintra_cost[BLOCK_SIZE_GROUPS][2];
   int wedge_interintra_cost[BLOCK_SIZES_ALL][2];
   int interintra_mode_cost[BLOCK_SIZE_GROUPS][INTERINTRA_MODES];
@@ -347,6 +351,7 @@
 #endif  // CONFIG_DIST_8X8
 #if CONFIG_JNT_COMP
   int comp_idx_cost[COMP_INDEX_CONTEXTS][2];
+  int comp_group_idx_cost[COMP_GROUP_IDX_CONTEXTS][2];
 #endif  // CONFIG_JNT_COMP
 };