diff options
| author | Marco Paniconi <marpan@google.com> | 2015-12-04 00:24:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-04 00:24:49 +0000 |
| commit | 6202ce5ada148f6a4de393d5f943b064669d5dff (patch) | |
| tree | fddc254c5301e57da051a1e30588fa33e0854ea1 | |
| parent | b38a7cd1696e9e22a16a444fcb5f1e1c47536b70 (diff) | |
| parent | b12e353424cdb71b0b5807931508ca167bbdc71b (diff) | |
| download | libvpx-6202ce5ada148f6a4de393d5f943b064669d5dff.tar libvpx-6202ce5ada148f6a4de393d5f943b064669d5dff.tar.gz libvpx-6202ce5ada148f6a4de393d5f943b064669d5dff.tar.bz2 libvpx-6202ce5ada148f6a4de393d5f943b064669d5dff.zip | |
Merge "vp9-noise estimate: Move level setting to a function."
| -rw-r--r-- | vp9/encoder/vp9_noise_estimate.c | 26 | ||||
| -rw-r--r-- | vp9/encoder/vp9_noise_estimate.h | 2 |
2 files changed, 18 insertions, 10 deletions
diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c index b26f6f217..4befbb066 100644 --- a/vp9/encoder/vp9_noise_estimate.c +++ b/vp9/encoder/vp9_noise_estimate.c @@ -82,6 +82,21 @@ static void copy_frame(YV12_BUFFER_CONFIG * const dest, } } +NOISE_LEVEL vp9_noise_estimate_extract_level(NOISE_ESTIMATE *const ne) { + int noise_level = kLowLow; + if (ne->value > (ne->thresh << 1)) { + noise_level = kHigh; + } else { + if (ne->value > ne->thresh) + noise_level = kMedium; + else if (ne->value > (ne->thresh >> 1)) + noise_level = kLow; + else + noise_level = kLowLow; + } + return noise_level; +} + void vp9_update_noise_estimate(VP9_COMP *const cpi) { const VP9_COMMON *const cm = &cpi->common; CYCLIC_REFRESH *const cr = cpi->cyclic_refresh; @@ -220,16 +235,7 @@ void vp9_update_noise_estimate(VP9_COMP *const cpi) { // Reset counter and check noise level condition. ne->num_frames_estimate = 30; ne->count = 0; - if (ne->value > (ne->thresh << 1)) { - ne->level = kHigh; - } else { - if (ne->value > ne->thresh) - ne->level = kMedium; - else if (ne->value > (ne->thresh >> 1)) - ne->level = kLow; - else - ne->level = kLowLow; - } + ne->level = vp9_noise_estimate_extract_level(ne); #if CONFIG_VP9_TEMPORAL_DENOISING if (cpi->oxcf.noise_sensitivity > 0) vp9_denoiser_set_noise_level(&cpi->denoiser, ne->level); diff --git a/vp9/encoder/vp9_noise_estimate.h b/vp9/encoder/vp9_noise_estimate.h index 0d22ef042..826d125b5 100644 --- a/vp9/encoder/vp9_noise_estimate.h +++ b/vp9/encoder/vp9_noise_estimate.h @@ -47,6 +47,8 @@ void vp9_noise_estimate_init(NOISE_ESTIMATE *const ne, int width, int height); +NOISE_LEVEL vp9_noise_estimate_extract_level(NOISE_ESTIMATE *const ne); + void vp9_update_noise_estimate(struct VP9_COMP *const cpi); #ifdef __cplusplus |