Migrate LZ5 from NanaZip.Core to NanaZip.Codecs.

M2Team · Feb 4, 2024 · ab3d404 · ab3d404
1 parent 4ad3aa0
commit ab3d404
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 40 deletions.
diff --git a/NanaZip.Core/LZ5/lz5.c → NanaZip.Codecs/LZ5/lz5.c b/NanaZip.Core/LZ5/lz5.c → NanaZip.Codecs/LZ5/lz5.c
diff --git a/NanaZip.Core/LZ5/lz5.h → NanaZip.Codecs/LZ5/lz5.h b/NanaZip.Core/LZ5/lz5.h → NanaZip.Codecs/LZ5/lz5.h
diff --git a/NanaZip.Core/LZ5/lz5common.h → NanaZip.Codecs/LZ5/lz5common.h b/NanaZip.Core/LZ5/lz5common.h → NanaZip.Codecs/LZ5/lz5common.h
diff --git a/NanaZip.Core/LZ5/lz5frame.c → NanaZip.Codecs/LZ5/lz5frame.c b/NanaZip.Core/LZ5/lz5frame.c → NanaZip.Codecs/LZ5/lz5frame.c
diff --git a/NanaZip.Core/LZ5/lz5frame.h → NanaZip.Codecs/LZ5/lz5frame.h b/NanaZip.Core/LZ5/lz5frame.h → NanaZip.Codecs/LZ5/lz5frame.h
diff --git a/NanaZip.Core/LZ5/lz5frame_static.h → NanaZip.Codecs/LZ5/lz5frame_static.h b/NanaZip.Core/LZ5/lz5frame_static.h → NanaZip.Codecs/LZ5/lz5frame_static.h
diff --git a/NanaZip.Core/LZ5/lz5hc.c → NanaZip.Codecs/LZ5/lz5hc.c b/NanaZip.Core/LZ5/lz5hc.c → NanaZip.Codecs/LZ5/lz5hc.c
diff --git a/NanaZip.Core/LZ5/lz5hc.h → NanaZip.Codecs/LZ5/lz5hc.h b/NanaZip.Core/LZ5/lz5hc.h → NanaZip.Codecs/LZ5/lz5hc.h
diff --git a/NanaZip.Core/LZ5/mem.h → NanaZip.Codecs/LZ5/mem.h b/NanaZip.Core/LZ5/mem.h → NanaZip.Codecs/LZ5/mem.h
diff --git a/NanaZip.Codecs/NanaZip.Codecs.def b/NanaZip.Codecs/NanaZip.Codecs.def
@@ -107,3 +107,11 @@ LZ4F_decompress
 LZ4F_freeDecompressionContext
 LZ4F_getErrorName
 LZ4F_isError
+
+LZ5F_compressFrame
+LZ5F_compressFrameBound
+LZ5F_createDecompressionContext
+LZ5F_decompress
+LZ5F_freeDecompressionContext
+LZ5F_getErrorName
+LZ5F_isError
diff --git a/NanaZip.Codecs/NanaZip.Codecs.props b/NanaZip.Codecs/NanaZip.Codecs.props
@@ -15,6 +15,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)GmSSL\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Heimdal\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)LZ4\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj b/NanaZip.Codecs/NanaZip.Codecs.vcxproj
@@ -28,6 +28,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)GmSSL\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Heimdal\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)LZ4\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)xxHash\;$(IncludePath)</IncludePath>
   </PropertyGroup>
@@ -45,6 +46,9 @@
     <None Include="NanaZip.Codecs.props" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="LZ5\lz5.c" />
+    <ClCompile Include="LZ5\lz5frame.c" />
+    <ClCompile Include="LZ5\lz5hc.c" />
     <ClCompile Include="LZ4\lz4.c" />
     <ClCompile Include="LZ4\lz4frame.c" />
     <ClCompile Include="LZ4\lz4hc.c" />
@@ -155,6 +159,12 @@
     <ClCompile Include="NanaZip.Codecs.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="LZ5\lz5.h" />
+    <ClInclude Include="LZ5\lz5common.h" />
+    <ClInclude Include="LZ5\lz5frame.h" />
+    <ClInclude Include="LZ5\lz5frame_static.h" />
+    <ClInclude Include="LZ5\lz5hc.h" />
+    <ClInclude Include="LZ5\mem.h" />
     <ClInclude Include="LZ4\lz4.h" />
     <ClInclude Include="LZ4\lz4frame.h" />
     <ClInclude Include="LZ4\lz4frame_static.h" />

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters b/NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters
@@ -209,6 +209,15 @@
     <ClCompile Include="LZ4\lz4hc.c">
       <Filter>LZ4</Filter>
     </ClCompile>
+    <ClCompile Include="LZ5\lz5.c">
+      <Filter>LZ5</Filter>
+    </ClCompile>
+    <ClCompile Include="LZ5\lz5frame.c">
+      <Filter>LZ5</Filter>
+    </ClCompile>
+    <ClCompile Include="LZ5\lz5hc.c">
+      <Filter>LZ5</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="NanaZip.Codecs.def" />
@@ -251,6 +260,9 @@
     <Filter Include="LZ4">
       <UniqueIdentifier>{a09b9f72-7fa1-4190-a850-c3ff3c812272}</UniqueIdentifier>
     </Filter>
