From 66323307029f9e9c9ed3f40aa225019e1f074f20 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Thu, 29 Nov 2012 16:39:15 -0800 Subject: Adds switchable filters with superblocks Allows switchbale filters to be used without mismatch when the superblock experiment is on. Also removes a spurious clamping code in decodemv.c which causes rare encode/decode mismatches. Change-Id: I809d9ee0b2859552b613500b539a615515b863ae --- vp9/common/vp9_pred_common.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'vp9/common/vp9_pred_common.c') diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index cb65d7282..2abae34b2 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -74,11 +74,13 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm, left_interp = vp9_switchable_interp_map[(m - 1)->mbmi.interp_filter]; else left_interp = VP9_SWITCHABLE_FILTERS; + assert(left_interp != -1); if (above_in_image && above_mode >= NEARESTMV && above_mode <= SPLITMV) above_interp = vp9_switchable_interp_map[ (m - cm->mode_info_stride)->mbmi.interp_filter]; else above_interp = VP9_SWITCHABLE_FILTERS; + assert(above_interp != -1); if (left_interp == above_interp) pred_context = left_interp; -- cgit v1.2.3