commit 0589c00d0a58c2963730c1a263023b1df18303bb
author Jingning Han <jingning@google.com> Sun Nov 22 01:20:37 2020 -0800
committer Jingning Han <jingning@google.com> Mon Nov 23 17:39:07 2020 +0000
tree 8317674873ba88a8e958459ff6b183941af4bf9d
parent 7bdd7a76a4f334de2c3b65123227271036411e16

Reduce redundant operations in diffwtd search

Change-Id: Ifdb2c2f682556d59816ab40447c3475483b0fc4f

av1/encoder/compound_type.c

diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index 5bbe0c4..b45fcff 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -1452,20 +1452,20 @@
 
       for (int mask_index = 0; mask_index < 2 && need_mask_search;
            ++mask_index) {
-        // hard coded number for diff wtd
-        int mask_value = mask_index == 0 ? 38 : 26;
-        memset(xd->seg_mask, mask_value, sizeof(xd->seg_mask));
         tmp_rate_mv = *rate_mv;
-        mbmi->interinter_comp.mask_type =
-            mask_index == 0 ? DIFFWTD_38 : DIFFWTD_38_INV;
-        if (have_newmv_in_inter_mode(this_mode))
+        mbmi->interinter_comp.mask_type = mask_index;
+        if (have_newmv_in_inter_mode(this_mode)) {
+          // hard coded number for diff wtd
+          int mask_value = mask_index == 0 ? 38 : 26;
+          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);
+        }
         av1_enc_build_inter_predictor(cm, xd, mi_row, mi_col, orig_dst, bsize,
                                       AOM_PLANE_Y, AOM_PLANE_Y);
         RD_STATS est_rd_stats;
         int64_t this_rd_cur =
-            estimate_yrd_for_sb(cpi, bsize, x, INT64_MAX, &est_rd_stats);
+            estimate_yrd_for_sb(cpi, bsize, x, ref_best_rd, &est_rd_stats);
         if (this_rd_cur < INT64_MAX) {
           this_rd_cur = RDCOST(x->rdmult, rs2 + tmp_rate_mv + est_rd_stats.rate,
                                est_rd_stats.dist);
@@ -1500,7 +1500,7 @@
                                       AOM_PLANE_Y, AOM_PLANE_Y);
         RD_STATS est_rd_stats;
         int64_t this_rd_cur =
-            estimate_yrd_for_sb(cpi, bsize, x, INT64_MAX, &est_rd_stats);
+            estimate_yrd_for_sb(cpi, bsize, x, ref_best_rd, &est_rd_stats);
         if (this_rd_cur < INT64_MAX) {
           best_rd_cur = RDCOST(x->rdmult, rs2 + tmp_rate_mv + est_rd_stats.rate,
                                est_rd_stats.dist);