commit dc2e97c900752c4305031a93a3b4755f2e59ff80
author Marco <marpan@google.com> Mon Feb 01 09:02:26 2016 -0800
committer Marco <marpan@google.com> Mon Feb 01 09:08:28 2016 -0800
tree 2d5d864370e7682bf351f8446b873e0b9b7980b4
parent 0a3593a55571e2ceca45fece9b7f7430a0cc3304

vp9-denoiser bugfix: Disable postproc-denoiser under temporal denoising.

The postproc vp9_denoise() is a spatial denoise/blur function.
It was not intended to be used if temporal denoising is enabled.

Change-Id: I97d2dcb941e7cc49bbafce99d9286beb2693249d

vp9/encoder/vp9_encoder.c

diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 8c64693..d4e17b8c 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3130,7 +3130,7 @@
   if (oxcf->pass == 2 && cpi->sf.static_segmentation)
     configure_static_seg_features(cpi);
 
-#if CONFIG_VP9_POSTPROC
+#if CONFIG_VP9_POSTPROC && !(CONFIG_VP9_TEMPORAL_DENOISING)
   if (oxcf->noise_sensitivity > 0) {
     int l = 0;
     switch (oxcf->noise_sensitivity) {