Merge prediction filter

Removed the experimental flag from around the prediction filter.

Change-Id: Ic1dd2db8fe8ac17ed5129f83094d4c5cdd5527d2

diff --git a/configure b/configure
index 5506aec4589f2640c4a4f28ab1def2d85b59cdf9..cc43b9713746c8153c2f9fcd2a8cc6e038cbfc91 100755 (executable)
--- a/configure
+++ b/configure
@@ -239,7 +239,6 @@ HAVE_LIST="
 EXPERIMENT_LIST="
     csm
     comp_intra_pred
-    pred_filter
     lossless
     subpelrefmv
     new_mvref

diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 439fb3f43440b48a99e3b67cc559f61edbadb9b1..01e5856f785e3cff8e6be5c265aeafaeae15813c 100644 (file)
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -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];

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 90f3500047cf294fe9e2990502e5fa7a2d9d5961..b767ff0b32adeab60a75f40933fe195331ad7857 100644 (file)
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -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 */