commit e6e58b36342ab5e72dbdf3578fd7428691a21e01
author Remya <remya.prakasan@ittiam.com> Wed Jun 26 16:03:52 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Wed Jun 26 20:26:55 2019 +0000
tree 50607b68095696c121deef03096c3a89d0100de5
parent e92cdb61a4b9b52aa85c0430a827cfc88b73795e

Refactor get_interinter_compound_mask_rate

Inlined and removed redundant cases in the
function 'get_interinter_compound_mask_rate()'

Change-Id: Ice0b7c7712c4f3edff17410600ed4f32119dceab

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 32e656d..31e22b9 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -6466,18 +6466,19 @@
   }
 }
 
-static int get_interinter_compound_mask_rate(const MACROBLOCK *const x,
-                                             const MB_MODE_INFO *const mbmi) {
-  switch (mbmi->interinter_comp.type) {
-    case COMPOUND_AVERAGE: return 0;
-    case COMPOUND_WEDGE:
-      return get_interinter_wedge_bits(mbmi->sb_type) > 0
-                 ? av1_cost_literal(1) +
-                       x->wedge_idx_cost[mbmi->sb_type]
-                                        [mbmi->interinter_comp.wedge_index]
-                 : 0;
-    case COMPOUND_DIFFWTD: return av1_cost_literal(1);
-    default: assert(0); return 0;
+static INLINE int get_interinter_compound_mask_rate(
+    const MACROBLOCK *const x, const MB_MODE_INFO *const mbmi) {
+  const COMPOUND_TYPE compound_type = mbmi->interinter_comp.type;
+  // This function will be called only for COMPOUND_WEDGE and COMPOUND_DIFFWTD
+  if (compound_type == COMPOUND_WEDGE) {
+    return get_interinter_wedge_bits(mbmi->sb_type) > 0
+               ? av1_cost_literal(1) +
+                     x->wedge_idx_cost[mbmi->sb_type]
+                                      [mbmi->interinter_comp.wedge_index]
+               : 0;
+  } else {
+    assert(compound_type == COMPOUND_DIFFWTD);
+    return av1_cost_literal(1);
   }
 }