Commit c7576f97 authored by Adrian Grange's avatar Adrian Grange Committed by Gerrit Code Review

Merge "Merge prediction filter" into experimental

parents 290b83ab 7bcaac3e
......@@ -239,7 +239,6 @@ HAVE_LIST="
EXPERIMENT_LIST="
csm
comp_intra_pred
pred_filter
lossless
subpelrefmv
new_mvref
......
......@@ -97,11 +97,7 @@ void vp9_kf_default_bmode_probs(vp9_prob dest[VP9_KF_BINTRAMODES]
void vp9_adapt_mode_probs(struct VP9Common *);
#if CONFIG_PRED_FILTER
#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
[VP9_SWITCHABLE_FILTERS];
......
......@@ -49,11 +49,7 @@ extern void print_tree_update_probs();
static void set_default_lf_deltas(VP9_COMP *cpi);
#if CONFIG_PRED_FILTER
#define DEFAULT_INTERP_FILTER SWITCHABLE
#else
#define DEFAULT_INTERP_FILTER EIGHTTAP
#endif
#define SEARCH_BEST_FILTER 0 /* to search exhaustively for
best filter */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment