libmatroska: misc. compression cleanup

corec/corec/helpers/zlib/CMakeLists.txt

@@ -22,7 +22,6 @@ if (CONFIG_ZLIB)
         inffast.c
         inflate.c
         inftrees.c
-        uncompr.c
         zutil.c
         compress.c
         deflate.c
@@ -68,14 +67,14 @@ if (CONFIG_ZLIB)
         endif()
     endif()
     endif()
-    
-    target_compile_definitions("zlib" PRIVATE FASTEST NO_ERRNO_H)
+
+    target_compile_definitions("zlib" PRIVATE FASTEST NO_ERRNO_H NO_GZIP)
     # if(WIN32 && DYNAMIC BUILD)
     #     target_compile_definitions("zlib" ZLIB_DLL)
     # endif(WIN32)
     target_sources("zlib" PRIVATE ${zlib_group_SOURCES} ${ZLIB_ASM_SOURCES} ${zlib_group_PUBLIC_HEADERS})
     target_include_directories("zlib" PUBLIC ".")
-    set_target_properties("zlib" PROPERTIES 
+    set_target_properties("zlib" PROPERTIES
         PUBLIC_HEADER "${zlib_group_PUBLIC_HEADERS}"
     )
 endif(CONFIG_ZLIB)

corec/corec/portab.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * 
+ *
  * Copyright (c) 2008-2010, CoreCodec, Inc.
  * All rights reserved.
  *
@@ -482,13 +482,6 @@ typedef uint16_t utf16_t;
 #define MAXPATHFULL MAXPATH
 #endif
 
-#define MAXPLANES 4
-typedef void* planes[MAXPLANES];
-typedef const void* constplanes[MAXPLANES];
-#define CONST_CONSTPLANES(name) const void* const (name)[MAXPLANES]
-#define CONSTPLANES(name) const void* (name)[MAXPLANES]
-#define CONST_PLANES(name) void* const (name)[MAXPLANES]
-
 #define FOURCCBE(a,b,c,d) \
 	(((uint8_t)(a) << 24) | ((uint8_t)(b) << 16) | \
 	((uint8_t)(c) << 8) | ((uint8_t)(d) << 0))
@@ -516,22 +509,6 @@ void * __alloca(size_t size);
 #define alloca(size) __builtin_alloca(size)
 #endif
 
-#if defined(ARM)
-//fixed size stack:
-//  symbian
-//  palm os
-#define SWAPSP
-static INLINE void* SwapSP(void* in)
-{
-	void* out;
-	asm volatile(
-		"mov %0, sp\n\t"
-		"mov sp, %1\n\t"
-		: "=&r"(out) : "r"(in) : "cc");
-	return out;
-}
-#endif
-
 #endif /* __GNUC__ */
 
 #if defined(_MSC_VER) && defined(TARGET_WIN)

libmatroska2/matroska2/matroska.h

@@ -49,8 +49,8 @@
 #define PROFILE_MATROSKA_V5          (1<<6)
 #define PROFILE_WEBM                 (1<<3)
 #define PROFILE_DIVX                 (1<<4)
-#define PROFILE_MATROSKA_ALL        (PROFILE_MATROSKA_V1|PROFILE_MATROSKA_V2|PROFILE_MATROSKA_V3|PROFILE_MATROSKA_V4) 
-#define PROFILE_MATROSKA_ANY        (PROFILE_MATROSKA_ALL|PROFILE_WEBM|PROFILE_DIVX) 
+#define PROFILE_MATROSKA_ALL        (PROFILE_MATROSKA_V1|PROFILE_MATROSKA_V2|PROFILE_MATROSKA_V3|PROFILE_MATROSKA_V4)
+#define PROFILE_MATROSKA_ANY        (PROFILE_MATROSKA_ALL|PROFILE_WEBM|PROFILE_DIVX)
 
 #define MATROSKA_VERSION  2
 
@@ -120,7 +120,7 @@ MATROSKA_DLL matroska_cuepoint *MATROSKA_CuesGetTimestampStart(const ebml_elemen
 
 #if defined(CONFIG_EBML_WRITING)
 MATROSKA_DLL MatroskaTrackEncodingCompAlgo MATROSKA_TrackGetBlockCompression(const matroska_trackentry *TrackEntry, int ForProfile);
-MATROSKA_DLL bool_t MATROSKA_TrackSetCompressionZlib(matroska_trackentry *TrackEntry, int Scope, int ForProfile);
+MATROSKA_DLL bool_t MATROSKA_TrackSetCompressionAlgo(matroska_trackentry *TrackEntry, MatroskaContentEncodingScope Scope, int ForProfile, MatroskaTrackEncodingCompAlgo algo);
 MATROSKA_DLL bool_t MATROSKA_TrackSetCompressionHeader(matroska_trackentry *TrackEntry, const uint8_t *Header, size_t HeaderSize, int ForProfile);
 MATROSKA_DLL bool_t MATROSKA_TrackSetCompressionNone(matroska_trackentry *TrackEntry);
 #if defined(CONFIG_ZLIB)