diff options
| author | Adrian Grange <agrange@google.com> | 2013-01-08 14:14:01 -0800 |
|---|---|---|
| committer | Adrian Grange <agrange@google.com> | 2013-01-09 12:00:39 -0800 |
| commit | 7d6b5425d704c91c6d048c1a96542c9cd027f015 (patch) | |
| tree | 4aaa2e9c2ed467f0012a52020558e260f8636a66 /vp9/decoder/vp9_decodemv.c | |
| parent | 4b7304ee68dc28f96d73ff4ff1894de833d54f1a (diff) | |
| download | libvpx-7d6b5425d704c91c6d048c1a96542c9cd027f015.tar libvpx-7d6b5425d704c91c6d048c1a96542c9cd027f015.tar.gz libvpx-7d6b5425d704c91c6d048c1a96542c9cd027f015.tar.bz2 libvpx-7d6b5425d704c91c6d048c1a96542c9cd027f015.zip | |
New prediction filter
This patch removes the old pred-filter experiment and replaces it
with one that is implemented using the switchable filter framework.
If the pred-filter experiment is enabled, three interopolation
filters are tested during mode selection; the standard 8-tap
interpolation filter, a sharp 8-tap filter and a (new) 8-tap
smoothing filter.
The 6-tap filter code has been preserved for now and if the
enable-6tap experiment is enabled (in addition to the pred-filter
experiment) the original 6-tap filter replaces the new 8-tap smooth
filter in the switchable mode.
The new experiment applies the prediction filter in cases of a
fractional-pel motion vector. Future patches will apply the filter
where the mv is pel-aligned and also to intra predicted blocks.
Change-Id: I08e8cba978f2bbf3019f8413f376b8e2cd85eba4
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 78108a55d..4b633df45 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -550,12 +550,6 @@ static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *bc) { if (!cm->kf_ymode_probs_update) cm->kf_ymode_probs_index = vp9_read_literal(bc, 3); } else { -#if CONFIG_PRED_FILTER - cm->pred_filter_mode = (vp9_prob)vp9_read_literal(bc, 2); - - if (cm->pred_filter_mode == 2) - cm->prob_pred_filter_off = (vp9_prob)vp9_read_literal(bc, 8); -#endif if (cm->mcomp_filter_type == SWITCHABLE) read_switchable_interp_probs(pbi, bc); #if CONFIG_COMP_INTERINTRA_PRED @@ -825,17 +819,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, #endif } - -#if CONFIG_PRED_FILTER - if (mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV) { - // Is the prediction filter enabled - if (cm->pred_filter_mode == 2) - mbmi->pred_filter_enabled = - vp9_read(bc, cm->prob_pred_filter_off); - else - mbmi->pred_filter_enabled = cm->pred_filter_mode; - } -#endif if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV) { if (cm->mcomp_filter_type == SWITCHABLE) { |