Commit 12084f6d authored by Marco Paniconi's avatar Marco Paniconi Committed by Gerrit Code Review

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

parents 93c0b879 f3e7539c
......@@ -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 == kLowLow)
else if (noise_level < kLow)
threshold_base = (7 * threshold_base) >> 3;
}
if (cm->width <= 352 && cm->height <= 288) {
......
......@@ -25,7 +25,7 @@ void vp9_noise_estimate_init(NOISE_ESTIMATE *const ne,
int width,
int height) {
ne->enabled = 0;
ne->level = kUnknown;
ne->level = kLowLow;
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 = kUnknown;
int noise_level = kLowLow;
if (ne->value > (ne->thresh << 1)) {
noise_level = kHigh;
} else {
......
......@@ -24,7 +24,6 @@ extern "C" {
#endif
typedef enum noise_level {
kUnknown,
kLowLow,
kLow,
kMedium,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment