Use LZ4 as external dependency

stride3d · Jan 14, 2023 · fb373aa · fb373aa
1 parent 7578342
commit fb373aa
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 2,502 deletions.
diff --git a/sources/core/Stride.Core.Serialization/LZ4/ILZ4Service.cs b/sources/core/Stride.Core.Serialization/LZ4/ILZ4Service.cs
diff --git a/sources/core/Stride.Core.Serialization/LZ4/LZ4Codec.cs b/sources/core/Stride.Core.Serialization/LZ4/LZ4Codec.cs
diff --git a/sources/core/Stride.Core.Serialization/LZ4/Services/NativeLz4Service.cs b/sources/core/Stride.Core.Serialization/LZ4/Services/NativeLz4Service.cs
diff --git a/...tride.Core.Serialization/LZ4/LZ4Stream.cs → ...ialization/Serialization/LZ4/LZ4Stream.cs b/...tride.Core.Serialization/LZ4/LZ4Stream.cs → ...ialization/Serialization/LZ4/LZ4Stream.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using System.IO.Compression;
 using System.Runtime.CompilerServices;
+using K4os.Compression.LZ4;
 
 namespace Stride.Core.LZ4
 {
@@ -234,9 +235,8 @@ private void FlushCurrentChunk()
             if (bufferOffset <= 0) return;
 
             var compressed = new byte[bufferOffset];
-            var compressedLength = highCompression
-                ? LZ4Codec.EncodeHC(dataBuffer, 0, bufferOffset, compressed, 0, bufferOffset)
-                : LZ4Codec.Encode(dataBuffer, 0, bufferOffset, compressed, 0, bufferOffset);
+            LZ4Level level = (highCompression ? LZ4Level.L09_HC : LZ4Level.L00_FAST);
+            var compressedLength = LZ4Codec.Encode(dataBuffer, 0, bufferOffset, compressed, 0, bufferOffset, level);
 
             if (compressedLength <= 0 || compressedLength >= bufferOffset)
             {
@@ -296,7 +296,7 @@ private bool AcquireNextChunk()
                     var passes = (int)flags >> 2;
                     if (passes != 0)
                         throw new NotSupportedException("Chunks with multiple passes are not supported.");
-                    LZ4Codec.Decode(compressedDataBuffer, 0, compressedLength, dataBuffer, 0, originalLength, true);
+                    LZ4Codec.Decode(compressedDataBuffer, 0, compressedLength, dataBuffer, 0, originalLength);
                     bufferLength = originalLength;
                 }
 

diff --git a/sources/core/Stride.Core.Serialization/Storage/BundleOdbBackend.cs b/sources/core/Stride.Core.Serialization/Storage/BundleOdbBackend.cs
@@ -11,7 +11,6 @@
 using Stride.Core.LZ4;
 using Stride.Core.Serialization;
 using Stride.Core.Serialization.Contents;
-using Stride.Core.Serialization.Serializers;
 
 namespace Stride.Core.Storage
 {

diff --git a/sources/core/Stride.Core.Serialization/Stride.Core.Serialization.csproj b/sources/core/Stride.Core.Serialization/Stride.Core.Serialization.csproj
@@ -17,6 +17,9 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="K4os.Compression.LZ4.Legacy" Version="1.2.16" />
+  </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>

diff --git a/sources/core/Stride.Core/Native/lz4/NativeLZ4Base.cs b/sources/core/Stride.Core/Native/lz4/NativeLZ4Base.cs