ref: b35f64241f0628987db592b5936dde58ca30b0db
parent: 58fe1bde59ada9eb25b510e7be2e43dda5a5ddf6
parent: 5de0e9ed082387c6d6251cc41e541e72a7fd93ba
author: Marco Paniconi <marpan@google.com>
date: Fri Apr 21 17:28:16 EDT 2017
Merge "vp9: SVC: fix condition for partition/skip threshold when denoising."
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -536,8 +536,8 @@
threshold_base = (7 * threshold_base) >> 3;
}
#if CONFIG_VP9_TEMPORAL_DENOISING
- if (cpi->oxcf.noise_sensitivity > 0 && cpi->oxcf.speed > 5 &&
- cpi->denoiser.denoising_level >= kDenLow)
+ if (cpi->oxcf.noise_sensitivity > 0 && denoise_svc(cpi) &&
+ cpi->oxcf.speed > 5 && cpi->denoiser.denoising_level >= kDenLow)
threshold_base = vp9_scale_part_thresh(
threshold_base, cpi->denoiser.denoising_level, content_state);
else
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -354,7 +354,8 @@
*sse_y = sse;
#if CONFIG_VP9_TEMPORAL_DENOISING
- if (cpi->oxcf.noise_sensitivity > 0 && cpi->oxcf.speed > 5)
+ if (cpi->oxcf.noise_sensitivity > 0 && denoise_svc(cpi) &&
+ cpi->oxcf.speed > 5)
ac_thr = vp9_scale_acskip_thresh(ac_thr, cpi->denoiser.denoising_level,
(abs(sum) >> (bw + bh)));
else
--
⑨