From fc83fcb7c405ec9369c9f6ea2c83339d74fa034e Mon Sep 17 00:00:00 2001
From: Marco <marpan@google.com>
Date: Wed, 29 Mar 2017 14:01:57 -0700
Subject: [PATCH] vp9: SVC: fix to allow output of denoised result.

Change-Id: Iaf55cfb5e9621d074eb33d6a32f184e4777968f8
---
 vp9/encoder/vp9_denoiser.c | 2 ++
 vp9/encoder/vp9_encoder.c  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c
index 592a68274..b0cbfa932 100644
--- a/vp9/encoder/vp9_denoiser.c
+++ b/vp9/encoder/vp9_denoiser.c
@@ -21,6 +21,8 @@
 #include "vp9/encoder/vp9_denoiser.h"
 #include "vp9/encoder/vp9_encoder.h"
 
+// OUTPUT_YUV_DENOISED
+
 #ifdef OUTPUT_YUV_DENOISED
 static void make_grayscale(YV12_BUFFER_CONFIG *yuv);
 #endif
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index c891957a3..48de1aeb6 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -4052,7 +4052,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, size_t *size,
 
 #if CONFIG_VP9_TEMPORAL_DENOISING
 #ifdef OUTPUT_YUV_DENOISED
-  if (oxcf->noise_sensitivity > 0) {
+  if (oxcf->noise_sensitivity > 0 && denoise_svc(cpi)) {
     vp9_write_yuv_frame_420(&cpi->denoiser.running_avg_y[INTRA_FRAME],
                             yuv_denoised_file);
   }