Merge branch 'master' into dolby/dovi_dash

Author: XingzhaoYun

.github/LICENSE

@@ -52,6 +52,6 @@ jobs:
       # Upload the SDK
       - name: Upload SDK
         if: github.event_name == 'push'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: SDK/*.zip

.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: "58 23 * * 4"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript, cpp, python ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"

.github/workflows/codeql.yml

@@ -1,7 +1,7 @@
 FROM alpine:latest
 
 # Setup environment variables
-ENV BENTO4_VERSION 1.6.0-639
+ENV BENTO4_VERSION 1.6.0-641
 
 # Install Dependencies
 RUN apk update && apk add --no-cache ca-certificates bash python3 make cmake gcc g++ git

Build/Docker/Dockerfile

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -1141,7 +1141,7 @@
 		CA86EEE419A95E30008A3B00 /* FragmentCreatorTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FragmentCreatorTest.cpp; sourceTree = "<group>"; };
 		CA87B9421F81B08B005F42D6 /* mp4diff */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mp4diff; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA87B94C1F81B122005F42D6 /* Mp4Diff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mp4Diff.cpp; sourceTree = "<group>"; };
-		CA87B9521F895A84005F42D6 /* Mp4IframeIndex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = Mp4IframeIndex; path = mp4iframeindex; sourceTree = BUILT_PRODUCTS_DIR; };
+		CA87B9521F895A84005F42D6 /* mp4iframeindex */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mp4iframeindex; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA87B95D1F895B14005F42D6 /* Mp4IframeIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mp4IframeIndex.cpp; sourceTree = "<group>"; };
 		CA8A94CE1929A65E00836179 /* mp4mux */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mp4mux; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA8A94DB1929A6C100836179 /* Mp4Mux.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mp4Mux.cpp; sourceTree = "<group>"; };
@@ -1803,7 +1803,7 @@
 				CAE1FBF61AF8493E00607B3C /* mp42hls */,
 				CAFE9C691D1B487700F9FF67 /* LargeFilesTest */,
 				CA87B9421F81B08B005F42D6 /* mp4diff */,
-				CA87B9521F895A84005F42D6 /* Mp4IframeIndex */,
+				CA87B9521F895A84005F42D6 /* mp4iframeindex */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -3082,7 +3082,7 @@
 			);
 			name = Mp4IframeIndex;
 			productName = Mp4IframeIndex;
-			productReference = CA87B9521F895A84005F42D6 /* Mp4IframeIndex */;
+			productReference = CA87B9521F895A84005F42D6 /* mp4iframeindex */;
 			productType = "com.apple.product-type.tool";
 		};
 		CA8A94CD1929A65E00836179 /* Mp4Mux */ = {
@@ -3419,7 +3419,7 @@
 				};
 			};
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "Bento4" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -4392,10 +4392,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
-				VALID_ARCHS = "i386 x86_64";
+				VALID_ARCHS = "arm64 arm64e i386 x86_64";
 				"VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7 armv7s arm64";
 				"VALID_ARCHS[sdk=iphonesimulator*]" = "i386 x86_64";
 			};
@@ -4434,10 +4434,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
-				VALID_ARCHS = "i386 x86_64";
+				VALID_ARCHS = "arm64 arm64e i386 x86_64";
 				"VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7 armv7s arm64";
 				"VALID_ARCHS[sdk=iphonesimulator*]" = "i386 x86_64";
 			};
@@ -4735,6 +4735,7 @@
 		CA646AF50CE97CEE009699D7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				PRODUCT_NAME = mp4decrypt;
 				SUPPORTED_PLATFORMS = macosx;
 			};
@@ -4743,6 +4744,7 @@
 		CA646AF60CE97CEE009699D7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				PRODUCT_NAME = mp4decrypt;
 				SUPPORTED_PLATFORMS = macosx;
 			};
@@ -4960,7 +4962,6 @@
 				);
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = mp4diff;
@@ -4992,7 +4993,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = mp4diff;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5026,7 +5026,6 @@
 				);
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = mp4iframeindex;
@@ -5056,7 +5055,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = mp4iframeindex;
 				SDKROOT = macosx;
@@ -5516,7 +5514,6 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -5554,7 +5551,6 @@
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;

Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.pbxproj

