From: Marco <marpan@google.com>
Date: Fri, 16 Dec 2016 19:15:57 +0000 (-0800)
Subject: vp9: Change condition to enable recheck_zeromv_after_denoising.
X-Git-Tag: v1.6.1~37^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4260a7f2b39c81ff4f39411d6ffe80504900b6da;p=libvpx

vp9: Change condition to enable recheck_zeromv_after_denoising.

For when denoising enabled: change condition to enable
the recheck_zeromv_after_denoising for only very high noise level.
This is causing an issue, so enabling it for very high noise
to effectively shut it off.

Change-Id: Ic40d6025f3f398338cedd270d17c0ccd9a3daa84
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index be8c5732f..fa4b3c310 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1235,7 +1235,7 @@ static void recheck_zeromv_after_denoising(
   // denoised result. Only do this under noise conditions, and if rdcost of
   // ZEROMV onoriginal source is not significantly higher than rdcost of best
   // mode.
-  if (cpi->noise_estimate.enabled && cpi->noise_estimate.level > kLow &&
+  if (cpi->noise_estimate.enabled && cpi->noise_estimate.level > kHigh &&
       ctx_den->zero_last_cost_orig < (best_rdc->rdcost << 3) &&
       ((ctx_den->best_ref_frame == INTRA_FRAME && decision >= FILTER_BLOCK) ||
        (ctx_den->best_ref_frame == GOLDEN_FRAME &&