diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-06-30 12:48:21 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2014-06-30 12:48:21 -0700 |
| commit | 186bd4eb5234d22aa8e9f0a6a27d40743195b89c (patch) | |
| tree | 1505ffc750b14dcdb3068e4679fdad901b021704 /vp9/encoder/vp9_pickmode.c | |
| parent | 9d41313e4bd28d3c504c26079cbe4a499e7eceb7 (diff) | |
| download | libvpx-186bd4eb5234d22aa8e9f0a6a27d40743195b89c.tar libvpx-186bd4eb5234d22aa8e9f0a6a27d40743195b89c.tar.gz libvpx-186bd4eb5234d22aa8e9f0a6a27d40743195b89c.tar.bz2 libvpx-186bd4eb5234d22aa8e9f0a6a27d40743195b89c.zip | |
change to not force interp_type as SWITCHABLE
Encoder still uses SWITCHABLE as default via DEFAULT_INTERP_FILTER,
but does not override the default if it is not SWITCHABLE.
Change-Id: I3c0f6653bd228381a623a026c66599b0a87d01d5
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 |