Migrate LZ4 from NanaZip.Core to NanaZip.Codecs.

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

Hide file tree

Showing 13 changed files with 42 additions and 32 deletions.
diff --git a/NanaZip.Core/LZ4/lz4.c → NanaZip.Codecs/LZ4/lz4.c b/NanaZip.Core/LZ4/lz4.c → NanaZip.Codecs/LZ4/lz4.c
diff --git a/NanaZip.Core/LZ4/lz4.h → NanaZip.Codecs/LZ4/lz4.h b/NanaZip.Core/LZ4/lz4.h → NanaZip.Codecs/LZ4/lz4.h
diff --git a/NanaZip.Core/LZ4/lz4frame.c → NanaZip.Codecs/LZ4/lz4frame.c b/NanaZip.Core/LZ4/lz4frame.c → NanaZip.Codecs/LZ4/lz4frame.c
diff --git a/NanaZip.Core/LZ4/lz4frame.h → NanaZip.Codecs/LZ4/lz4frame.h b/NanaZip.Core/LZ4/lz4frame.h → NanaZip.Codecs/LZ4/lz4frame.h
diff --git a/NanaZip.Core/LZ4/lz4frame_static.h → NanaZip.Codecs/LZ4/lz4frame_static.h b/NanaZip.Core/LZ4/lz4frame_static.h → NanaZip.Codecs/LZ4/lz4frame_static.h
diff --git a/NanaZip.Core/LZ4/lz4hc.c → NanaZip.Codecs/LZ4/lz4hc.c b/NanaZip.Core/LZ4/lz4hc.c → NanaZip.Codecs/LZ4/lz4hc.c
diff --git a/NanaZip.Core/LZ4/lz4hc.h → NanaZip.Codecs/LZ4/lz4hc.h b/NanaZip.Core/LZ4/lz4hc.h → NanaZip.Codecs/LZ4/lz4hc.h
diff --git a/NanaZip.Codecs/NanaZip.Codecs.def b/NanaZip.Codecs/NanaZip.Codecs.def
@@ -98,3 +98,12 @@ BrotliEncoderDestroyInstance
 BrotliEncoderIsFinished
 BrotliEncoderMaxCompressedSize
 BrotliEncoderSetParameter
+
+LZ4_decompress_safe
+LZ4F_compressFrame
+LZ4F_compressFrameBound
+LZ4F_createDecompressionContext
+LZ4F_decompress
+LZ4F_freeDecompressionContext
+LZ4F_getErrorName
+LZ4F_isError
diff --git a/NanaZip.Codecs/NanaZip.Codecs.props b/NanaZip.Codecs/NanaZip.Codecs.props
@@ -14,6 +14,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)Brotli\include\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)GmSSL\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Heimdal\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)LZ4\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj b/NanaZip.Codecs/NanaZip.Codecs.vcxproj
@@ -27,6 +27,7 @@
     <IncludePath>$(MSBuildThisFileDirectory)Brotli\include\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)GmSSL\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)Heimdal\;$(IncludePath)</IncludePath>
+    <IncludePath>$(MSBuildThisFileDirectory)LZ4\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)RHash\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)xxHash\;$(IncludePath)</IncludePath>
   </PropertyGroup>
@@ -44,6 +45,9 @@
     <None Include="NanaZip.Codecs.props" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="LZ4\lz4.c" />
+    <ClCompile Include="LZ4\lz4frame.c" />
+    <ClCompile Include="LZ4\lz4hc.c" />
     <ClCompile Include="xxHash\xxhash.c">
       <DisableSpecificWarnings>4113;</DisableSpecificWarnings>
     </ClCompile>
@@ -151,6 +155,10 @@
     <ClCompile Include="NanaZip.Codecs.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="LZ4\lz4.h" />
