commit d82f716bc3d5115e3b1171eb2b6aab04b0e7a8b9
author Remya <remya.prakasan@ittiam.com> Tue Jul 02 15:35:08 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jul 02 22:38:20 2019 +0000
tree 9c558d9e41f4f63b2c5d836c7f1300531e258332
parent e91f8f22e5653a0dcf9d84cfc685c8e8fdd3b08c

Abstract mbmi updates in compound_type_rd

Simplified and abstracted mbmi updates in compound_type_rd

Change-Id: I4b6402de696b8be0fe3dfa4549ca549b53007e9c

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 4b3e09b..89c422e 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9729,6 +9729,14 @@
   masked_type_cost[3] += x->compound_type_cost[bsize][1];
 }
 
+// Updates mbmi structure with the relevant compound type info
+static INLINE void update_mbmi_for_compound_type(MB_MODE_INFO *mbmi,
+                                                 COMPOUND_TYPE cur_type) {
+  mbmi->interinter_comp.type = cur_type;
+  mbmi->comp_group_idx = (cur_type >= COMPOUND_WEDGE);
+  mbmi->compound_idx = (cur_type != COMPOUND_DISTWTD);
+}
+
 static int compound_type_rd(
     const AV1_COMP *const cpi, MACROBLOCK *x, BLOCK_SIZE bsize, int mi_col,
     int mi_row, int_mv *cur_mv, int mode_search_mask, int masked_compound_used,
@@ -9809,11 +9817,8 @@
       int est_rate[2];
       int64_t est_dist[2], est_rd[2];
 
-      mbmi->comp_group_idx = 0;
-
       // First find the modeled rd cost for COMPOUND_AVERAGE
-      mbmi->interinter_comp.type = COMPOUND_AVERAGE;
-      mbmi->compound_idx = 1;
+      update_mbmi_for_compound_type(mbmi, COMPOUND_AVERAGE);
       av1_enc_build_inter_predictor(cm, xd, mi_row, mi_col, orig_dst, bsize,
                                     AOM_PLANE_Y, AOM_PLANE_Y);
       *is_luma_interp_done = 1;
@@ -9827,8 +9832,7 @@
       restore_dst_buf(xd, *tmp_dst, 1);
 
       // Next find the modeled rd cost for COMPOUND_DISTWTD
-      mbmi->interinter_comp.type = COMPOUND_DISTWTD;
-      mbmi->compound_idx = 0;
+      update_mbmi_for_compound_type(mbmi, COMPOUND_DISTWTD);
       av1_enc_build_inter_predictor(cm, xd, mi_row, mi_col, orig_dst, bsize,
                                     AOM_PLANE_Y, AOM_PLANE_Y);
       model_rd_sb_fn[MODELRD_CURVFIT](
@@ -9842,8 +9846,7 @@
       // Choose the better of the two based on modeled cost and call
       // estimate_yrd_for_sb() for that one.
       if (est_rd[COMPOUND_AVERAGE] <= est_rd[COMPOUND_DISTWTD]) {
-        mbmi->interinter_comp.type = COMPOUND_AVERAGE;
-        mbmi->compound_idx = 1;
+        update_mbmi_for_compound_type(mbmi, COMPOUND_AVERAGE);
         restore_dst_buf(xd, *orig_dst, 1);
         rs2 = masked_type_cost[COMPOUND_AVERAGE];
         RD_STATS est_rd_stats;
@@ -9879,10 +9882,8 @@
         }
       }
     } else {
-      mbmi->interinter_comp.type = cur_type;
       if (cur_type == COMPOUND_AVERAGE || cur_type == COMPOUND_DISTWTD) {
-        mbmi->comp_group_idx = 0;
-        mbmi->compound_idx = (cur_type == COMPOUND_AVERAGE);
+        update_mbmi_for_compound_type(mbmi, cur_type);
         rs2 = masked_type_cost[cur_type];
         const int64_t mode_rd = RDCOST(x->rdmult, rs2 + rd_stats->rate, 0);
         if (mode_rd < ref_best_rd) {
@@ -9926,8 +9927,7 @@
         // use spare buffer for following compound type try
         if (cur_type == COMPOUND_AVERAGE) restore_dst_buf(xd, *tmp_dst, 1);
       } else {
-        mbmi->comp_group_idx = 1;
-        mbmi->compound_idx = 1;
+        update_mbmi_for_compound_type(mbmi, cur_type);
         rs2 = masked_type_cost[cur_type];
 
         if (((*rd / cpi->max_comp_type_rd_threshold_div) *