commit 904fae022c7fcbb169b2547afb7fcfe0508ccc29
author Remya <remya.prakasan@ittiam.com> Wed Jul 03 16:31:15 2019 +0530
committer Remya <remya.prakasan@ittiam.com> Wed Jul 03 16:35:55 2019 +0530
tree ea434e08ae03e66cf615f1a2441b5048fdbb592d
parent d82f716bc3d5115e3b1171eb2b6aab04b0e7a8b9

Refactor calc_masked_type_cost

Used enum for array indices

Change-Id: Ifc525fc7388d3d46a7969b78c4e7b97ac81a4706

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 89c422e..f3491ab 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -9712,21 +9712,25 @@
                                          int comp_index_ctx,
                                          int masked_compound_used,
                                          int *masked_type_cost) {
-  av1_zero_array(masked_type_cost, 4);
+  av1_zero_array(masked_type_cost, COMPOUND_TYPES);
   // Account for group index cost when wedge and/or diffwtd prediction are
   // enabled
   if (masked_compound_used) {
-    masked_type_cost[0] += x->comp_group_idx_cost[comp_group_idx_ctx][0];
-    masked_type_cost[1] += masked_type_cost[0];
-    masked_type_cost[2] += x->comp_group_idx_cost[comp_group_idx_ctx][1];
-    masked_type_cost[3] += masked_type_cost[2];
+    // Compound group index of average and distwtd is 0
+    // Compound group index of wedge and diffwtd is 1
+    masked_type_cost[COMPOUND_AVERAGE] +=
+        x->comp_group_idx_cost[comp_group_idx_ctx][0];
+    masked_type_cost[COMPOUND_DISTWTD] += masked_type_cost[COMPOUND_AVERAGE];
+    masked_type_cost[COMPOUND_WEDGE] +=
+        x->comp_group_idx_cost[comp_group_idx_ctx][1];
+    masked_type_cost[COMPOUND_DIFFWTD] += masked_type_cost[COMPOUND_WEDGE];
   }
 
-  // Compute the cost to signal compound type
-  masked_type_cost[0] += x->comp_idx_cost[comp_index_ctx][1];
-  masked_type_cost[1] += x->comp_idx_cost[comp_index_ctx][0];
-  masked_type_cost[2] += x->compound_type_cost[bsize][0];
-  masked_type_cost[3] += x->compound_type_cost[bsize][1];
+  // Compute the cost to signal compound index/type
+  masked_type_cost[COMPOUND_AVERAGE] += x->comp_idx_cost[comp_index_ctx][1];
+  masked_type_cost[COMPOUND_DISTWTD] += x->comp_idx_cost[comp_index_ctx][0];
+  masked_type_cost[COMPOUND_WEDGE] += x->compound_type_cost[bsize][0];
+  masked_type_cost[COMPOUND_DIFFWTD] += x->compound_type_cost[bsize][1];
 }
 
 // Updates mbmi structure with the relevant compound type info
@@ -9762,7 +9766,7 @@
   const int mask_len = 2 * num_pix * sizeof(uint8_t);
   COMPOUND_TYPE cur_type;
   // Local array to store the mask cost for different compound types
-  int masked_type_cost[4];
+  int masked_type_cost[COMPOUND_TYPES];
   int best_compmode_interinter_cost = 0;
   int calc_pred_masked_compound = 1;
   int64_t comp_dist[COMPOUND_TYPES] = { INT64_MAX, INT64_MAX, INT64_MAX,