commit 1056a37f4ad90d65862d35c7232baf8a5455e1d8
author Remya <remya.prakasan@ittiam.com> Thu Jul 18 16:41:58 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Jul 18 23:24:06 2019 +0000
tree c19415ddffc3e6ee5bdc399cbc9cacdee27a17a5
parent 4ceeffbf4d66d9c0df8252bf3d9a228d434551ef

Refactor is_comp_rd_match()

Introduced a loop in is_comp_rd_match() to
avoid redundant code

Change-Id: I97ad01e3c745f08c5fff9188b74fc126c34bb868

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index d8436d2..432c225 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8537,13 +8537,13 @@
     if (is_global_mv_block(mi, wm->wmtype) != st->is_global[i]) return 0;
   }
 
-  // Store the stats for compound average
-  comp_rate[COMPOUND_AVERAGE] = st->rate[COMPOUND_AVERAGE];
-  comp_dist[COMPOUND_AVERAGE] = st->dist[COMPOUND_AVERAGE];
-  comp_model_rd[COMPOUND_AVERAGE] = st->comp_model_rd[COMPOUND_AVERAGE];
-  comp_rate[COMPOUND_DISTWTD] = st->rate[COMPOUND_DISTWTD];
-  comp_dist[COMPOUND_DISTWTD] = st->dist[COMPOUND_DISTWTD];
-  comp_model_rd[COMPOUND_DISTWTD] = st->comp_model_rd[COMPOUND_DISTWTD];
+  // Store the stats for COMPOUND_AVERAGE and COMPOUND_DISTWTD
+  for (int comp_type = COMPOUND_AVERAGE; comp_type <= COMPOUND_DISTWTD;
+       comp_type++) {
+    comp_rate[comp_type] = st->rate[comp_type];
+    comp_dist[comp_type] = st->dist[comp_type];
+    comp_model_rd[comp_type] = st->comp_model_rd[comp_type];
+  }
 
   // For compound wedge/segment, reuse data only if NEWMV is not present in
   // either of the directions