From 39f8c776debeabba977055c2ac1007c437eeba01 Mon Sep 17 00:00:00 2001
From: Brian Popow <popow@gmx.de>
Date: Fri, 14 Apr 2023 19:50:09 +0200
Subject: [PATCH] Using Binary serialization for Vp8Residual

---
 .../Formats/Webp/Lossy/Vp8BandProbas.cs       |   8 +----
 .../Formats/Webp/Lossy/Vp8CostArray.cs        |  10 +-----
 src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs |  10 +-----
 .../Formats/Webp/Lossy/Vp8ProbaArray.cs       |  10 +-----
 .../Formats/Webp/Lossy/Vp8Residual.cs         |  13 +------
 src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs |  10 +-----
 .../Formats/Webp/Lossy/Vp8StatsArray.cs       |  10 +-----
 .../Formats/WebP/Vp8ResidualTests.cs          |  32 +++++++-----------
 .../ImageSharp.Tests/ImageSharp.Tests.csproj  |   2 +-
 .../TestDataWebp/Vp8Residual.bin              | Bin 0 -> 15043 bytes
 10 files changed, 20 insertions(+), 85 deletions(-)
 create mode 100644 tests/ImageSharp.Tests/TestDataWebp/Vp8Residual.bin

diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs
index 86304d4bd..5db842ba3 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8BandProbas.cs
@@ -8,6 +8,7 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 /// <summary>
 /// All the probabilities associated to one band.
 /// </summary>
+[Serializable]
 internal class Vp8BandProbas
 {
     /// <summary>
@@ -22,13 +23,6 @@ internal class Vp8BandProbas
         }
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Vp8BandProbas"/> class.
-    /// Only used for unit tests.
-    /// </summary>
-    [JsonConstructor]
-    public Vp8BandProbas(Vp8ProbaArray[] probabilities) => this.Probabilities = probabilities;
-
     /// <summary>
     /// Gets the Probabilities.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs
index 8268e1c02..ba1b49881 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8CostArray.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Text.Json.Serialization;
-
 namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 
+[Serializable]
 internal class Vp8CostArray
 {
     /// <summary>
@@ -12,12 +11,5 @@ internal class Vp8CostArray
     /// </summary>
     public Vp8CostArray() => this.Costs = new ushort[67 + 1];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Vp8CostArray"/> class.
-    /// Only used for unit tests.
-    /// </summary>
-    [JsonConstructor]
-    public Vp8CostArray(ushort[] costs) => this.Costs = costs;
-
     public ushort[] Costs { get; }
 }
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs
index 2441436fb..676874820 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8Costs.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Text.Json.Serialization;
-
 namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 
+[Serializable]
 internal class Vp8Costs
 {
     /// <summary>
@@ -19,13 +18,6 @@ internal class Vp8Costs
         }
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Vp8Costs"/> class.
-    /// Only used for unit tests.
-    /// </summary>
-    [JsonConstructor]
-    public Vp8Costs(Vp8CostArray[] costs) => this.Costs = costs;
-
     /// <summary>
     /// Gets the Costs.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs
index a19f9742f..ddc1c9d61 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8ProbaArray.cs
@@ -1,13 +1,12 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Text.Json.Serialization;
-
 namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 
 /// <summary>
 /// Probabilities associated to one of the contexts.
 /// </summary>
+[Serializable]
 internal class Vp8ProbaArray
 {
     /// <summary>
@@ -15,13 +14,6 @@ internal class Vp8ProbaArray
     /// </summary>
     public Vp8ProbaArray() => this.Probabilities = new byte[WebpConstants.NumProbas];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Vp8ProbaArray"/> class.
-    /// Only used for unit tests.
-    /// </summary>
-    [JsonConstructor]
-    public Vp8ProbaArray(byte[] probabilities) => this.Probabilities = probabilities;
-
     /// <summary>
     /// Gets the probabilities.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs
index 6e0937d86..58fba10a7 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8Residual.cs
@@ -14,24 +14,13 @@ namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 /// <summary>
 /// On-the-fly info about the current set of residuals.
 /// </summary>
+[Serializable]
 internal class Vp8Residual
 {
     public Vp8Residual()
     {
     }
 
-    [JsonConstructor]
-    public Vp8Residual(int first, int last, int coeffType, short[] coeffs, Vp8BandProbas[] prob, Vp8Stats[] stats, Vp8Costs[] costs)
-    {
-        this.First = first;
-        this.Last = last;
-        this.CoeffType = coeffType;
-        this.Coeffs = coeffs;
-        this.Prob = prob;
-        this.Stats = stats;
-        this.Costs = costs;
-    }
-
     public int First { get; set; }
 
     public int Last { get; set; }
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs
index b6c05f2d4..23d63f322 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8Stats.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Text.Json.Serialization;
-
 namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 
+[Serializable]
 internal class Vp8Stats
 {
     /// <summary>
@@ -19,12 +18,5 @@ internal class Vp8Stats
         }
     }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Vp8Stats"/> class.
-    /// Only used for unit tests.
-    /// </summary>
-    [JsonConstructor]
-    public Vp8Stats(Vp8StatsArray[] stats) => this.Stats = stats;
-
     public Vp8StatsArray[] Stats { get; }
 }
