commit 6fdc853e40bc7210a87d0686d6125fa43f5fcba7
author Sarah Parker <sarahparker@google.com> Wed Nov 16 17:47:13 2016 -0800
committer Sarah Parker <sarahparker@google.com> Thu Dec 01 17:45:12 2016 +0000
tree 46975d2164aea8c9a716c3a00c8a81b579326075
parent 0c628e64d0b0e3ae03830395411dddee117f455a

Refactor ext-inter to loop through all masked modes in rdopt

No change in performance

Change-Id: Ie105a7baf6a2c2258d3ef117e727957e4393f51b

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 2b00c51..8fba4cb 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -4327,10 +4327,8 @@
     }
     if (cm->reference_mode != SINGLE_REFERENCE) {
       for (i = 0; i < BLOCK_SIZES; i++) {
-        if (is_interinter_wedge_used(i)) {
-          for (j = 0; j < COMPOUND_TYPES - 1; j++) {
-            av1_diff_update_prob(&r, &fc->compound_type_prob[i][j], ACCT_STR);
-          }
+        for (j = 0; j < COMPOUND_TYPES - 1; j++) {
+          av1_diff_update_prob(&r, &fc->compound_type_prob[i][j], ACCT_STR);
         }
       }
     }

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 101ed3e..05dc0fa 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1816,21 +1816,22 @@
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
 
 #if CONFIG_EXT_INTER
-  mbmi->interinter_compound = COMPOUND_AVERAGE;
+  mbmi->interinter_compound_data.type = COMPOUND_AVERAGE;
   if (cm->reference_mode != SINGLE_REFERENCE &&
-      is_inter_compound_mode(mbmi->mode) &&
+      is_inter_compound_mode(mbmi->mode)
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
-      mbmi->motion_mode == SIMPLE_TRANSLATION &&
+      && mbmi->motion_mode == SIMPLE_TRANSLATION
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
-      is_interinter_wedge_used(bsize)) {
-    mbmi->interinter_compound = aom_read_tree(
+      ) {
+    mbmi->interinter_compound_data.type = aom_read_tree(
         r, av1_compound_type_tree, cm->fc->compound_type_prob[bsize], ACCT_STR);
     if (xd->counts)
-      xd->counts->compound_interinter[bsize][mbmi->interinter_compound]++;
-    if (mbmi->interinter_compound == COMPOUND_WEDGE) {
-      mbmi->interinter_wedge_index =
+      xd->counts->compound_interinter[bsize]
+                                     [mbmi->interinter_compound_data.type]++;
+    if (mbmi->interinter_compound_data.type == COMPOUND_WEDGE) {
+      mbmi->interinter_compound_data.wedge_index =
           aom_read_literal(r, get_wedge_bits_lookup(bsize), ACCT_STR);
-      mbmi->interinter_wedge_sign = aom_read_bit(r, ACCT_STR);
+      mbmi->interinter_compound_data.wedge_sign = aom_read_bit(r, ACCT_STR);
     }
   }
 #endif  // CONFIG_EXT_INTER