diff options
| author | Hui Su <huisu@google.com> | 2018-08-29 15:39:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-29 15:39:31 +0000 |
| commit | 30d29529c984eabc7932bedc5629dda28a756b41 (patch) | |
| tree | e1a0429bedb09cb4f8eb3ce764685e200c6be121 /vp9/encoder | |
| parent | 5de95cb09ff683dd14bc1f170ac0e9b89ab830dd (diff) | |
| parent | 545bd0ca0e0c92383c159dfbfda300d28fb4ca05 (diff) | |
| download | libvpx-30d29529c984eabc7932bedc5629dda28a756b41.tar libvpx-30d29529c984eabc7932bedc5629dda28a756b41.tar.gz libvpx-30d29529c984eabc7932bedc5629dda28a756b41.tar.bz2 libvpx-30d29529c984eabc7932bedc5629dda28a756b41.zip | |
Merge "Skip unnecessary motion search"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 376c06222..025c5f8e4 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3144,7 +3144,8 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, TileDataEnc *tile_data, for (ref_frame = LAST_FRAME; ref_frame <= ALTREF_FRAME; ++ref_frame) { x->pred_mv_sad[ref_frame] = INT_MAX; - if (cpi->ref_frame_flags & flag_list[ref_frame]) { + if ((cpi->ref_frame_flags & flag_list[ref_frame]) && + !(is_rect_partition && (ctx->skip_ref_frame_mask & (1 << ref_frame)))) { assert(get_ref_frame_buffer(cpi, ref_frame) != NULL); setup_buffer_inter(cpi, x, ref_frame, bsize, mi_row, mi_col, frame_mv[NEARESTMV], frame_mv[NEARMV], yv12_mb); |