commit b61c0863d320fb39cc6f5f972ad62a77621dd000
author Jingning Han <jingning@google.com> Sun Nov 15 15:25:24 2020 -0800
committer Jingning Han <jingning@google.com> Sun Nov 15 15:38:04 2020 -0800
tree 177248e94d6299e5297b2eab38b2c65e4739c28d
parent 2bbeba2ea8afec30183588f618699ad16dd639d2

Remove a redundant rdcost calculation

No coding stats change.

Change-Id: I15893648fac4fd8f0cc9e165e7a8633e7f921ccc

av1/encoder/compound_type.c

diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c
index cce0ea2..2adee41 100644
--- a/av1/encoder/compound_type.c
+++ b/av1/encoder/compound_type.c
@@ -1352,6 +1352,7 @@
       int best_mask_index = 0;
       int best_wedge_sign = 0;
       int_mv tmp_mv[2] = { mbmi->mv[0], mbmi->mv[1] };
+      int best_rs2 = 0;
       int best_rate_mv = *rate_mv;
       const int wedge_mask_size = get_wedge_types_lookup(bsize);
       int ref_frame = av1_ref_frame_type(mbmi->ref_frame);
@@ -1392,6 +1393,7 @@
             tmp_mv[0] = mbmi->mv[0];
             tmp_mv[1] = mbmi->mv[1];
             best_rate_mv = tmp_rate_mv;
+            best_rs2 = rs2;
           }
         }
       }
@@ -1414,6 +1416,15 @@
         tmp_mv[0] = mbmi->mv[0];
         tmp_mv[1] = mbmi->mv[1];
         best_rate_mv = tmp_rate_mv;
+        best_rs2 = masked_type_cost[cur_type];
+        best_rs2 += get_interinter_compound_mask_rate(&x->mode_costs, mbmi);
+        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;
+        estimate_yrd_for_sb(cpi, bsize, x, INT64_MAX, &est_rd_stats);
+        best_rd_cur =
+            RDCOST(x->rdmult, best_rs2 + tmp_rate_mv + est_rd_stats.rate,
+                   est_rd_stats.dist);
       }
 
       mbmi->interinter_comp.wedge_index = best_mask_index;
@@ -1421,15 +1432,7 @@
       mbmi->mv[0] = tmp_mv[0];
       mbmi->mv[1] = tmp_mv[1];
       tmp_rate_mv = best_rate_mv;
-      rs2 = masked_type_cost[cur_type];
-      rs2 += get_interinter_compound_mask_rate(&x->mode_costs, mbmi);
-
-      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;
-      estimate_yrd_for_sb(cpi, bsize, x, INT64_MAX, &est_rd_stats);
-      best_rd_cur = RDCOST(x->rdmult, rs2 + tmp_rate_mv + est_rd_stats.rate,
-                           est_rd_stats.dist);
+      rs2 = best_rs2;
     } else if (cur_type == COMPOUND_DIFFWTD) {
       int_mv tmp_mv[2];
       int best_mask_index = 0;