diff options
| author | Marco Paniconi <marpan@google.com> | 2018-06-28 05:33:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-28 05:33:59 +0000 |
| commit | ed4a7d58805f760219592065c22bcd57219324e5 (patch) | |
| tree | 4913cf791c478ed7b7a011f2d2554f5d2582989e /vp9/encoder | |
| parent | 2916a49c879c2bd228df1ac755ed9092d1cd9067 (diff) | |
| parent | 2899a9d438ce5243936428baf4b6f4f1e63faae8 (diff) | |
| download | libvpx-ed4a7d58805f760219592065c22bcd57219324e5.tar libvpx-ed4a7d58805f760219592065c22bcd57219324e5.tar.gz libvpx-ed4a7d58805f760219592065c22bcd57219324e5.tar.bz2 libvpx-ed4a7d58805f760219592065c22bcd57219324e5.zip | |
Merge "vp9-svc: Fix to early golden exit nonrd-pickmode"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index eb9abf729..1761fa95d 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1541,8 +1541,10 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, if (!cpi->use_svc || (svc->use_gf_temporal_ref_current_layer && - !svc->layer_context[svc->temporal_layer_id].is_key_frame)) + !svc->layer_context[svc->temporal_layer_id].is_key_frame)) { gf_temporal_ref = 1; + thresh_svc_skip_golden = 500; + } init_ref_frame_cost(cm, xd, ref_frame_cost); memset(&mode_checked[0][0], 0, MB_MODE_COUNT * MAX_REF_FRAMES); @@ -1796,7 +1798,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, // For SVC, skip the golden (spatial) reference search if sse of zeromv_last // is below threshold. - if (cpi->use_svc && ref_frame == GOLDEN_FRAME && !gf_temporal_ref && + if (cpi->use_svc && ref_frame == GOLDEN_FRAME && sse_zeromv_normalized < thresh_svc_skip_golden) continue; |