@@ -0,0 +1,9 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+
+Name: @PROJECT_NAME@
+Description: Full-featured MP4 format, MPEG DASH, HLS, CMAF SDK and tools
+Version: @BENTO4_VERSION@
+Libs: -L${libdir} -lap4
+Cflags: -I${includedir}/bento4

Build/pkgconfig/bento4.pc.in

@@ -14,6 +14,7 @@ function(get_bento4_version)
 endfunction()
 
 get_bento4_version()
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "")
 project(bento4 VERSION "${BENTO4_VERSION}")
 
 # Variables
@@ -70,7 +71,12 @@ file(GLOB AP4_HEADERS
   ${SOURCE_METADATA}/*.h
 )
 
-add_library(ap4 STATIC ${AP4_SOURCES})
+option(BUILD_SHARED_LIBRARY "Build as a shared library" OFF)
+if(BUILD_SHARED_LIBRARY)
+  add_library(ap4 SHARED ${AP4_SOURCES})
+else()
+  add_library(ap4 STATIC ${AP4_SOURCES})
+endif()
 target_include_directories(ap4 PUBLIC
   ${AP4_INCLUDE_DIRS}
 )
@@ -118,6 +124,12 @@ configure_package_config_file(
     INSTALL_DESTINATION "${config_install_dir}"
 )
 
+configure_file(
+    "Build/pkgconfig/bento4.pc.in"
+    "${generated_dir}/bento4.pc"
+    @ONLY
+)
+
 install(
     TARGETS ap4 ${BENTO4_APPS_LOWERCASE}
     EXPORT "${TARGETS_EXPORT_NAME}"
@@ -137,6 +149,11 @@ install(
     DESTINATION "${config_install_dir}"
 )
 
+install(
+    FILES "${generated_dir}/bento4.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
 install(
     EXPORT "${TARGETS_EXPORT_NAME}"
     NAMESPACE "${namespace}"

CMakeLists.txt

@@ -1,5 +1,5 @@
 # This requirements file is for python3
-mkdocs == 1.1
+mkdocs == 1.2.3
 mkdocs-material == 7.1.5
 mkdocs-material-extensions == 1.0
-pymdown-extensions == 7.0
+pymdown-extensions == 10.0

Documents/MkDocs/requirements.txt

@@ -157,6 +157,7 @@ Setting stream properties via input specifiers allows invoking `mp4dash` with ex
   `hls_group_match`   | `<hls-group-match>`                       | (only with `--hls`) |
   `hls_default`       | `YES` or `NO`                             | (only with `--hls`) |
   `hls_autoselect`    | `YES` or `NO`                             | (only with `--hls`) |
+  `hls_characteristic`| `<hls-characteristic>` (string)           | (only with `--hls`) |
 
 ### Multi-language
 

Documents/MkDocs/src/developers/dash/index.md

@@ -5,9 +5,9 @@ DOWNLOADS
 
 As a convenience, we publish here the most recent version of the binary releases (SDK with header files, libraries and command line applications) for the most common platforms, and the corresponding source snapshot.
 
-## Version 1.6.0-639
+## Version 1.6.0-641
 
-:fontawesome-brands-windows:   [Binaries for Windows 10](https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-639.x86_64-microsoft-win32.zip)  
-:fontawesome-brands-apple:   [Binaries for macOS](https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-639.universal-apple-macosx.zip)  
-:fontawesome-brands-linux:   [Binaries for Linux x86_64](https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-639.x86_64-unknown-linux.zip)  
-:fontawesome-solid-code:   [Source Snapshot (all platforms)](https://www.bok.net/Bento4/source/Bento4-SRC-1-6-0-639.zip)  
+:fontawesome-brands-windows:   [Binaries for Windows 10](https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-641.x86_64-microsoft-win32.zip)  
+:fontawesome-brands-apple:   [Binaries for macOS](https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-641.universal-apple-macosx.zip)  
+:fontawesome-brands-linux:   [Binaries for Linux x86_64](https://www.bok.net/Bento4/binaries/Bento4-SDK-1-6-0-641.x86_64-unknown-linux.zip)  
+:fontawesome-solid-code:   [Source Snapshot (all platforms)](https://www.bok.net/Bento4/source/Bento4-SRC-1-6-0-641.zip)