Merge branch 'master' into encode-multiframe

Author: brianpopow

.gitignore

@@ -221,4 +221,5 @@ artifacts/
 # Tests
 **/Images/ActualOutput
 **/Images/ReferenceOutput
+**/Images/Input/MemoryStress
 .DS_Store

src/ImageSharp/Common/Extensions/StreamExtensions.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Buffers;
 using System.IO;
-using SixLabors.ImageSharp.Memory;
 
 namespace SixLabors.ImageSharp
 {

src/ImageSharp/Common/Helpers/DebugGuard.cs

@@ -37,7 +37,7 @@ public static void IsTrue(bool target, string message)
         /// <paramref name="target"/> has a different size than <paramref name="other"/>
         /// </exception>
         [Conditional("DEBUG")]
-        public static void MustBeSameSized<T>(Span<T> target, Span<T> other, string parameterName)
+        public static void MustBeSameSized<T>(ReadOnlySpan<T> target, ReadOnlySpan<T> other, string parameterName)
             where T : struct
         {
             if (target.Length != other.Length)
@@ -57,7 +57,7 @@ public static void MustBeSameSized<T>(Span<T> target, Span<T> other, string para
         /// <paramref name="target"/> has less items than <paramref name="minSpan"/>
         /// </exception>
         [Conditional("DEBUG")]
-        public static void MustBeSizedAtLeast<T>(Span<T> target, Span<T> minSpan, string parameterName)
+        public static void MustBeSizedAtLeast<T>(ReadOnlySpan<T> target, ReadOnlySpan<T> minSpan, string parameterName)
             where T : struct
         {
             if (target.Length < minSpan.Length)

src/ImageSharp/Common/Helpers/Numerics.cs

@@ -879,5 +879,13 @@ ref MemoryMarshal.GetReference(Log2DeBruijn),
                 (IntPtr)(int)((value * 0x07C4ACDDu) >> 27)); // uint|long -> IntPtr cast on 32-bit platforms does expensive overflow checks not needed here
         }
 #endif
+
+        /// <summary>
+        /// Fast division with ceiling for <see cref="uint"/> numbers.
+        /// </summary>
+        /// <param name="value">Divident value.</param>
+        /// <param name="divisor">Divisor value.</param>
+        /// <returns>Ceiled division result.</returns>
+        public static uint DivideCeil(uint value, uint divisor) => (value + divisor - 1) / divisor;
     }
 }

src/ImageSharp/Compression/Zlib/Deflater.cs

@@ -222,7 +222,7 @@ public void SetLevel(int level)
         /// The number of compressed bytes added to the output, or 0 if either
         /// <see cref="IsNeedingInput"/> or <see cref="IsFinished"/> returns true or length is zero.
         /// </returns>
-        public int Deflate(byte[] output, int offset, int length)
+        public int Deflate(Span<byte> output, int offset, int length)
         {
             int origLength = length;
 

src/ImageSharp/Compression/Zlib/DeflaterEngine.cs

@@ -130,9 +130,9 @@ internal sealed unsafe class DeflaterEngine : IDisposable
         /// This array contains the part of the uncompressed stream that
         /// is of relevance. The current character is indexed by strstart.
         /// </summary>
-        private IManagedByteBuffer windowMemoryOwner;
+        private IMemoryOwner<byte> windowMemoryOwner;
         private MemoryHandle windowMemoryHandle;
-        private readonly byte[] window;
+        private readonly Memory<byte> window;
         private readonly byte* pinnedWindowPointer;
 
         private int maxChain;
@@ -153,19 +153,19 @@ public DeflaterEngine(MemoryAllocator memoryAllocator, DeflateStrategy strategy)
 
             // Create pinned pointers to the various buffers to allow indexing
             // without bounds checks.
-            this.windowMemoryOwner = memoryAllocator.AllocateManagedByteBuffer(2 * DeflaterConstants.WSIZE);
-            this.window = this.windowMemoryOwner.Array;
-            this.windowMemoryHandle = this.windowMemoryOwner.Memory.Pin();
+            this.windowMemoryOwner = memoryAllocator.Allocate<byte>(2 * DeflaterConstants.WSIZE);
+            this.window = this.windowMemoryOwner.Memory;
+            this.windowMemoryHandle = this.window.Pin();
             this.pinnedWindowPointer = (byte*)this.windowMemoryHandle.Pointer;
 
             this.headMemoryOwner = memoryAllocator.Allocate<short>(DeflaterConstants.HASH_SIZE);
             this.head = this.headMemoryOwner.Memory;
-            this.headMemoryHandle = this.headMemoryOwner.Memory.Pin();
+            this.headMemoryHandle = this.head.Pin();
             this.pinnedHeadPointer = (short*)this.headMemoryHandle.Pointer;
 
             this.prevMemoryOwner = memoryAllocator.Allocate<short>(DeflaterConstants.WSIZE);
             this.prev = this.prevMemoryOwner.Memory;
-            this.prevMemoryHandle = this.prevMemoryOwner.Memory.Pin();
+            this.prevMemoryHandle = this.prev.Pin();
             this.pinnedPrevPointer = (short*)this.prevMemoryHandle.Pointer;
 
             // We start at index 1, to avoid an implementation deficiency, that
@@ -303,7 +303,7 @@ public void SetLevel(int level)
                     case DeflaterConstants.DEFLATE_STORED:
                         if (this.strstart > this.blockStart)
                         {
-                            this.huffman.FlushStoredBlock(this.window, this.blockStart, this.strstart - this.blockStart, false);
+                            this.huffman.FlushStoredBlock(this.window.Span, this.blockStart, this.strstart - this.blockStart, false);
                             this.blockStart = this.strstart;
                         }
 
@@ -313,7 +313,7 @@ public void SetLevel(int level)
                     case DeflaterConstants.DEFLATE_FAST:
                         if (this.strstart > this.blockStart)
                         {
-                            this.huffman.FlushBlock(this.window, this.blockStart, this.strstart - this.blockStart, false);
+                            this.huffman.FlushBlock(this.window.Span, this.blockStart, this.strstart - this.blockStart, false);
                             this.blockStart = this.strstart;
                         }
 
@@ -327,7 +327,7 @@ public void SetLevel(int level)
 
                         if (this.strstart > this.blockStart)
                         {
-                            this.huffman.FlushBlock(this.window, this.blockStart, this.strstart - this.blockStart, false);
+                            this.huffman.FlushBlock(this.window.Span, this.blockStart, this.strstart - this.blockStart, false);
                             this.blockStart = this.strstart;
                         }
 
@@ -362,7 +362,10 @@ public void FillWindow()
                     more = this.inputEnd - this.inputOff;
                 }
 
