From b8680799589b369b864023f10bf37c0f35549e3b Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Sat, 1 Jul 2017 13:34:50 +1000
Subject: [PATCH] Getting close with that lookup now.

---
 .../Jpeg/Port/Components/HuffmanTable.cs      |  6 +-
 .../Jpeg/Port/Components/ScanDecoder.cs       | 57 +++++++++++++------
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/ImageSharp/Formats/Jpeg/Port/Components/HuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/Port/Components/HuffmanTable.cs
index 0119f272cf..85bcb5dfe0 100644
--- a/src/ImageSharp/Formats/Jpeg/Port/Components/HuffmanTable.cs
+++ b/src/ImageSharp/Formats/Jpeg/Port/Components/HuffmanTable.cs
@@ -198,12 +198,12 @@ namespace ImageSharp.Formats.Jpeg.Port.Components
                     // whose codeLength's high bits matches code.
                     // The high 8 bits of lutValue are the encoded value.
                     // The low 8 bits are 1 plus the codeLength.
-                    int base2 = code << (7 - i);
-                    int lutValue = (this.huffval[x] << 8) | (2 + i);
+                    byte base2 = (byte)(code << (7 - i));
+                    short lutValue = (short)((short)(this.huffval[x] << 8) | (short)(2 + i));
 
                     for (int k = 0; k < 1 << (7 - i); k++)
                     {
-                        this.lookahead[base2 | k] = (short)lutValue;
+                        this.lookahead[base2 | k] = lutValue;
                     }
 
                     code++;
diff --git a/src/ImageSharp/Formats/Jpeg/Port/Components/ScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/Port/Components/ScanDecoder.cs
index 9648dde82b..19ffcd778f 100644
--- a/src/ImageSharp/Formats/Jpeg/Port/Components/ScanDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/Port/Components/ScanDecoder.cs
@@ -23,6 +23,8 @@ namespace ImageSharp.Formats.Jpeg.Port.Components
 
         private int bitsCount;
 
+        private int bitsUnRead;
+
         private int accumulator;
 
         private int specStart;
@@ -139,6 +141,8 @@ namespace ImageSharp.Formats.Jpeg.Port.Components
 
                 // Find marker
                 this.bitsCount = 0;
+                this.accumulator = 0;
+                this.bitsUnRead = 0;
                 fileMarker = JpegDecoderCore.FindNextFileMarker(this.markerBuffer, stream);
 
                 // Some bad images seem to pad Scan blocks with e.g. zero bytes, skip past
@@ -572,6 +576,7 @@ namespace ImageSharp.Formats.Jpeg.Port.Components
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private int ReadBit(Stream stream)
         {
+            // TODO: I wonder if we can do this two bytes at a time; libjpeg turbo seems to do that?
             if (this.bitsCount > 0)
             {
                 this.bitsCount--;
@@ -586,7 +591,7 @@ namespace ImageSharp.Formats.Jpeg.Port.Components
                 this.endOfStreamReached = true;
             }
 
-            if (this.bitsData == 0xFF)
+            if (this.bitsData == JpegConstants.Markers.Prefix)
             {
                 int nextByte = stream.ReadByte();
                 if (nextByte != 0)
@@ -605,33 +610,51 @@ namespace ImageSharp.Formats.Jpeg.Port.Components
 
             this.bitsCount = 7;
 
-            // TODO: This line is incorrect.
-            this.accumulator = (this.accumulator << 8) | this.bitsData;
-
             return this.bitsData >> 7;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private short DecodeHuffman(ref HuffmanTable tree, Stream stream)
         {
-            short code = (short)this.ReadBit(stream);
-            if (this.endOfStreamReached || this.unexpectedMarkerReached)
-            {
-                return -1;
-            }
+            short code = -1;
 
-            // TODO: If the following is enabled the decoder breaks.
-            // if (this.bitsCount > 0)
+            // TODO: Adding this code introduces error into the decoder.
+            // It doesn't appear to speed anything up either.
+            // if (this.bitsUnRead < 8)
             // {
-            //    int lutIndex = (this.accumulator >> (this.bitsCount - 7)) & 0xFF;
-            //    int v = tree.GetLookAhead(lutIndex);
-            //    if (v != 0)
-            //    {
-            //        return (short)(v >> 8);
-            //    }
+            //     if (this.bitsCount <= 0)
+            //     {
+            //         code = (short)this.ReadBit(stream);
+            //         this.bitsUnRead += 8;
+            //     }
+            //     if (this.endOfStreamReached || this.unexpectedMarkerReached)
+            //     {
+            //         return -1;
+            //     }
+            //     this.accumulator = (this.accumulator << 8) | this.bitsData;
+            //     int lutIndex = (this.accumulator >> (this.bitsUnRead - 8)) & 0xFF;
+            //     int v = tree.GetLookAhead(lutIndex);
+            //     if (v != 0)
+            //     {
+            //         int nb = (v & 0xFF) - 1;
+            //         this.bitsCount -= nb - 1;
+            //         this.bitsUnRead -= nb;
+            //         v = v >> 8;
+            //         return (short)v;
+            //     }
             // }
+            if (code == -1)
+            {
+                code = (short)this.ReadBit(stream);
+                if (this.endOfStreamReached || this.unexpectedMarkerReached)
+                {
+                    return -1;
+                }
+            }
+
             // "DECODE", section F.2.2.3, figure F.16, page 109 of T.81
             int i = 1;
+
             while (code > tree.GetMaxCode(i))
             {
                 code <<= 1;