ref: 299ef2f8ebad1c831097f1aedd3b0b477350de15
parent: 5b1a8ca5e846f838062becaec9ed6b5ecef306e5
parent: 198b834c977c335621e502b2a8b0621093577b61
author: Jerome Jiang <[email protected]>
date: Mon Jan 9 19:51:09 EST 2017
Merge "vp9: Set less aggresive short_circuit_low_temp_var for HD at speed 8."
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -521,6 +521,14 @@
content != VP9E_CONTENT_SCREEN) {
// More aggressive short circuit for speed 8.
sf->short_circuit_low_temp_var = 3;
+ // Use level 2 for noisey cases as there is a regression in some
+ // noisy clips with level 3.
+ if (cpi->noise_estimate.enabled && cm->width >= 1280 &&
+ cm->height >= 720) {
+ NOISE_LEVEL noise_level =
+ vp9_noise_estimate_extract_level(&cpi->noise_estimate);
+ if (noise_level >= kMedium) sf->short_circuit_low_temp_var = 2;
+ }
}
sf->limit_newmv_early_exit = 0;
}