-                Buffer.BlockCopy(this.inputBuf, this.inputOff, this.window, this.strstart + this.lookahead, more);
+                Unsafe.CopyBlockUnaligned(
+                    ref this.window.Span[this.strstart + this.lookahead],
+                    ref this.inputBuf[this.inputOff],
+                    unchecked((uint)more));
 
                 this.inputOff += more;
                 this.lookahead += more;
@@ -426,7 +429,11 @@ private int InsertString()
 
         private void SlideWindow()
         {
-            Unsafe.CopyBlockUnaligned(ref this.window[0], ref this.window[DeflaterConstants.WSIZE], DeflaterConstants.WSIZE);
+            Unsafe.CopyBlockUnaligned(
+                ref this.window.Span[0],
+                ref this.window.Span[DeflaterConstants.WSIZE],
+                DeflaterConstants.WSIZE);
+
             this.matchStart -= DeflaterConstants.WSIZE;
             this.strstart -= DeflaterConstants.WSIZE;
             this.blockStart -= DeflaterConstants.WSIZE;
@@ -663,7 +670,7 @@ private bool DeflateStored(bool flush, bool finish)
                     lastBlock = false;
                 }
 
-                this.huffman.FlushStoredBlock(this.window, this.blockStart, storedLength, lastBlock);
+                this.huffman.FlushStoredBlock(this.window.Span, this.blockStart, storedLength, lastBlock);
                 this.blockStart += storedLength;
                 return !(lastBlock || storedLength == 0);
             }
@@ -683,7 +690,7 @@ private bool DeflateFast(bool flush, bool finish)
                 if (this.lookahead == 0)
                 {
                     // We are flushing everything
-                    this.huffman.FlushBlock(this.window, this.blockStart, this.strstart - this.blockStart, finish);
+                    this.huffman.FlushBlock(this.window.Span, this.blockStart, this.strstart - this.blockStart, finish);
                     this.blockStart = this.strstart;
                     return false;
                 }
@@ -743,7 +750,7 @@ private bool DeflateFast(bool flush, bool finish)
                 if (this.huffman.IsFull())
                 {
                     bool lastBlock = finish && (this.lookahead == 0);
-                    this.huffman.FlushBlock(this.window, this.blockStart, this.strstart - this.blockStart, lastBlock);
+                    this.huffman.FlushBlock(this.window.Span, this.blockStart, this.strstart - this.blockStart, lastBlock);
                     this.blockStart = this.strstart;
                     return !lastBlock;
                 }
@@ -771,7 +778,7 @@ private bool DeflateSlow(bool flush, bool finish)
                     this.prevAvailable = false;
 
                     // We are flushing everything
