From 0ebf548c752ef25ff8e9a65037fd9aee6420184e Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 27 Jul 2012 17:46:33 -0700 Subject: Merging and bug-fix in enhanced_interp experiment Merged the enhanced_interp experiment. Found and fixed a bug in the include files framework, whereby certain encoder files were still using the old INTERP_EXTEND value of 3 instead of 4. The thresholds for mv range mcomp.c need a small adjustment to prevent crashes. The results are more or less unchanged. Change-Id: Iac5008390f1efc97ce1102fbb5f8989c847fb579 --- vp8/decoder/decodframe.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'vp8/decoder') diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index c31595d59..2d91b3c7a 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -746,15 +746,11 @@ static void init_frame(VP8D_COMP *pbi) { } else { if (!pc->use_bilinear_mc_filter) -#if CONFIG_ENHANCED_INTERP pc->mcomp_filter_type = EIGHTTAP; -#else - pc->mcomp_filter_type = SIXTAP; -#endif else pc->mcomp_filter_type = BILINEAR; - /* To enable choice of different interploation filters */ + /* To enable choice of different interpolation filters */ vp8_setup_interp_filters(xd, pc->mcomp_filter_type, pc); } @@ -1226,7 +1222,6 @@ int vp8_decode_frame(VP8D_COMP *pbi) { /* Is high precision mv allowed */ xd->allow_high_precision_mv = (unsigned char)vp8_read_bit(bc); #endif -#if CONFIG_ENHANCED_INTERP // Read the type of subpel filter to use #if CONFIG_SWITCHABLE_INTERP if (vp8_read_bit(bc)) { @@ -1238,7 +1233,6 @@ int vp8_decode_frame(VP8D_COMP *pbi) { } /* To enable choice of different interploation filters */ vp8_setup_interp_filters(xd, pc->mcomp_filter_type, pc); -#endif } pc->refresh_entropy_probs = vp8_read_bit(bc); -- cgit v1.2.3