From: Bradley Sepos <bradley@bradleysepos.com>
Date: Thu, 11 Jan 2018 04:58:02 +0000 (-0500)
Subject: libhb: Allow NLMeans prefilter passthru when strength is 0 (zero).
X-Git-Tag: 1.1.0~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bd2b8e50ca2e8e0b52580714b54dbca33b809a5;p=handbrake

libhb: Allow NLMeans prefilter passthru when strength is 0 (zero).
---

diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c
index 19bd99e5a..d5dd4a2c1 100644
--- a/libhb/nlmeans.c
+++ b/libhb/nlmeans.c
@@ -1109,16 +1109,16 @@ static void nlmeans_filter_thread(void *thread_args_v)
 
         for (int c = 0; c < 3; c++)
         {
-            if (pv->strength[c] == 0)
+            if (pv->prefilter[c] & NLMEANS_PREFILTER_MODE_PASSTHRU)
             {
+                nlmeans_prefilter(&frame->plane[c], pv->prefilter[c]);
                 nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
                                  buf->plane[c].width, buf->plane[c].stride,
                                  buf->plane[c].height);
                 continue;
             }
-            if (pv->prefilter[c] & NLMEANS_PREFILTER_MODE_PASSTHRU)
+            if (pv->strength[c] == 0)
             {
-                nlmeans_prefilter(&frame->plane[c], pv->prefilter[c]);
                 nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
                                  buf->plane[c].width, buf->plane[c].stride,
                                  buf->plane[c].height);
@@ -1240,16 +1240,16 @@ static hb_buffer_t * nlmeans_filter_flush(hb_filter_private_t *pv)
 
         for (int c = 0; c < 3; c++)
         {
-            if (pv->strength[c] == 0)
+            if (pv->prefilter[c] & NLMEANS_PREFILTER_MODE_PASSTHRU)
             {
+                nlmeans_prefilter(&frame->plane[c], pv->prefilter[c]);
                 nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
                                  buf->plane[c].width, buf->plane[c].stride,
                                  buf->plane[c].height);
                 continue;
             }
-            if (pv->prefilter[c] & NLMEANS_PREFILTER_MODE_PASSTHRU)
+            if (pv->strength[c] == 0)
             {
-                nlmeans_prefilter(&frame->plane[c], pv->prefilter[c]);
                 nlmeans_deborder(&frame->plane[c], buf->plane[c].data,
                                  buf->plane[c].width, buf->plane[c].stride,
                                  buf->plane[c].height);