-                    this.huffman.FlushBlock(this.window, this.blockStart, this.strstart - this.blockStart, finish);
+                    this.huffman.FlushBlock(this.window.Span, this.blockStart, this.strstart - this.blockStart, finish);
                     this.blockStart = this.strstart;
                     return false;
                 }
@@ -846,7 +853,7 @@ private bool DeflateSlow(bool flush, bool finish)
                     }
 
                     bool lastBlock = finish && (this.lookahead == 0) && !this.prevAvailable;
-                    this.huffman.FlushBlock(this.window, this.blockStart, len, lastBlock);
+                    this.huffman.FlushBlock(this.window.Span, this.blockStart, len, lastBlock);
                     this.blockStart += len;
                     return !lastBlock;
                 }

src/ImageSharp/Compression/Zlib/DeflaterHuffman.cs

@@ -41,11 +41,11 @@ internal sealed unsafe class DeflaterHuffman : IDisposable
         private Tree blTree;
 
         // Buffer for distances
-        private readonly IMemoryOwner<short> distanceManagedBuffer;
+        private readonly IMemoryOwner<short> distanceMemoryOwner;
         private readonly short* pinnedDistanceBuffer;
         private MemoryHandle distanceBufferHandle;
 
-        private readonly IMemoryOwner<short> literalManagedBuffer;
+        private readonly IMemoryOwner<short> literalMemoryOwner;
         private readonly short* pinnedLiteralBuffer;
         private MemoryHandle literalBufferHandle;
 
@@ -65,12 +65,12 @@ public DeflaterHuffman(MemoryAllocator memoryAllocator)
             this.distTree = new Tree(memoryAllocator, DistanceNumber, 1, 15);
             this.blTree = new Tree(memoryAllocator, BitLengthNumber, 4, 7);
 
-            this.distanceManagedBuffer = memoryAllocator.Allocate<short>(BufferSize);
-            this.distanceBufferHandle = this.distanceManagedBuffer.Memory.Pin();
+            this.distanceMemoryOwner = memoryAllocator.Allocate<short>(BufferSize);
+            this.distanceBufferHandle = this.distanceMemoryOwner.Memory.Pin();
             this.pinnedDistanceBuffer = (short*)this.distanceBufferHandle.Pointer;
 
-            this.literalManagedBuffer = memoryAllocator.Allocate<short>(BufferSize);
-            this.literalBufferHandle = this.literalManagedBuffer.Memory.Pin();
+            this.literalMemoryOwner = memoryAllocator.Allocate<short>(BufferSize);
+            this.literalBufferHandle = this.literalMemoryOwner.Memory.Pin();
             this.pinnedLiteralBuffer = (short*)this.literalBufferHandle.Pointer;
         }
 
@@ -239,7 +239,7 @@ public void CompressBlock()
         /// <param name="storedLength">Count of bytes to write</param>
         /// <param name="lastBlock">True if this is the last block</param>
         [MethodImpl(InliningOptions.ShortMethod)]