diff --git a/src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs b/src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs
index 864248dd8..2ab0702eb 100644
--- a/src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs
+++ b/src/ImageSharp/Formats/Webp/Lossy/Vp8StatsArray.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Text.Json.Serialization;
-
 namespace SixLabors.ImageSharp.Formats.Webp.Lossy;
 
+[Serializable]
 internal class Vp8StatsArray
 {
     /// <summary>
@@ -12,12 +11,5 @@ internal class Vp8StatsArray
     /// </summary>
     public Vp8StatsArray() => this.Stats = new uint[WebpConstants.NumProbas];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Vp8StatsArray"/> class.
-    /// Only used for unit tests.
-    /// </summary>
-    [JsonConstructor]
-    public Vp8StatsArray(uint[] stats) => this.Stats = stats;
-
     public uint[] Stats { get; }
 }
diff --git a/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs b/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs
index 20a161371..2371a179e 100644
--- a/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs
+++ b/tests/ImageSharp.Tests/Formats/WebP/Vp8ResidualTests.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using System.Runtime.Intrinsics.X86;
+using System.Runtime.Serialization.Formatters.Binary;
 using SixLabors.ImageSharp.Formats.Webp;
 using SixLabors.ImageSharp.Formats.Webp.Lossy;
 using SixLabors.ImageSharp.Tests.TestUtilities;
-using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Webp;
 
@@ -15,12 +14,6 @@ public class Vp8ResidualTests
     [Fact]
     public void Vp8Residual_Serialization_Works()
     {
-        if (!Sse2.IsSupported)
-        {
-            // JsonSerializer without SSE2 does not seem to work, skip test then.
-            return;
-        }
-
         // arrange
         Vp8Residual expected = new();
         Vp8EncProba encProb = new();
@@ -34,8 +27,12 @@ public class Vp8ResidualTests
         }
 
         // act
-        string jsonString = JsonSerializer.Serialize(expected);
-        Vp8Residual actual = JsonSerializer.Deserialize<Vp8Residual>(jsonString);
+        BinaryFormatter formatter = new();
+        using MemoryStream ms = new();
+        formatter.Serialize(ms, expected);
+        ms.Position = 0;
+        object obj = formatter.Deserialize(ms);
+        Vp8Residual actual = (Vp8Residual)obj;
 
         // assert
         Assert.Equal(expected.CoeffType, actual.CoeffType);
@@ -82,17 +79,14 @@ public class Vp8ResidualTests
     [Fact]
     public void GetResidualCost_Works()
     {
-        if (!Sse2.IsSupported)
-        {
-            // JsonSerializer without SSE2 does not seem to work, skip test then.
-            return;
-        }
-
         // arrange
         int ctx0 = 0;
         int expected = 20911;
-        string jsonString = File.ReadAllText(Path.Combine("TestDataWebp", "Vp8Residual.json"));
-        Vp8Residual residual = JsonSerializer.Deserialize<Vp8Residual>(jsonString);
+        byte[] data = File.ReadAllBytes(Path.Combine("TestDataWebp", "Vp8Residual.bin"));
+        BinaryFormatter formatter = new();
+        using Stream stream = new MemoryStream(data);
+        object obj = formatter.Deserialize(stream);
+        Vp8Residual residual = (Vp8Residual)obj;
 
         // act
         int actual = residual.GetResidualCost(ctx0);
@@ -101,8 +95,6 @@ public class Vp8ResidualTests
         Assert.Equal(expected, actual);
     }
 
-    
-
     private static void CreateRandomProbas(Vp8EncProba probas, Random rand)
     {
         for (int t = 0; t < WebpConstants.NumTypes; ++t)
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index 270a02c0c..d17cffc4f 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -56,7 +56,7 @@
     <None Update="TestFonts\SixLaborsSampleAB.woff">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="TestDataWebp\Vp8Residual.json">
+    <None Update="TestDataWebp\Vp8Residual.bin">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="xunit.runner.json">
diff --git a/tests/ImageSharp.Tests/TestDataWebp/Vp8Residual.bin b/tests/ImageSharp.Tests/TestDataWebp/Vp8Residual.bin
new file mode 100644
index 0000000000000000000000000000000000000000..d96a3c093a7e4e97708b276341d17cbad0047afc
GIT binary patch
literal 15043
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
C#>wgc

literal 0
HcmV?d00001