diff options
| author | Marco Paniconi <marpan@google.com> | 2017-12-06 19:18:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-06 19:18:51 +0000 |
| commit | 575c1933ea52314b9c17770a4ed7032dcd477ec3 (patch) | |
| tree | 664a518686b7a243398e25ca02f18fdeb4087914 | |
| parent | 2e44f164435a5d53b0a89a27d07c09bdd32f242c (diff) | |
| parent | 33953f310eb6a2019d25af2b9cb8382182740410 (diff) | |
| download | libvpx-575c1933ea52314b9c17770a4ed7032dcd477ec3.tar libvpx-575c1933ea52314b9c17770a4ed7032dcd477ec3.tar.gz libvpx-575c1933ea52314b9c17770a4ed7032dcd477ec3.tar.bz2 libvpx-575c1933ea52314b9c17770a4ed7032dcd477ec3.zip | |
Merge "vp9: Nonrd-pickmode: move some early exits up."
| -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 198852d0e..f2f323a28 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1696,6 +1696,9 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, comp_pred = 1; } + if (ref_frame > usable_ref_frame) continue; + if (skip_ref_find_pred[ref_frame]) continue; + if (flag_svc_subpel && ref_frame == GOLDEN_FRAME) { force_gf_mv = 1; // Only test mode if NEARESTMV/NEARMV is (svc_mv_col, svc_mv_row), @@ -1719,9 +1722,6 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, if (segfeature_active(seg, mi->segment_id, SEG_LVL_REF_FRAME)) continue; } - if (ref_frame > usable_ref_frame) continue; - if (skip_ref_find_pred[ref_frame]) continue; - // For SVC, skip the golden (spatial) reference search if sse of zeromv_last // is below threshold. if (cpi->use_svc && ref_frame == GOLDEN_FRAME && |