]> granicus.if.org Git - libvpx/commitdiff
Removed is_inter_mode() check
authorScott LaVarnway <slavarnway@google.com>
Thu, 2 May 2013 17:44:33 +0000 (13:44 -0400)
committerScott LaVarnway <slavarnway@google.com>
Thu, 2 May 2013 17:44:33 +0000 (13:44 -0400)
If a reference frame is inter, the only valid modes would
be inter modes.  This check is unnecessary.

Change-Id: Ib8433ab5a3418f94149ee4e3062d48d7740d225a

vp9/decoder/vp9_decodemv.c

index 55c67374abd2dee2ed937d813882b23f2f5db682..d0c255e03a77438f5f13971b81902a77ba22d5d6 100644 (file)
@@ -714,11 +714,9 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
 #endif
     }
 
-    if (is_inter_mode(mbmi->mode)) {
-      mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
-                                ? read_switchable_filter_type(pbi, r)
-                                : cm->mcomp_filter_type;
-    }
+    mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
+                              ? read_switchable_filter_type(pbi, r)
+                              : cm->mcomp_filter_type;
 
     if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
         (cm->comp_pred_mode == HYBRID_PREDICTION &&