From e15fedb9258251bbb07def57e49e2bd1e0c4c538 Mon Sep 17 00:00:00 2001 From: jackychen Date: Mon, 14 Dec 2015 14:45:28 -0800 Subject: [PATCH] Add "unknown" status for noise estimation. Change-Id: I0fe95332ccfa2e1ad2a01a8e7ddd631289e0f8eb --- vp9/encoder/vp9_encodeframe.c | 2 +- vp9/encoder/vp9_noise_estimate.c | 4 ++-- vp9/encoder/vp9_noise_estimate.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1606b16a2..89f2bd9b8 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -496,7 +496,7 @@ static void set_vbp_thresholds(VP9_COMP *cpi, int64_t thresholds[], int q) { 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) { diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c index 4befbb066..6e717e53c 100644 --- a/vp9/encoder/vp9_noise_estimate.c +++ b/vp9/encoder/vp9_noise_estimate.c @@ -25,7 +25,7 @@ void vp9_noise_estimate_init(NOISE_ESTIMATE *const ne, 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 @@ static void copy_frame(YV12_BUFFER_CONFIG * const dest, } 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 { diff --git a/vp9/encoder/vp9_noise_estimate.h b/vp9/encoder/vp9_noise_estimate.h index 826d125b5..266326286 100644 --- a/vp9/encoder/vp9_noise_estimate.h +++ b/vp9/encoder/vp9_noise_estimate.h @@ -24,6 +24,7 @@ extern "C" { #endif typedef enum noise_level { + kUnknown, kLowLow, kLow, kMedium, -- 2.40.0