From 5f041c01ed169f21dfd0a34b119e5ee30f31be81 Mon Sep 17 00:00:00 2001
From: Marco <marpan@google.com>
Date: Fri, 6 Nov 2015 08:33:41 -0800
Subject: [PATCH] vp9: Disable noise estimate on resize trigger frame.

Change-Id: I35767a6320943582ee11d737b5f240cea2d01b25
---
 vp9/encoder/vp9_noise_estimate.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vp9/encoder/vp9_noise_estimate.c b/vp9/encoder/vp9_noise_estimate.c
index 7bad344..8ba7de7 100644
--- a/vp9/encoder/vp9_noise_estimate.c
+++ b/vp9/encoder/vp9_noise_estimate.c
@@ -53,6 +53,7 @@ int enable_noise_estimation(VP9_COMP *const cpi) {
       cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ &&
       cpi->oxcf.speed >= 5 &&
       cpi->resize_state == ORIG &&
+      cpi->resize_pending == 0 &&
       !cpi->use_svc &&
       cpi->oxcf.content != VP9E_CONTENT_SCREEN &&
       cpi->common.width >= 640 &&
-- 
2.7.4