Merge prediction filter

Removed the experimental flag from around the prediction filter.

Change-Id: Ic1dd2db8fe8ac17ed5129f83094d4c5cdd5527d2
This commit is contained in:
Adrian Grange 2013-01-14 12:57:07 -08:00
parent 76ac5b3937
commit 7bcaac3e64
3 changed files with 0 additions and 9 deletions

1
configure vendored
View File

@ -239,7 +239,6 @@ HAVE_LIST="
EXPERIMENT_LIST=" EXPERIMENT_LIST="
csm csm
comp_intra_pred comp_intra_pred
pred_filter
lossless lossless
subpelrefmv subpelrefmv
new_mvref new_mvref

View File

@ -97,11 +97,7 @@ void vp9_kf_default_bmode_probs(vp9_prob dest[VP9_KF_BINTRAMODES]
void vp9_adapt_mode_probs(struct VP9Common *); void vp9_adapt_mode_probs(struct VP9Common *);
#if CONFIG_PRED_FILTER
#define VP9_SWITCHABLE_FILTERS 3 /* number of switchable filters */ #define VP9_SWITCHABLE_FILTERS 3 /* number of switchable filters */
#else
#define VP9_SWITCHABLE_FILTERS 2 /* number of switchable filters */
#endif
extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
[VP9_SWITCHABLE_FILTERS]; [VP9_SWITCHABLE_FILTERS];

View File

@ -49,11 +49,7 @@ extern void print_tree_update_probs();
static void set_default_lf_deltas(VP9_COMP *cpi); static void set_default_lf_deltas(VP9_COMP *cpi);
#if CONFIG_PRED_FILTER
#define DEFAULT_INTERP_FILTER SWITCHABLE #define DEFAULT_INTERP_FILTER SWITCHABLE
#else
#define DEFAULT_INTERP_FILTER EIGHTTAP
#endif
#define SEARCH_BEST_FILTER 0 /* to search exhaustively for #define SEARCH_BEST_FILTER 0 /* to search exhaustively for
best filter */ best filter */