diff options
| author | Marco <marpan@google.com> | 2016-11-22 10:10:06 -0800 |
|---|---|---|
| committer | Marco <marpan@google.com> | 2016-11-22 14:54:28 -0800 |
| commit | b6597745f9dcec807b225b67e8069d5a3287e46e (patch) | |
| tree | 92a928294037962980a38113bdd0042748d75101 /vp9/encoder/vp9_pickmode.c | |
| parent | 0966757874c4555d0e781362389711dfe6e9aec7 (diff) | |
| download | libvpx-b6597745f9dcec807b225b67e8069d5a3287e46e.tar libvpx-b6597745f9dcec807b225b67e8069d5a3287e46e.tar.gz libvpx-b6597745f9dcec807b225b67e8069d5a3287e46e.tar.bz2 libvpx-b6597745f9dcec807b225b67e8069d5a3287e46e.zip | |
vp9: Use more aggressive skip when short_circuit_low_temp_var = 1.
Use the same feature as https://chromium-review.googlesource.com/#/c/411327/,
but allow it to be used for speed = 6 and 7, where
short_circuit_low_temp_var = 1.
Speed up of ~2-3% for speed 7, with little/no loss in compression.
Change-Id: I263a0f261ad9929034392d68f0153dc6376fdb5f
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 8b84c3825..be8c5732f 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -1490,8 +1490,11 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, TileDataEnc *tile_data, if (cpi->sf.short_circuit_low_temp_var) { force_skip_low_temp_var = get_force_skip_low_temp_var(&x->variance_low[0], mi_row, mi_col, bsize); - // In the most aggresive short circuit, skip golden in any mode - if (cpi->sf.short_circuit_low_temp_var == 3 && force_skip_low_temp_var) { + // If force_skip_low_temp_var is set, and for short circuit mode = 1 and 3, + // skip golden reference. + if ((cpi->sf.short_circuit_low_temp_var == 1 || + cpi->sf.short_circuit_low_temp_var == 3) && + force_skip_low_temp_var) { usable_ref_frame = LAST_FRAME; } } |