diff options
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index d41355136..0fb991d16 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3275,7 +3275,6 @@ void vp9_encode_frame(VP9_COMP *cpi) { } } else { cm->reference_mode = SINGLE_REFERENCE; - cm->interp_filter = SWITCHABLE; encode_frame_internal(cpi); } } diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index d5a0fcde4..87e685be7 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -333,10 +333,10 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, const int *const rd_thresh_freq_fact = cpi->rd.thresh_freq_fact[bsize]; // Mode index conversion form THR_MODES to PREDICTION_MODE for a ref frame. int mode_idx[MB_MODE_COUNT] = {0}; - INTERP_FILTER filter_ref = SWITCHABLE; + INTERP_FILTER filter_ref = cm->interp_filter; int bsl = mi_width_log2_lookup[bsize]; - const int pred_filter_search = (((mi_row + mi_col) >> bsl) + - get_chessboard_index(cm)) % 2; + const int pred_filter_search = cm->interp_filter == SWITCHABLE ? + (((mi_row + mi_col) >> bsl) + get_chessboard_index(cm)) % 2 : 0; int const_motion[MAX_REF_FRAMES] = { 0 }; // For speed 6, the result of interp filter is reused later in actual encoding |