Commit 370618ff authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "change to not force interp_type as SWITCHABLE"

parents 6643b886 186bd4eb
...@@ -3257,7 +3257,6 @@ void vp9_encode_frame(VP9_COMP *cpi) { ...@@ -3257,7 +3257,6 @@ void vp9_encode_frame(VP9_COMP *cpi) {
} }
} else { } else {
cm->reference_mode = SINGLE_REFERENCE; cm->reference_mode = SINGLE_REFERENCE;
cm->interp_filter = SWITCHABLE;
encode_frame_internal(cpi); encode_frame_internal(cpi);
} }
} }
......
...@@ -333,10 +333,10 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -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]; 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. // Mode index conversion form THR_MODES to PREDICTION_MODE for a ref frame.
int mode_idx[MB_MODE_COUNT] = {0}; 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]; int bsl = mi_width_log2_lookup[bsize];
const int pred_filter_search = (((mi_row + mi_col) >> bsl) + const int pred_filter_search = cm->interp_filter == SWITCHABLE ?
get_chessboard_index(cm)) % 2; (((mi_row + mi_col) >> bsl) + get_chessboard_index(cm)) % 2 : 0;
int const_motion[MAX_REF_FRAMES] = { 0 }; int const_motion[MAX_REF_FRAMES] = { 0 };
// For speed 6, the result of interp filter is reused later in actual encoding // For speed 6, the result of interp filter is reused later in actual encoding
......
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