From: Bradley Sepos <bradley@bradleysepos.com>
Date: Tue, 9 Jan 2018 10:10:36 +0000 (-0500)
Subject: libhb: Better prioritize NLMeans prefilter order.
X-Git-Tag: 1.1.0~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cef41652f48517ea7183b213e39e8c259fed41e;p=handbrake

libhb: Better prioritize NLMeans prefilter order.
---

diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c
index dd1fe5b3e..2226ee919 100644
--- a/libhb/nlmeans.c
+++ b/libhb/nlmeans.c
@@ -612,7 +612,17 @@ static void nlmeans_prefilter(BorderedPlane *src,
         }
 
         // Filter plane; should already have at least 2px extra border on each side
-        if (filter_type & NLMEANS_PREFILTER_MODE_MEDIAN5X5)
+        if (filter_type & NLMEANS_PREFILTER_MODE_CSM3X3)
+        {
+            // CSM 3x3
+            nlmeans_filter_csm(image, image_pre, w, h, border, 3);
+        }
+        else if (filter_type & NLMEANS_PREFILTER_MODE_CSM5X5)
+        {
+            // CSM 5x5
+            nlmeans_filter_csm(image, image_pre, w, h, border, 5);
+        }
+        else if (filter_type & NLMEANS_PREFILTER_MODE_MEDIAN5X5)
         {
             // Median 5x5
             nlmeans_filter_median(image, image_pre, w, h, border, 5);
@@ -632,16 +642,6 @@ static void nlmeans_prefilter(BorderedPlane *src,
             // Mean 3x3
             nlmeans_filter_mean(image, image_pre, w, h, border, 3);
         }
-        else if (filter_type & NLMEANS_PREFILTER_MODE_CSM3X3)
-        {
-            // CSM 3x3
-            nlmeans_filter_csm(image, image_pre, w, h, border, 3);
-        }
-        else if (filter_type & NLMEANS_PREFILTER_MODE_CSM5X5)
-        {
-            // CSM 5x5
-            nlmeans_filter_csm(image, image_pre, w, h, border, 5);
-        }
 
         // Restore edges
         if (filter_type & NLMEANS_PREFILTER_MODE_EDGEBOOST)