commit 170f7e13998d657f22c333cba9c0c77e46d88f98
author Jingning Han <jingning@google.com> Sun Nov 22 01:38:43 2020 -0800
committer Jingning Han <jingning@google.com> Mon Nov 23 17:39:07 2020 +0000
tree bb8baa1c5036d6f7c86bde4c6668900d776afe51
parent 1f257841d2a41b0e7867b3e29828387eeadc08b4

Reduce redundant operations in uniform compound modes

Change-Id: I2ea998081be0d062c0c740e60ab05fa0d6203400

av1/encoder/compound_type.c

diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index b6e268a..bc32281 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -1322,16 +1322,15 @@
 
     // Case COMPOUND_AVERAGE and COMPOUND_DISTWTD
     if (cur_type < COMPOUND_WEDGE) {
-      // Reuse data if matching record is found
-      InterPredParams inter_pred_params;
-      av1_dist_wtd_comp_weight_assign(
-          &cpi->common, mbmi, 0, &inter_pred_params.conv_params.fwd_offset,
-          &inter_pred_params.conv_params.bck_offset,
-          &inter_pred_params.conv_params.use_dist_wtd_comp_avg, 1);
-      int mask_value = inter_pred_params.conv_params.fwd_offset * 4;
-      memset(xd->seg_mask, mask_value, sizeof(xd->seg_mask));
       tmp_rate_mv = *rate_mv;
       if (have_newmv_in_inter_mode(this_mode)) {
+        InterPredParams inter_pred_params;
+        av1_dist_wtd_comp_weight_assign(
+            &cpi->common, mbmi, 0, &inter_pred_params.conv_params.fwd_offset,
+            &inter_pred_params.conv_params.bck_offset,
+            &inter_pred_params.conv_params.use_dist_wtd_comp_avg, 1);
+        int mask_value = inter_pred_params.conv_params.fwd_offset * 4;
+        memset(xd->seg_mask, mask_value, sizeof(xd->seg_mask));
         tmp_rate_mv = av1_interinter_compound_motion_search(cpi, x, cur_mv,
                                                             bsize, this_mode);
       }