ref: c7576f97ff58508411e4db08df1d8a4dcc6b2b68
parent: 290b83ab627365ac697b477a8d0cfa8cbf6b90db
parent: 7bcaac3e64c38de7112e6c05e3e7f19198cb9ae4
author: Adrian Grange <agrange@google.com>
date: Mon Jan 14 09:18:21 EST 2013
Merge "Merge prediction filter" into experimental
--- a/configure
+++ b/configure
@@ -239,7 +239,6 @@
EXPERIMENT_LIST="
csm
comp_intra_pred
- pred_filter
lossless
subpelrefmv
new_mvref
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -97,11 +97,7 @@
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];
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -49,11 +49,7 @@
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 */