]> granicus.if.org Git - handbrake/commitdiff
libhb: Reorder some code in nlmeans_prefilter for clarity.
authorBradley Sepos <bradley@bradleysepos.com>
Thu, 11 Jan 2018 04:55:00 +0000 (23:55 -0500)
committerBradley Sepos <bradley@bradleysepos.com>
Thu, 11 Jan 2018 04:55:00 +0000 (23:55 -0500)
libhb/nlmeans.c

index e6f8f1767ea17f348500a6b11dbf39ee963f6380..0ca0f4f6d7f2f0e6d089e6ebd6308ab54989f378 100644 (file)
@@ -686,22 +686,18 @@ static void nlmeans_prefilter(BorderedPlane *src,
             }
         }
 
+        // Recreate borders
+        nlmeans_border(mem_pre, w, h, border);
+
         // Assign result
+        src->mem_pre   = mem_pre;
+        src->image_pre = image_pre;
         if (filter_type & NLMEANS_PREFILTER_MODE_PASSTHRU)
         {
-            // No swap needed as nlmeans_alloc() set src->mem_pre == src->mem
-            src->mem   = mem_pre;
-            src->image = image_pre;
-        }
-        else
-        {
-            src->mem_pre   = mem_pre;
-            src->image_pre = image_pre;
+            src->mem   = src->mem_pre;
+            src->image = src->image_pre;
         }
 
-        // Recreate borders
-        nlmeans_border(mem_pre, w, h, border);
-
     }
     src->prefiltered = 1;
     hb_unlock(src->mutex);