commit e06132efa872e2a7877e8f5d20b412747467e94f
author Urvang Joshi <urvang@google.com> Fri Feb 17 15:36:03 2017 -0800
committer Urvang Joshi <urvang@google.com> Tue Feb 21 17:52:34 2017 +0000
tree 5d82c903a2eaabf94c706b2cfe7c02087367a793
parent a5d892bdb8a6e19ee6f537abe1ec268dfa3acd85

get_pred_context_switchable_interp: remove redundant conditions.

Some of the conditions in 'else if' blocks were redundant. Getting
rid of them should improve speed.

Change-Id: Ib5a994c54c4913ca68c7d982abddc85c0b36db0b

av1/common/pred_common.c

diff --git a/av1/common/pred_common.c b/av1/common/pred_common.c
index 66b1fd1..afb27bf 100644
--- a/av1/common/pred_common.c
+++ b/av1/common/pred_common.c
@@ -58,14 +58,17 @@
     above_type =
         get_ref_filter_type(xd->mi[-xd->mi_stride], xd, dir, ref_frame);
 
-  if (left_type == above_type)
+  if (left_type == above_type) {
     filter_type_ctx += left_type;
-  else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS)
+  } else if (left_type == SWITCHABLE_FILTERS) {
+    assert(above_type != SWITCHABLE_FILTERS);
     filter_type_ctx += above_type;
-  else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS)
+  } else if (above_type == SWITCHABLE_FILTERS) {
+    assert(left_type != SWITCHABLE_FILTERS);
     filter_type_ctx += left_type;
-  else
+  } else {
     filter_type_ctx += SWITCHABLE_FILTERS;
+  }
 
   return filter_type_ctx;
 }
@@ -84,14 +87,17 @@
                              ? above_mbmi->interp_filter
                              : SWITCHABLE_FILTERS;
 
-  if (left_type == above_type)
+  if (left_type == above_type) {
     return left_type;
-  else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS)
+  } else if (left_type == SWITCHABLE_FILTERS) {
+    assert(above_type != SWITCHABLE_FILTERS);
     return above_type;
-  else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS)
+  } else if (above_type == SWITCHABLE_FILTERS) {
+    assert(left_type != SWITCHABLE_FILTERS);
     return left_type;
-  else
+  } else {
     return SWITCHABLE_FILTERS;
+  }
 }
 #endif