ref: 786b124e201edd1796626f795be73ff71ec22d97
parent: 80992a746cab8db32ba9093d24aec420346cb84b
parent: 8d438dc3134e4bc7f9e1487020b9c755eaf336c9
author: Marco Paniconi <marpan@google.com>
date: Wed Sep 27 16:42:48 EDT 2017
Merge "Revert "Remove the speed condition on scene detection in 1 pass code.""
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3524,9 +3524,12 @@
vp9_update_noise_estimate(cpi);
// Scene detection is always used for VBR mode or screen-content case.
+ // For other cases (e.g., CBR mode) use it for 5 <= speed < 8 for now
+ // (need to check encoding time cost for doing this for speed 8).
if (cpi->compute_source_sad_onepass &&
(cpi->oxcf.rc_mode == VPX_VBR ||
- cpi->oxcf.content == VP9E_CONTENT_SCREEN))
+ cpi->oxcf.content == VP9E_CONTENT_SCREEN ||
+ (cpi->oxcf.speed >= 5 && cpi->oxcf.speed < 8)))
vp9_scene_detection_onepass(cpi);
// For 1 pass CBR SVC, only ZEROMV is allowed for spatial reference frame