ref: 71f5314993ff0ff02ae827f69acc8c34837f2e65
parent: b106abe570a5dcef13805593873d5c0e1350453b
parent: 1a5482d4d856feacd7bf5a6385f72051675f93a7
author: Marco Paniconi <marpan@google.com>
date: Tue Feb 7 17:24:59 EST 2017
Merge "vp9: Denoiser speed-up: increase partition and ac skip thresholds."
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -564,6 +564,25 @@
denoiser->prev_denoising_level = denoiser->denoising_level;
}
+// Scale/increase the partition threshold for denoiser speed-up.
+int64_t vp9_scale_part_thresh(int64_t threshold,
+ VP9_DENOISER_LEVEL noise_level) {+ if (noise_level >= kDenLow)
+ return ((5 * threshold) >> 2);
+ else
+ return threshold;
+}
+
+// Scale/increase the ac skip threshold for denoiser speed-up.
+int64_t vp9_scale_acskip_thresh(int64_t threshold,
+ VP9_DENOISER_LEVEL noise_level,
+ int abs_sumdiff) {+ if (noise_level >= kDenLow && abs_sumdiff < 5)
+ return threshold *= (noise_level == kDenLow) ? 2 : 6;
+ else
+ return threshold;
+}
+
#ifdef OUTPUT_YUV_DENOISED
static void make_grayscale(YV12_BUFFER_CONFIG *yuv) {int r, c;
--- a/vp9/encoder/vp9_denoiser.h
+++ b/vp9/encoder/vp9_denoiser.h
@@ -97,6 +97,13 @@
void vp9_denoiser_set_noise_level(VP9_DENOISER *denoiser, int noise_level);
+int64_t vp9_scale_part_thresh(int64_t threshold,
+ VP9_DENOISER_LEVEL noise_level);
+
+int64_t vp9_scale_acskip_thresh(int64_t threshold,
+ VP9_DENOISER_LEVEL noise_level,
+ int abs_sumdiff);
+
#ifdef __cplusplus
} // extern "C"
#endif
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -488,8 +488,16 @@
else if (noise_level < kLow)
threshold_base = (7 * threshold_base) >> 3;
}
+#if CONFIG_VP9_TEMPORAL_DENOISING
+ if (cpi->oxcf.noise_sensitivity > 0)
+ threshold_base =
+ vp9_scale_part_thresh(threshold_base, cpi->denoiser.denoising_level);
+ else if (cpi->oxcf.speed >= 8 && cm->width <= 640 && cm->height <= 480)
+ threshold_base = (5 * threshold_base) >> 2;
+#else
if (cpi->oxcf.speed >= 8 && cm->width <= 640 && cm->height <= 480)
threshold_base = (5 * threshold_base) >> 2;
+#endif
thresholds[0] = threshold_base;
thresholds[2] = threshold_base << cpi->oxcf.speed;
if (cm->width <= 352 && cm->height <= 288) {--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -353,8 +353,17 @@
*var_y = var;
*sse_y = sse;
+#if CONFIG_VP9_TEMPORAL_DENOISING
+ if (cpi->oxcf.noise_sensitivity > 0)
+ ac_thr = vp9_scale_acskip_thresh(ac_thr, cpi->denoiser.denoising_level,
+ (abs(sum) >> (bw + bh)));
+ else
+ ac_thr *= ac_thr_factor(cpi->oxcf.speed, cpi->common.width,
+ cpi->common.height, abs(sum) >> (bw + bh));
+#else
ac_thr *= ac_thr_factor(cpi->oxcf.speed, cpi->common.width,
cpi->common.height, abs(sum) >> (bw + bh));
+#endif
if (cpi->common.tx_mode == TX_MODE_SELECT) {if (sse > (var << 2))