+    <ClInclude Include="LZ4\lz4frame.h" />
+    <ClInclude Include="LZ4\lz4frame_static.h" />
+    <ClInclude Include="LZ4\lz4hc.h" />
     <ClInclude Include="xxHash\xxhash.h" />
     <ClInclude Include="Brotli\common\constants.h" />
     <ClInclude Include="Brotli\common\context.h" />

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters b/NanaZip.Codecs/NanaZip.Codecs.vcxproj.filters
@@ -200,6 +200,15 @@
     <ClCompile Include="xxHash\xxhash.c">
       <Filter>xxHash</Filter>
     </ClCompile>
+    <ClCompile Include="LZ4\lz4.c">
+      <Filter>LZ4</Filter>
+    </ClCompile>
+    <ClCompile Include="LZ4\lz4frame.c">
+      <Filter>LZ4</Filter>
+    </ClCompile>
+    <ClCompile Include="LZ4\lz4hc.c">
+      <Filter>LZ4</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="NanaZip.Codecs.def" />
@@ -239,6 +248,9 @@
     <Filter Include="xxHash">
       <UniqueIdentifier>{4a2fdc00-56e0-4024-b1e4-65edd9491b7a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="LZ4">
+      <UniqueIdentifier>{a09b9f72-7fa1-4190-a850-c3ff3c812272}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BLAKE3\blake3.h">
@@ -508,5 +520,17 @@
     <ClInclude Include="xxHash\xxhash.h">
       <Filter>xxHash</Filter>
     </ClInclude>
+    <ClInclude Include="LZ4\lz4.h">
+      <Filter>LZ4</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ4\lz4frame.h">
+      <Filter>LZ4</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ4\lz4frame_static.h">
+      <Filter>LZ4</Filter>
+    </ClInclude>
+    <ClInclude Include="LZ4\lz4hc.h">
+      <Filter>LZ4</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)LZ4\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)LZ5\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)FastLZMA2\;$(IncludePath)</IncludePath>
     <IncludePath>$(MSBuildThisFileDirectory)ZSTDMT\;$(IncludePath)</IncludePath>
@@ -141,9 +140,6 @@
     <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" />
     <ClCompile Include="Lizard\lizard_compress.c" />
     <ClCompile Include="Lizard\lizard_decompress.c" />
     <ClCompile Include="Lizard\lizard_frame.c" />
@@ -500,10 +496,6 @@
     <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" />
-    <ClInclude Include="LZ4\lz4hc.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="LZ4">
-      <UniqueIdentifier>{271fd7e0-f850-4705-85e5-49b6f2f97bb0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="LZ5">
       <UniqueIdentifier>{918fd1fb-4664-4f98-8a3b-2cfb349cdaa5}</UniqueIdentifier>
     </Filter>
@@ -1097,15 +1094,6 @@
     <ClCompile Include="Lizard\lizard_frame.c">
       <Filter>Lizard</Filter>
     </ClCompile>
-    <ClCompile Include="LZ4\lz4.c">
-      <Filter>LZ4</Filter>
-    </ClCompile>
-    <ClCompile Include="LZ4\lz4frame.c">
-      <Filter>LZ4</Filter>
-    </ClCompile>
-    <ClCompile Include="LZ4\lz4hc.c">
-      <Filter>LZ4</Filter>
-    </ClCompile>
     <ClCompile Include="LZ5\lz5.c">
       <Filter>LZ5</Filter>
     </ClCompile>
@@ -2290,18 +2278,6 @@
     <ClInclude Include="Lizard\lizard_parser_pricefast.h">
       <Filter>Lizard</Filter>
     </ClInclude>
-    <ClInclude Include="LZ4\lz4.h">
-      <Filter>LZ4</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ4\lz4frame.h">
-      <Filter>LZ4</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ4\lz4frame_static.h">
-      <Filter>LZ4</Filter>
-    </ClInclude>
-    <ClInclude Include="LZ4\lz4hc.h">
-      <Filter>LZ4</Filter>
-    </ClInclude>
     <ClInclude Include="LZ5\lz5.h">
       <Filter>LZ5</Filter>
     </ClInclude>