diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-07-09 15:42:10 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2014-07-09 15:42:10 -0700 |
| commit | 87cf002e9d8c3cb343dca706477adbefd14d0f83 (patch) | |
| tree | a7564a42f6013268da889f1ca611743020a43c32 /vp9/encoder/vp9_pickmode.c | |
| parent | a51e389b426d69f920dad77f4a30a6ff5187306c (diff) | |
| download | libvpx-87cf002e9d8c3cb343dca706477adbefd14d0f83.tar libvpx-87cf002e9d8c3cb343dca706477adbefd14d0f83.tar.gz libvpx-87cf002e9d8c3cb343dca706477adbefd14d0f83.tar.bz2 libvpx-87cf002e9d8c3cb343dca706477adbefd14d0f83.zip | |
Minor cleanup
Change-Id: I3a3ceeeed489f8b1ccd7199ff97f3fb991bbf5a4
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index a29368af1..84640414d 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -127,6 +127,10 @@ static int combined_motion_search(VP9_COMP *cpi, MACROBLOCK *x, int rv = 0; const YV12_BUFFER_CONFIG *scaled_ref_frame = vp9_get_scaled_ref_frame(cpi, ref); + if (cpi->common.show_frame && + (x->pred_mv_sad[ref] >> 3) > x->pred_mv_sad[LAST_FRAME]) + return rv; + if (scaled_ref_frame) { int i; // Swap out the reference frame for a version that's been scaled to @@ -138,16 +142,6 @@ static int combined_motion_search(VP9_COMP *cpi, MACROBLOCK *x, } vp9_set_mv_search_range(x, &ref_mv); - if (cpi->common.show_frame && - (x->pred_mv_sad[ref] >> 3) > x->pred_mv_sad[LAST_FRAME]) { - tmp_mv->as_int = INVALID_MV; - if (scaled_ref_frame) { - int i; - for (i = 0; i < MAX_MB_PLANE; i++) - xd->plane[i].pre[0] = backup_yv12[i]; - } - return rv; - } assert(x->mv_best_ref_index[ref] <= 2); if (x->mv_best_ref_index[ref] < 2) mvp_full = mbmi->ref_mvs[ref][x->mv_best_ref_index[ref]].as_mv; |