libmatroska2: add Zstandard compression support

Author: robUx4

libmatroska2/CMakeLists.txt

@@ -2,6 +2,7 @@ project("matroska2" VERSION 0.22.3 LANGUAGES C)
 
 option(CONFIG_BZLIB "Enable bzlib (de)compression in libmatroska2" ON)
 option(CONFIG_LZO1X "Enable lzo (de)compression in libmatroska2" ON)
+option(CONFIG_ZSTD "Enable Zstandard/zstd (de)compression in libmatroska2" ON)
 option(CONFIG_NOCODEC_HELPER "Enable Vorbis frame durations in libmatroska2" ON)
 
 set(matroska2_SOURCES
@@ -40,12 +41,34 @@ if (CONFIG_BZLIB)
   add_subdirectory("bzip2")
   target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:bzlib>)
 endif(CONFIG_BZLIB)
+if (CONFIG_ZSTD)
+  include(FetchContent)
+
+  set(ZSTD_BUILD_STATIC ON)
+  set(ZSTD_BUILD_SHARED OFF)
+  set(ZSTD_BUILD_PROGRAMS OFF)
+  set(ZSTD_BUILD_TESTS OFF)
+  set(ZSTD_LEGACY_SUPPORT OFF)
+
+  FetchContent_Declare(
+      zstd
+      URL      "https://github.com/facebook/zstd/releases/download/v1.5.6/zstd-1.5.6.tar.gz"
+      URL_HASH SHA512=54a578f2484da0520a6e9a24f501b9540a3fe3806785d6bc9db79fc095b7c142a7c121387c7eecd460ca71446603584ef1ba4d29a33ca90873338c9ffbd04f14
+      DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+      SOURCE_SUBDIR build/cmake
+  )
+
+  FetchContent_MakeAvailable(zstd)
+
+  target_include_directories("matroska2" PRIVATE ${zstd_SOURCE_DIR}/lib )
+  target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:libzstd_static>)
+endif(CONFIG_ZSTD)
 if (NOT CONFIG_NOCODEC_HELPER)
   add_subdirectory("tremor")
   target_link_libraries("matroska2" PRIVATE $<BUILD_INTERFACE:tremor>)
 endif(NOT CONFIG_NOCODEC_HELPER)
 
-set_target_properties("matroska2" PROPERTIES 
+set_target_properties("matroska2" PROPERTIES
   PUBLIC_HEADER "${matroska2_PUBLIC_HEADERS}"
   C_STANDARD 11
 )
@@ -59,7 +82,7 @@ endif (BUILD_SHARED_LIBS)
 
 include(GNUInstallDirs)
 
-install(TARGETS "matroska2" 
+install(TARGETS "matroska2"
   EXPORT Matroska2
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/matroska2
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

libmatroska2/matroska2/matroska.h

@@ -131,6 +131,14 @@ static INLINE err_t CompressFrameZLib(const uint8_t *Cursor, size_t CursorSize,
     return ERR_NOT_SUPPORTED;
 }
 #endif // !CONFIG_ZLIB
+#if defined(CONFIG_ZSTD)
+MATROSKA_DLL err_t CompressFrameZstd(const uint8_t *Cursor, size_t CursorSize, uint8_t **OutBuf, size_t *OutSize);
+#else // !CONFIG_ZLIB
+static INLINE err_t CompressFrameZstd(const uint8_t *Cursor, size_t CursorSize, uint8_t **OutBuf, size_t *OutSize)
+{
+    return ERR_NOT_SUPPORTED;
+}
+#endif // !CONFIG_ZLIB
 #endif
 
 MATROSKA_DLL void MATROSKA_ClusterSort(matroska_cluster *Cluster); // not good with P frames!!!

libmatroska2/matroska2/matroska_sem.h

@@ -367,6 +367,7 @@ typedef enum {
   MATROSKA_TRACK_ENCODING_COMP_BZLIB            = 1, // bzip2 compression (BZIP2) **SHOULD NOT** be used.
   MATROSKA_TRACK_ENCODING_COMP_LZO1X            = 2, // Lempel-Ziv-Oberhumer compression (LZO) **SHOULD NOT** be used.
   MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP      = 3, // Octets in `ContentCompSettings` ((#contentcompsettings-element)) have been stripped from each frame.
+  MATROSKA_TRACK_ENCODING_COMP_ZSTD             = 4, // Zstandard (zstd).
 } MatroskaTrackEncodingCompAlgo;
 
 /**
@@ -644,7 +645,7 @@ typedef enum {
  *Indicates what type of content the `ChapterAtom` contains and might be skipped. It can be used to automatically skip content based on the type.
 If a `ChapterAtom` is inside a `ChapterAtom` that has a `ChapterSkipType` set, it **MUST NOT** have a `ChapterSkipType` or have a `ChapterSkipType` with the same value as it's parent `ChapterAtom`.
 If the `ChapterAtom` doesn't contain a `ChapterTimeEnd`, the value of the `ChapterSkipType` is only valid until the next `ChapterAtom` with a `ChapterSkipType` value or the end of the file.
-    
+
  */
 typedef enum {
   MATROSKA_CHAPTERSKIPTYPE_NO_SKIPPING      = 0, // Content which should not be skipped.

libmatroska2/matroska_config.h.in

@@ -1,6 +1,7 @@
 // for libmatroska2
 #cmakedefine CONFIG_LZO1X
 #cmakedefine CONFIG_BZLIB
+#cmakedefine CONFIG_ZSTD
 #cmakedefine CONFIG_NOCODEC_HELPER
 
 #define LIBMATROSKA2_PROJECT_VERSION T("@matroska2_VERSION_MAJOR@.@matroska2_VERSION_MINOR@.@matroska2_VERSION_PATCH@")