Merge branch 'js/decoder-attempt-2' of https://github.com/SixLabors/ImageSharp into js/decoder-attempt-2

src/ImageSharp/IO/BufferedReadStream.cs

@@ -90,6 +90,7 @@ internal sealed class BufferedReadStream : Stream
         set
         {
             Guard.MustBeGreaterThanOrEqualTo(value, 0, nameof(this.Position));
+            this.cancellationToken.ThrowIfCancellationRequested();
 
             // Only reset readBufferIndex if we are out of bounds of our working buffer
             // otherwise we should simply move the value by the diff.
@@ -262,6 +263,7 @@ internal sealed class BufferedReadStream : Stream
     [MethodImpl(MethodImplOptions.NoInlining)]
     private void FillReadBuffer()
     {
+        this.cancellationToken.ThrowIfCancellationRequested();
         Stream baseStream = this.BaseStream;
         if (this.readerPosition != baseStream.Position)
         {

tests/ImageSharp.Tests/Image/ImageTests.Decode_Cancellation.cs

@@ -86,7 +86,7 @@ public partial class ImageTests
 
             Configuration configuration = Configuration.CreateDefaultInstance();
             configuration.FileSystem = new SingleStreamFileSystem((Stream)pausedStream);
-            configuration.StreamProcessingBufferSize = 256;
+            configuration.StreamProcessingBufferSize = (int)Math.Min(128, pausedStream.Length / 4);
 
             DecoderOptions options = new()
             {

tests/ImageSharp.Tests/TestUtilities/IPausedStream.cs

@@ -12,4 +12,6 @@ public interface IPausedStream : IDisposable
     public void Next();
 
     public void Release();
+
+    public long Length { get; }
 }

tests/ImageSharp.Tests/TestUtilities/PausedMemoryStream.cs

@@ -12,9 +12,9 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities;
 /// </summary>
 public class PausedMemoryStream : MemoryStream, IPausedStream
 {
-    private readonly SemaphoreSlim semaphore = new SemaphoreSlim(0);
+    private readonly SemaphoreSlim semaphore = new(0);
 
-    private readonly CancellationTokenSource cancelationTokenSource = new CancellationTokenSource();
+    private readonly CancellationTokenSource cancelationTokenSource = new();
 
     private Action<Stream> onWaitingCallback;
 

tests/ImageSharp.Tests/TestUtilities/PausedStream.cs

@@ -7,9 +7,9 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities;
 
 public class PausedStream : Stream, IPausedStream
 {
-    private readonly SemaphoreSlim semaphore = new SemaphoreSlim(0);
+    private readonly SemaphoreSlim semaphore = new(0);
 
-    private readonly CancellationTokenSource cancelationTokenSource = new CancellationTokenSource();
+    private readonly CancellationTokenSource cancelationTokenSource = new();
 
     private readonly Stream innerStream;
     private Action<Stream> onWaitingCallback;