shithub: libvpx

Download patch

ref: b7654afb6baba32d9dcafed558cb20575e692ae5
parent: c0c0edd9d73b4d953d539669123706ee97468e89
parent: e15fedb9258251bbb07def57e49e2bd1e0c4c538
author: Jacky Chen <jackychen@google.com>
date: Mon Dec 14 19:41:23 EST 2015 

Merge "Add "unknown" status for noise estimation."


--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -496,7 +496,7 @@
         threshold_base = 3 * threshold_base;
       else if (noise_level == kMedium)
         threshold_base = threshold_base << 1;
-      else if (noise_level < kLow)
+      else if (noise_level == kLowLow)
         threshold_base = (7 * threshold_base) >> 3;
     }
     if (cm->width <= 352 && cm->height <= 288) {
--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -25,7 +25,7 @@
                              int width,
                              int height) {
   ne->enabled = 0;
-  ne->level = kLowLow;
+  ne->level = kUnknown;
   ne->value = 0;
   ne->count = 0;
   ne->thresh = 90;
@@ -83,7 +83,7 @@
 }
 
 NOISE_LEVEL vp9_noise_estimate_extract_level(NOISE_ESTIMATE *const ne) {
-  int noise_level = kLowLow;
+  int noise_level = kUnknown;
   if (ne->value > (ne->thresh << 1)) {
     noise_level = kHigh;
   } else {
--- a/vp9/encoder/vp9_noise_estimate.h
+++ b/vp9/encoder/vp9_noise_estimate.h
@@ -24,6 +24,7 @@
 #endif
 
 typedef enum noise_level {
+  kUnknown,
   kLowLow,
   kLow,
   kMedium,
-- 
⑨