diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-07-10 16:39:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-10 16:39:48 -0700 |
| commit | 32655853266a7bc975f825a00df96d40f9e85658 (patch) | |
| tree | 53bc44f0ae1e6033e390ae6dd138e4e40a06a37b | |
| parent | f3544f079b4fd62694216374432d91437f06c8a1 (diff) | |
| parent | 87cf002e9d8c3cb343dca706477adbefd14d0f83 (diff) | |
| download | libvpx-32655853266a7bc975f825a00df96d40f9e85658.tar libvpx-32655853266a7bc975f825a00df96d40f9e85658.tar.gz libvpx-32655853266a7bc975f825a00df96d40f9e85658.tar.bz2 libvpx-32655853266a7bc975f825a00df96d40f9e85658.zip | |
Merge "Minor cleanup"
| -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 c915e5c07..b2ab714e3 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; |