-        public void FlushStoredBlock(byte[] stored, int storedOffset, int storedLength, bool lastBlock)
+        public void FlushStoredBlock(ReadOnlySpan<byte> stored, int storedOffset, int storedLength, bool lastBlock)
         {
             this.Pending.WriteBits((DeflaterConstants.STORED_BLOCK << 1) + (lastBlock ? 1 : 0), 3);
             this.Pending.AlignToByte();
@@ -256,7 +256,7 @@ public void FlushStoredBlock(byte[] stored, int storedOffset, int storedLength,
         /// <param name="storedOffset">Index of first byte to flush</param>
         /// <param name="storedLength">Count of bytes to flush</param>
         /// <param name="lastBlock">True if this is the last block</param>
-        public void FlushBlock(byte[] stored, int storedOffset, int storedLength, bool lastBlock)
+        public void FlushBlock(ReadOnlySpan<byte> stored, int storedOffset, int storedLength, bool lastBlock)
         {
             this.literalTree.Frequencies[EofSymbol]++;
 
@@ -286,13 +286,13 @@ public void FlushBlock(byte[] stored, int storedOffset, int storedLength, bool l
                 + this.extraBits;
 
             int static_len = this.extraBits;
-            ref byte staticLLengthRef = ref MemoryMarshal.GetReference<byte>(StaticLLength);
+            ref byte staticLLengthRef = ref MemoryMarshal.GetReference(StaticLLength);
             for (int i = 0; i < LiteralNumber; i++)
             {
                 static_len += this.literalTree.Frequencies[i] * Unsafe.Add(ref staticLLengthRef, i);
             }
 
-            ref byte staticDLengthRef = ref MemoryMarshal.GetReference<byte>(StaticDLength);
+            ref byte staticDLengthRef = ref MemoryMarshal.GetReference(StaticDLength);
             for (int i = 0; i < DistanceNumber; i++)
             {
                 static_len += this.distTree.Frequencies[i] * Unsafe.Add(ref staticDLengthRef, i);
@@ -419,9 +419,9 @@ public void Dispose()
             {
                 this.Pending.Dispose();
                 this.distanceBufferHandle.Dispose();
-                this.distanceManagedBuffer.Dispose();
+                this.distanceMemoryOwner.Dispose();
                 this.literalBufferHandle.Dispose();
-                this.literalManagedBuffer.Dispose();
+                this.literalMemoryOwner.Dispose();
 
                 this.literalTree.Dispose();
                 this.blTree.Dispose();
@@ -484,7 +484,7 @@ private sealed class Tree : IDisposable
             private IMemoryOwner<short> frequenciesMemoryOwner;
             private MemoryHandle frequenciesMemoryHandle;
 
-            private IManagedByteBuffer lengthsMemoryOwner;
+            private IMemoryOwner<byte> lengthsMemoryOwner;
             private MemoryHandle lengthsMemoryHandle;
 
             public Tree(MemoryAllocator memoryAllocator, int elements, int minCodes, int maxLength)
@@ -498,7 +498,7 @@ public Tree(MemoryAllocator memoryAllocator, int elements, int minCodes, int max
                 this.frequenciesMemoryHandle = this.frequenciesMemoryOwner.Memory.Pin();
                 this.Frequencies = (short*)this.frequenciesMemoryHandle.Pointer;
 
-                this.lengthsMemoryOwner = memoryAllocator.AllocateManagedByteBuffer(elements);
+                this.lengthsMemoryOwner = memoryAllocator.Allocate<byte>(elements);
                 this.lengthsMemoryHandle = this.lengthsMemoryOwner.Memory.Pin();
                 this.Length = (byte*)this.lengthsMemoryHandle.Pointer;
 

src/ImageSharp/Compression/Zlib/DeflaterOutputStream.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.IO;
 using SixLabors.ImageSharp.Memory;
 
@@ -14,8 +15,8 @@ namespace SixLabors.ImageSharp.Compression.Zlib
     internal sealed class DeflaterOutputStream : Stream
     {
         private const int BufferLength = 512;
-        private IManagedByteBuffer memoryOwner;
-        private readonly byte[] buffer;
+        private IMemoryOwner<byte> memoryOwner;
+        private readonly Memory<byte> buffer;
         private Deflater deflater;
         private readonly Stream rawStream;
         private bool isDisposed;
@@ -29,8 +30,8 @@ internal sealed class DeflaterOutputStream : Stream
         public DeflaterOutputStream(MemoryAllocator memoryAllocator, Stream rawStream, int compressionLevel)
         {
             this.rawStream = rawStream;
-            this.memoryOwner = memoryAllocator.AllocateManagedByteBuffer(BufferLength);
-            this.buffer = this.memoryOwner.Array;
+            this.memoryOwner = memoryAllocator.Allocate<byte>(BufferLength);
+            this.buffer = this.memoryOwner.Memory;
             this.deflater = new Deflater(memoryAllocator, compressionLevel);
         }
 
@@ -49,15 +50,9 @@ public DeflaterOutputStream(MemoryAllocator memoryAllocator, Stream rawStream, i
         /// <inheritdoc/>
         public override long Position
         {
-            get
-            {
-                return this.rawStream.Position;
-            }
+            get => this.rawStream.Position;
 
-            set
-            {
-                throw new NotSupportedException();
-            }
+            set => throw new NotSupportedException();
         }
 
         /// <inheritdoc/>
@@ -93,14 +88,14 @@ private void Deflate(bool flushing)
         {
             while (flushing || !this.deflater.IsNeedingInput)
             {
-                int deflateCount = this.deflater.Deflate(this.buffer, 0, BufferLength);
+                int deflateCount = this.deflater.Deflate(this.buffer.Span, 0, BufferLength);
 
                 if (deflateCount <= 0)
                 {
                     break;
                 }
 
-                this.rawStream.Write(this.buffer, 0, deflateCount);
+                this.rawStream.Write(this.buffer.Span.Slice(0, deflateCount));
             }
 
             if (!this.deflater.IsNeedingInput)
@@ -114,13 +109,13 @@ private void Finish()
             this.deflater.Finish();
             while (!this.deflater.IsFinished)
             {
-                int len = this.deflater.Deflate(this.buffer, 0, BufferLength);
+                int len = this.deflater.Deflate(this.buffer.Span, 0, BufferLength);
                 if (len <= 0)
                 {
                     break;
                 }
 
-                this.rawStream.Write(this.buffer, 0, len);
+                this.rawStream.Write(this.buffer.Span.Slice(0, len));
             }
 
             if (!this.deflater.IsFinished)