ref: 2aacb19ca1da664a1b3e288234ad549ddb6e01db
parent: c076467e8dfff4971227bb618cc60f6bfdb5ed20
parent: 80519937e30eb3c81c4a91581db72785270aca9c
author: Marco Paniconi <marpan@google.com>
date: Thu Nov 29 02:57:44 EST 2018
Merge "vp9: Fix condition for disabling noise estimation"
--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -148,7 +148,9 @@
ne->last_h = cm->height;
}
return;
- } else if (cm->current_video_frame > 60 &&
+ } else if (frame_counter > 60 &&
+ cpi->rc.frames_since_key > cpi->svc.number_spatial_layers &&
+ cpi->svc.spatial_layer_id == cpi->svc.number_spatial_layers - 1 &&
cpi->rc.avg_frame_low_motion < (low_res ? 70 : 50)) {
// Force noise estimation to 0 and denoiser off if content has high motion.
ne->level = kLowLow;