From 19d143912af79554401bc284e6de0e08feba2459 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Thu, 19 Jan 2017 23:49:01 +1100
Subject: [PATCH] Squeeze a couple more ms out of png encode

---
 src/ImageSharp.Formats.Png/PngEncoderCore.cs | 29 ++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/ImageSharp.Formats.Png/PngEncoderCore.cs b/src/ImageSharp.Formats.Png/PngEncoderCore.cs
index 609556b454..2ab42623d1 100644
--- a/src/ImageSharp.Formats.Png/PngEncoderCore.cs
+++ b/src/ImageSharp.Formats.Png/PngEncoderCore.cs
@@ -362,42 +362,43 @@ namespace ImageSharp.Formats
         private byte[] GetOptimalFilteredScanline(byte[] rawScanline, byte[] previousScanline, byte[] result)
         {
             // Palette images don't compress well with adaptive filtering.
-            if (this.PngColorType == PngColorType.Palette)
+            if (this.PngColorType == PngColorType.Palette || this.bitDepth < 8)
             {
                 NoneFilter.Encode(rawScanline, result);
                 return result;
             }
 
-            SubFilter.Encode(rawScanline, this.sub, this.bytesPerPixel);
-            int currentSum = this.CalculateTotalVariation(this.sub, int.MaxValue);
+            // This order, while different to the enumerated order is more likely to produce a smaller sum
+            // early on which shaves a couple of milliseconds off the processing time.
+            UpFilter.Encode(rawScanline, previousScanline, this.up);
+            int currentSum = this.CalculateTotalVariation(this.up, int.MaxValue);
             int lowestSum = currentSum;
+            result = this.up;
 
-            result = this.sub;
-
-            UpFilter.Encode(rawScanline, previousScanline, this.up);
-            currentSum = this.CalculateTotalVariation(this.up, currentSum);
+            PaethFilter.Encode(rawScanline, previousScanline, this.paeth, this.bytesPerPixel);
+            currentSum = this.CalculateTotalVariation(this.paeth, currentSum);
 
             if (currentSum < lowestSum)
             {
                 lowestSum = currentSum;
-                result = this.up;
+                result = this.paeth;
             }
 
-            AverageFilter.Encode(rawScanline, previousScanline, this.average, this.bytesPerPixel);
-            currentSum = this.CalculateTotalVariation(this.average, currentSum);
+            SubFilter.Encode(rawScanline, this.sub, this.bytesPerPixel);
+            currentSum = this.CalculateTotalVariation(this.sub, int.MaxValue);
 
             if (currentSum < lowestSum)
             {
                 lowestSum = currentSum;
-                result = this.average;
+                result = this.sub;
             }
 
-            PaethFilter.Encode(rawScanline, previousScanline, this.paeth, this.bytesPerPixel);
-            currentSum = this.CalculateTotalVariation(this.paeth, currentSum);
+            AverageFilter.Encode(rawScanline, previousScanline, this.average, this.bytesPerPixel);
+            currentSum = this.CalculateTotalVariation(this.average, currentSum);
 
             if (currentSum < lowestSum)
             {
-                result = this.paeth;
+                result = this.average;
             }
 
             return result;