ref: 3036fd761ad484abfc375e2796e0e7b9dd7e1982
parent: 98726d538bd046b19b21233d2d51f8eaf7a5efef
author: Scott LaVarnway <[email protected]>
date: Tue May 17 11:26:12 EDT 2016
VP9: _get_pred_context_switchable_interp() Remove unnecessary checks. Change-Id: Ic7bce8277ac5f4ae88d4ab7d0ae3ab110b2f225b
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -28,9 +28,9 @@
if (left_type == above_type)
return left_type;
- else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS)
+ else if (left_type == SWITCHABLE_FILTERS)
return above_type;
- else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS)
+ else if (above_type == SWITCHABLE_FILTERS)
return left_type;
else
return SWITCHABLE_FILTERS;
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -371,9 +371,9 @@
if (left_type == above_type)
return left_type;
- else if (left_type == SWITCHABLE_FILTERS && above_type != SWITCHABLE_FILTERS)
+ else if (left_type == SWITCHABLE_FILTERS)
return above_type;
- else if (left_type != SWITCHABLE_FILTERS && above_type == SWITCHABLE_FILTERS)
+ else if (above_type == SWITCHABLE_FILTERS)
return left_type;
else
return SWITCHABLE_FILTERS;