diff options
| author | Jingning Han <jingning@google.com> | 2015-03-19 09:18:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-19 09:18:10 -0700 |
| commit | 067fc49996c4fb1f7f0a6dddaf4e74a8561350e0 (patch) | |
| tree | 58ce15622d203c6fda7d7e5cecb079e593462952 /vp9 | |
| parent | 411bbce47023278eeac998cb4d96af0125efc23b (diff) | |
| parent | 83cbe226231b1affa2826cd6b88aef51578d47b8 (diff) | |
| download | libvpx-067fc49996c4fb1f7f0a6dddaf4e74a8561350e0.tar libvpx-067fc49996c4fb1f7f0a6dddaf4e74a8561350e0.tar.gz libvpx-067fc49996c4fb1f7f0a6dddaf4e74a8561350e0.tar.bz2 libvpx-067fc49996c4fb1f7f0a6dddaf4e74a8561350e0.zip | |
Merge "Speed up non-rd mode decision search"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index a96a97453..6dfb9eedd 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -681,6 +681,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, int reuse_inter_pred = cpi->sf.reuse_inter_pred_sby && ctx->pred_pixel_ready; int ref_frame_skip_mask = 0; int idx; + int best_pred_sad = INT_MAX; if (reuse_inter_pred) { int i; @@ -811,8 +812,11 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, continue; tmp_sad = vp9_int_pro_motion_estimation(cpi, x, bsize); + if (tmp_sad > x->pred_mv_sad[LAST_FRAME]) continue; + if (tmp_sad + (num_pels_log2_lookup[bsize] << 4) > best_pred_sad) + continue; frame_mv[NEWMV][ref_frame].as_int = mbmi->mv[0].as_int; rate_mv = vp9_mv_bit_cost(&frame_mv[NEWMV][ref_frame].as_mv, @@ -837,6 +841,17 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, } } + if (this_mode == NEWMV && ref_frame == LAST_FRAME && + frame_mv[NEWMV][LAST_FRAME].as_int != INVALID_MV) { + const int pre_stride = xd->plane[0].pre[0].stride; + const uint8_t * const pre_buf = xd->plane[0].pre[0].buf + + (frame_mv[NEWMV][LAST_FRAME].as_mv.row >> 3) * pre_stride + + (frame_mv[NEWMV][LAST_FRAME].as_mv.col >> 3); + best_pred_sad = cpi->fn_ptr[bsize].sdf(x->plane[0].src.buf, + x->plane[0].src.stride, + pre_buf, pre_stride); + } + if (this_mode != NEARESTMV && frame_mv[this_mode][ref_frame].as_int == frame_mv[NEARESTMV][ref_frame].as_int) |