diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-08-03 10:18:25 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-03 10:18:25 -0700 |
| commit | 4aabfaa5d03501ff6887039425d578a08ab3a010 (patch) | |
| tree | 6c84215a59dbb992a9247ab1d0e85ac66ab54269 /vp8/decoder | |
| parent | 2914ab2e8b9fca26a430aed1dea56070621eb71e (diff) | |
| parent | 0ebf548c752ef25ff8e9a65037fd9aee6420184e (diff) | |
| download | libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.tar libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.tar.gz libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.tar.bz2 libvpx-4aabfaa5d03501ff6887039425d578a08ab3a010.zip | |
Merge "Merging and bug-fix in enhanced_interp experiment" into experimental
Diffstat (limited to 'vp8/decoder')
| -rw-r--r-- | vp8/decoder/decodframe.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 47d0faa7b..6cf9104f2 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -771,15 +771,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); } @@ -1251,7 +1247,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)) { @@ -1263,7 +1258,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); |