diff options
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
4 files changed, 2 insertions, 11 deletions
@@ -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 439fb3f43..01e5856f7 100644 --- 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 90f350004..b767ff0b3 100644 --- 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 */ diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index fe2c0f3a7..73d5c5adc 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3765,8 +3765,6 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, *returnintra = LLONG_MAX; - x->skip = 0; - mbmi->ref_frame = INTRA_FRAME; /* Initialize zbin mode boost for uv costing */ @@ -3809,6 +3807,8 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, rate_y = 0; rate_uv = 0; + x->skip = 0; + this_mode = vp9_mode_order[mode_index].mode; mbmi->mode = this_mode; mbmi->uv_mode = DC_PRED; |