+    <Filter Include="LZ5">
+      <UniqueIdentifier>{50cd4f8e-720b-44a2-912e-8febdaa5c7c6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BLAKE3\blake3.h">
@@ -532,5 +544,23 @@
     <ClInclude Include="LZ4\lz4hc.h">
       <Filter>LZ4</Filter>
     </ClInclude>
+    <ClInclude Include="LZ5\lz5.h">
+      <Filter>LZ5</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ5\lz5common.h">
+      <Filter>LZ5</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ5\lz5frame.h">
+      <Filter>LZ5</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ5\lz5frame_static.h">
+      <Filter>LZ5</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ5\lz5hc.h">
+      <Filter>LZ5</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ5\mem.h">
+      <Filter>LZ5</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/NanaZip.Core/NanaZip.Core.vcxproj b/NanaZip.Core/NanaZip.Core.vcxproj
@@ -26,7 +26,6 @@
     <IncludePath>$(MSBuildThisFileDirectory)xxHash\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Zstandard\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Lizard\;$(IncludePath)</IncludePath>
-    <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)FastLZMA2\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)ZSTDMT\;$(IncludePath)</IncludePath>
   </PropertyGroup>
@@ -137,9 +136,6 @@
     <ClCompile Include="FastLZMA2\radix_struct.c" />
     <ClCompile Include="FastLZMA2\range_enc.c" />
     <ClCompile Include="FastLZMA2\util.c" />
-    <ClCompile Include="LZ5\lz5.c" />
-    <ClCompile Include="LZ5\lz5frame.c" />
-    <ClCompile Include="LZ5\lz5hc.c" />
     <ClCompile Include="Lizard\lizard_compress.c" />
     <ClCompile Include="Lizard\lizard_decompress.c" />
     <ClCompile Include="Lizard\lizard_frame.c" />
@@ -490,12 +486,6 @@
     <ClInclude Include="FastLZMA2\radix_mf.h" />
     <ClInclude Include="FastLZMA2\range_enc.h" />
     <ClInclude Include="FastLZMA2\util.h" />
-    <ClInclude Include="LZ5\lz5.h" />
-    <ClInclude Include="LZ5\lz5common.h" />
-    <ClInclude Include="LZ5\lz5frame.h" />
-    <ClInclude Include="LZ5\lz5frame_static.h" />
-    <ClInclude Include="LZ5\lz5hc.h" />
-    <ClInclude Include="LZ5\mem.h" />
     <ClInclude Include="Lizard\lizard_common.h" />
     <ClInclude Include="Lizard\lizard_compress.h" />
     <ClInclude Include="Lizard\lizard_compress_liz.h" />

diff --git a/NanaZip.Core/NanaZip.Core.vcxproj.filters b/NanaZip.Core/NanaZip.Core.vcxproj.filters
@@ -94,9 +94,6 @@
     <Filter Include="Lizard">
       <UniqueIdentifier>{a582978d-3bd4-4092-a86b-72bb8f96c971}</UniqueIdentifier>
     </Filter>
-    <Filter Include="LZ5">
-      <UniqueIdentifier>{918fd1fb-4664-4f98-8a3b-2cfb349cdaa5}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Extensions">
       <UniqueIdentifier>{ad1ce36b-5416-4c51-bdd0-26e4d2afe6b5}</UniqueIdentifier>
     </Filter>
@@ -1094,15 +1091,6 @@
     <ClCompile Include="Lizard\lizard_frame.c">
       <Filter>Lizard</Filter>
     </ClCompile>
-    <ClCompile Include="LZ5\lz5.c">
-      <Filter>LZ5</Filter>
-    </ClCompile>
-    <ClCompile Include="LZ5\lz5frame.c">
-      <Filter>LZ5</Filter>
-    </ClCompile>
-    <ClCompile Include="LZ5\lz5hc.c">
-      <Filter>LZ5</Filter>
-    </ClCompile>
     <ClCompile Include="FastLZMA2\dict_buffer.c">
       <Filter>FastLZMA2</Filter>
     </ClCompile>
@@ -2278,24 +2266,6 @@
     <ClInclude Include="Lizard\lizard_parser_pricefast.h">
       <Filter>Lizard</Filter>
     </ClInclude>
-    <ClInclude Include="LZ5\lz5.h">
-      <Filter>LZ5</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ5\lz5common.h">
-      <Filter>LZ5</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ5\lz5frame.h">
-      <Filter>LZ5</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ5\lz5frame_static.h">
-      <Filter>LZ5</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ5\lz5hc.h">
-      <Filter>LZ5</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ5\mem.h">
-      <Filter>LZ5</Filter>
-    </ClInclude>
     <ClInclude Include="FastLZMA2\atomic.h">
       <Filter>FastLZMA2</Filter>
     </ClInclude>