commit bdd6ca8143385ca05eaf6664b50dad4491021f0c
author Cheng Chen <chengchen@google.com> Mon Oct 23 22:34:25 2017 -0700
committer Cheng Chen <chengchen@google.com> Sat Oct 28 01:37:58 2017 +0000
tree 2b6aea2b2dce4e3a1798de6a52d947679713601b
parent 3ca43bf0aee35c25deba512f92dbe67a362619d3

JNT_COMP: 6. support wedge

Support compound_segment and wedge.
JNT_COMP is a competitor to compound_segment and wedge. They are
mutually exclusive.

Change-Id: Id93c36de44a69008182424f40325e42e699bedcd

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index ae4529f..7825846 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2642,24 +2642,20 @@
       ) {
     if (is_any_masked_compound_used(bsize)) {
 #if CONFIG_COMPOUND_SEGMENT || CONFIG_WEDGE
-      if (cm->allow_masked_compound) {
+#if CONFIG_JNT_COMP
+      if (cm->allow_masked_compound && mbmi->compound_idx)
+#else
+      if (cm->allow_masked_compound)
+#endif  // CONFIG_JNT_COMP
+      {
 #if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT
         if (!is_interinter_compound_used(COMPOUND_WEDGE, bsize))
           mbmi->interinter_compound_type =
               aom_read_bit(r, ACCT_STR) ? COMPOUND_AVERAGE : COMPOUND_SEG;
         else
 #endif  // CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT
-#if CONFIG_JNT_COMP
-        {
-          if (mbmi->compound_idx) {
-            mbmi->interinter_compound_type = aom_read_symbol(
-                r, ec_ctx->compound_type_cdf[bsize], COMPOUND_TYPES, ACCT_STR);
-          }
-        }
-#else
-        mbmi->interinter_compound_type = aom_read_symbol(
-            r, ec_ctx->compound_type_cdf[bsize], COMPOUND_TYPES, ACCT_STR);
-#endif  // CONFIG_JNT_COMP
+          mbmi->interinter_compound_type = aom_read_symbol(
+              r, ec_ctx->compound_type_cdf[bsize], COMPOUND_TYPES, ACCT_STR);
 #if CONFIG_WEDGE
         if (mbmi->interinter_compound_type == COMPOUND_WEDGE) {
           assert(is_interinter_compound_used(COMPOUND_WEDGE, bsize));
@@ -2670,10 +2666,7 @@
 #endif  // CONFIG_WEDGE
 #if CONFIG_COMPOUND_SEGMENT
         if (mbmi->interinter_compound_type == COMPOUND_SEG) {
-#if CONFIG_JNT_COMP
-          if (mbmi->compound_idx)
-#endif  // CONFIG_JNT_COMP
-            mbmi->mask_type = aom_read_literal(r, MAX_SEG_MASK_BITS, ACCT_STR);
+          mbmi->mask_type = aom_read_literal(r, MAX_SEG_MASK_BITS, ACCT_STR);
         }
 #endif  // CONFIG_COMPOUND_SEGMENT
       }