commit ef30616a306028df8e0b62a0a969be5adc26969c
author Marco Paniconi <marpan@google.com> Wed Apr 10 03:56:04 2019
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 10 03:56:04 2019
tree beac58f7dafdb9e9e19a01c999638ada513e41b4
parent 32d633ba17aa5ceb8cb12fa2c665747239b3593a
parent da3b24c83272773ba8bf1060bae905543ef3bb91

Merge "vp9-rtc: Fix to rate cost for switchable filter"

vp9/encoder/vp9_noise_estimate.c

diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c
index 2ed192a..9696529 100644
--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -46,6 +46,7 @@
     ne->thresh = 115;
   }
   ne->num_frames_estimate = 15;
+  ne->adapt_thresh = (3 * ne->thresh) >> 1;
 }
 
 static int enable_noise_estimation(VP9_COMP *const cpi) {
@@ -277,7 +278,12 @@
 
     // Scale by 40 to work with existing thresholds
     ne->value = (int)((3 * ne->value + max_bin * 40) >> 2);
-    ne->count++;
+    // Quickly increase VNR strength when the noise level increases suddenly.
+    if (ne->level < kMedium && ne->value > ne->adapt_thresh) {
+      ne->count = ne->num_frames_estimate;
+    } else {
+      ne->count++;
+    }
     if (ne->count == ne->num_frames_estimate) {
       // Reset counter and check noise level condition.
       ne->num_frames_estimate = 30;

vp9/encoder/vp9_noise_estimate.h

diff --git a/vp9/encoder/vp9_noise_estimate.h b/vp9/encoder/vp9_noise_estimate.h
index e30ad31..7fc94ff 100644
--- a/vp9/encoder/vp9_noise_estimate.h
+++ b/vp9/encoder/vp9_noise_estimate.h
@@ -32,6 +32,7 @@
   NOISE_LEVEL level;
   int value;
   int thresh;
+  int adapt_thresh;
   int count;
   int last_w;
   int last_h;