Sync upstream/master to fork

.github/workflows/ci.yml

@@ -0,0 +1,57 @@
+# CI Workflow for Bento4
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Bento4 Build ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+        include:
+          - os: ubuntu-latest
+            CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release
+            CMAKE_OUTPUT_SUBDIR: x86_64-unknown-linux
+            PYTHON3_COMMAND: python3  
+          - os: macos-latest
+            CMAKE_OPTIONS: -G Xcode
+            CMAKE_OUTPUT_SUBDIR: universal-apple-macosx
+            PYTHON3_COMMAND: python3  
+          - os: windows-latest
+            CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release
+            CMAKE_OUTPUT_SUBDIR: x86_64-microsoft-win32
+            PYTHON3_COMMAND: py  
+
+    steps:
+      # Check out the repository under $GITHUB_WORKSPACE, so that the jobs can access it
+      - uses: actions/checkout@v2
+
+      # CMake Build
+      - name: Release Build with CMake
+        run: |
+          mkdir cmakebuild
+          cd cmakebuild
+          mkdir ${{matrix.CMAKE_OUTPUT_SUBDIR}}
+          cd ${{matrix.CMAKE_OUTPUT_SUBDIR}}
+          cmake ${{matrix.CMAKE_OPTIONS}} ../..
+          cmake --build . --config Release
+
+      # Create SDK
+      - name: Create SDK
+        if: github.event_name == 'push'
+        run: ${{matrix.PYTHON3_COMMAND}} Scripts/SdkPackager.py
+
+      # Upload the SDK
+      - name: Upload SDK
+        if: github.event_name == 'push'
+        uses: actions/upload-artifact@v2
+        with:
+          path: SDK/*.zip

.github/workflows/codeql.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 }}"

.gitignore

@@ -17,18 +17,41 @@ Build/Targets/x86-microsoft-win32-vs2012/**/Release
 Build/Targets/x86-microsoft-win32-vs2012/**/*.suo
 Build/Targets/x86-microsoft-win32-vs2012/**/*.user
 Build/Targets/x86-microsoft-win32-vs2012/**/*.sdf
+Build/Targets/x86-microsoft-win32-vs2015/**/Debug
+Build/Targets/x86-microsoft-win32-vs2015/**/Release
+Build/Targets/x86-microsoft-win32-vs2015/**/*.suo
+Build/Targets/x86-microsoft-win32-vs2015/**/*.user
+Build/Targets/x86-microsoft-win32-vs2015/**/*.sdf
+Build/Targets/x86_64-microsoft-win32-vs2015/**/Debug/
+Build/Targets/x86_64-microsoft-win32-vs2015/**/Release
+Build/Targets/x86_64-microsoft-win32-vs2019/**/Debug/
+Build/Targets/x86_64-microsoft-win32-vs2019/**/Release
 Build/Targets/universal-apple-macosx/build
 Build/Targets/universal-apple-macosx/Bento4.xcodeproj/xcuserdata
+Build/Targets/universal-apple-Build/Targets/arm-android-linux
+Build/Targets/universal-apple-macosx/cov-int
+Build/Targets/universal-apple-macosx/Bento4.xcodeproj/xcshareddata
 Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.xcworkspace/xcuserdata
 .svn
 .sconsign.dblite
 Bento4.xccheckout
-Build/Targets/arm-android-linux
-Build/Targets/universal-apple-macosx/cov-int
 Bento4.xcscmblueprint
 Build/Targets/cmake
 dist
 lib
 shaka-player.uncompiled.js
 third_party
 .suo
+*.db
+*.user
+.vscode
+*.sdf
+*.opendb
+IDEWorkspaceChecks.plist
+.scannerwork
+Test/Output
+.coverage
+coverage_html
+Test/Output
+Build/Targets/x86_64-microsoft-win32-vs2019/.vs
+Documents/MkDocs/site

.lgtm.yml

@@ -0,0 +1,6 @@
+path_classifiers:
+    docs:
+        - Documents
+
+    test:
+        - Test

.travis.yml

@@ -0,0 +1,19 @@
+language: cpp
+
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.2  
+      env: 
+        - BUILD_DIR=Build/Targets/universal-apple-macosx
+        - BUILD_SCRIPT="xcodebuild -target All -configuration Release"
+
+    - os: linux
+      env:
+        - BUILD_DIR=. 
+        - BUILD_SCRIPT="mkdir cmakebuild && cd cmakebuild && cmake -DCMAKE_BUILD_TYPE=Release .. && make"
+
+script: 
+  - cd $BUILD_DIR
+  - eval "${BUILD_SCRIPT}"
+

Build/Build.scons

@@ -156,10 +156,9 @@ LibraryModule(name               = 'Bento4',
               build_source_files = env['AP4_SYSTEM_SOURCES'],
               included_modules   = 'Config')
 
-for name in ['Mp4Dump', 'Mp4Info', 'Mp4Edit', 'Mp4Encrypt', 'Mp4Decrypt', 'Mp4Tag', 'Mp4Extract', 'Mp4RtpHintInfo', 'Mp42Aac', 'Mp42Avc', 'Mp42Hevc', 'Mp42Ts', 'Mp42Hls', 'Mp4DcfPackager', 'Mp4Fragment', 'Mp4Compact', 'Mp4Split', 'Mp4AudioClip', 'Mp4Mux', 'AvcInfo', 'HevcInfo']:
-    Executable(name, source_dir='C++/Apps/'+name)
+for dir in GlobSources('C++/Apps', ['*']):
+    Executable(os.path.basename(dir), source_dir=dir)
 
-Executable('Aac2Mp4', source_dir='C++/Apps/Aac2Mp4')
 Executable('CryptoTest', source_dir='C++/Test/Crypto')
 Executable('AvcTrackWriterTest', source_dir='C++/Test/Avc')
 Executable('PassthroughWriterTest', source_dir='C++/Test/PassthroughWriter')

Build/Docker/Dockerfile

@@ -0,0 +1,36 @@
+FROM alpine:latest
+
+# Setup environment variables
+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
+
+# Copy Sources
+COPY ./ /tmp/bento4
+
+# Build
+RUN rm -rf /tmp/bento4/cmakebuild && mkdir -p /tmp/bento4/cmakebuild/x86_64-unknown-linux && cd /tmp/bento4/cmakebuild/x86_64-unknown-linux && cmake -DCMAKE_BUILD_TYPE=Release ../.. && make
+
+# Install
+RUN cd /tmp/bento4 && python3 Scripts/SdkPackager.py x86_64-unknown-linux . cmake && mkdir /opt/bento4 && mv /tmp/bento4/SDK/Bento4-SDK-*.x86_64-unknown-linux/* /opt/bento4
+
+# === Second Stage ===
+FROM alpine:latest
+ARG BENTO4_VERSION
+LABEL "com.example.vendor"="Axiomatic Systems, LLC."
+LABEL version=$BENTO4_VERSION
+LABEL maintainer="[email protected]"
+
+# Setup environment variables
+ENV PATH=/opt/bento4/bin:${PATH}
+
+# Install Dependencies
+RUN apk --no-cache add ca-certificates bash python3 libstdc++
+
+# Copy Binaries
+COPY --from=0 /opt/bento4 /opt/bento4
+
+WORKDIR /opt/bento4
+
+CMD ["bash"]

Build/Docker/Dockerfile.dev

@@ -0,0 +1,27 @@
+# Docker file used to create an environment with which to build a release
+
+FROM ubuntu:bionic
+
+# Install Dependencies
+# Upgrade any ubuntu packages
+RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+    build-essential \
+    cmake \
+    python3 \
+    python3-pip \
+    git &&\
+    pip3 install invoke &&\
+    update-alternatives --install /usr/bin/python python /usr/bin/python3 1 &&\
+    update-alternatives --set python /usr/bin/python3
+
+# Add a user
+ARG USER=bento4
+ARG UID=1000
+ARG GID=1000
+RUN useradd -m ${USER} --uid=${UID}
+
+# Run as the user we have setup
+USER ${UID}:${GID}
+WORKDIR /home/${USER}
+
+CMD ["bash"]

Build/Docker/arm.Dockerfile

@@ -0,0 +1,36 @@
+FROM arm64v8/alpine:latest
+
+# Setup environment variables
+ENV BENTO4_VERSION 1.6.0-639
+
+# Install Dependencies
+RUN apk update && apk add --no-cache ca-certificates bash python3 make cmake gcc g++ git
+
+# Copy Sources
+COPY ./ /tmp/bento4
+
+# Build
+RUN rm -rf /tmp/bento4/cmakebuild && mkdir -p /tmp/bento4/cmakebuild/arm64-unknown-linux && cd /tmp/bento4/cmakebuild/arm64-unknown-linux && cmake -DCMAKE_BUILD_TYPE=Release ../.. && make -j$(nproc)
+
+# Install
+RUN cd /tmp/bento4 && python3 Scripts/SdkPackager.py arm64-unknown-linux . cmake && mkdir /opt/bento4 && mv /tmp/bento4/SDK/Bento4-SDK-*.arm64-unknown-linux/* /opt/bento4
+
+# === Second Stage ===
+FROM arm64v8/alpine:latest
+ARG BENTO4_VERSION
+LABEL "com.example.vendor"="Axiomatic Systems, LLC."
+LABEL version=$BENTO4_VERSION
+LABEL maintainer="[email protected]"
+
+# Setup environment variables
+ENV PATH=/opt/bento4/bin:${PATH}
+
+# Install Dependencies
+RUN apk --no-cache add ca-certificates bash python3 libstdc++
+
+# Copy Binaries
+COPY --from=0 /opt/bento4 /opt/bento4
+
+WORKDIR /opt/bento4
+
+CMD ["bash"]

Build/Makefiles/Lib.mak

@@ -13,6 +13,8 @@ CORE_SOURCES = 								\
     Ap4AtomFactory.cpp                      \
     Ap4AtomSampleTable.cpp                  \
     Ap4AvccAtom.cpp                         \
+    Ap4VpccAtom.cpp                         \
+    Ap4Av1cAtom.cpp                         \
     Ap4ByteStream.cpp                       \
     Ap4Co64Atom.cpp                         \
     Ap4ContainerAtom.cpp                    \
@@ -112,17 +114,23 @@ CORE_SOURCES = 								\
     Ap4TencAtom.cpp							\
     Ap4TfdtAtom.cpp                         \
     Ap4PdinAtom.cpp                         \
+    Ap4Ac4Utils.cpp                         \
     Ap4AinfAtom.cpp                         \
     Ap4BlocAtom.cpp                         \
     Ap4PsshAtom.cpp			                \
     Ap4Dec3Atom.cpp                         \
+    Ap4Dac4Atom.cpp                         \
+    Ap4Dac3Atom.cpp                         \
     Ap4SidxAtom.cpp                         \
     Ap4HvccAtom.cpp                         \
     Ap4DvccAtom.cpp                         \
     Ap4SgpdAtom.cpp                         \
     Ap4SbgpAtom.cpp                         \
     Ap4NalParser.cpp                        \
+    Ap4Ac4Parser.cpp                        \
     Ap4AvcParser.cpp                        \
+    Ap4Ac3Parser.cpp                        \
+    Ap4Eac3Parser.cpp                       \
     Ap4HevcParser.cpp                       \
     Ap4SegmentBuilder.cpp                   \
 

Build/Makefiles/Mp4IframeIndex.mak

@@ -0,0 +1,35 @@
+##########################################################################
+#
+#    Mp4Info Program
+#
+#    (c) 2002-2008 Axiomatic Systems, LLC
+#
+##########################################################################
+all: mp4iframeindex
+
+##########################################################################
+# includes
+##########################################################################
+include $(BUILD_ROOT)/Makefiles/Lib.exp
+
+##########################################################################
+# targets
+##########################################################################
+TARGET_SOURCES = Mp4IframeIndex.cpp
+
+##########################################################################
+# make path
+##########################################################################
+VPATH += $(SOURCE_ROOT)/Apps/Mp4IframeIndex
+
+##########################################################################
+# includes
+##########################################################################
+include $(BUILD_ROOT)/Makefiles/Rules.mak
+
+##########################################################################
+# rules
+##########################################################################
+mp4iframeindex: $(TARGET_OBJECTS) $(TARGET_LIBRARY_FILES)
+	$(LINK) $(TARGET_OBJECTS) -o $@ $(LINK_LIBRARIES)
+

Build/Makefiles/TopLevel.mak

@@ -47,9 +47,9 @@ export LIBRARIES_CPP
 .PHONY: Setup
 Setup:
 	mkdir $(OUTPUT_DIR)
-    
+
 # ------- Apps -----------
-ALL_APPS = mp4dump mp4info mp42aac mp42ts aac2mp4 mp4decrypt mp4encrypt mp4edit mp4extract mp4rtphintinfo mp4tag mp4dcfpackager mp4fragment mp4compact mp4split mp4mux avcinfo hevcinfo mp42hevc mp42hls
+ALL_APPS = mp4dump mp4info mp42aac mp42ts aac2mp4 mp4decrypt mp4encrypt mp4edit mp4extract mp4rtphintinfo mp4tag mp4dcfpackager mp4fragment mp4compact mp4split mp4mux avcinfo hevcinfo mp42hevc mp42hls mp4iframeindex
 export ALL_APPS
 
 ##################################################################
@@ -72,7 +72,7 @@ apps: $(ALL_APPS)
 sdk: lib apps
 	$(TITLE)
 	@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/SDK.mak
-   
+
 mp4dump: lib
 	$(TITLE)
 	@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp4Dump.mak
@@ -132,7 +132,7 @@ mp4split: lib
 mp4compact: lib
 	$(TITLE)
 	@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp4Compact.mak
-	
+
 mp4mux: lib
 	$(TITLE)
 	@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp4Mux.mak
@@ -153,6 +153,10 @@ mp42hls: lib
 	$(TITLE)
 	@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp42Hls.mak
 
+mp4iframeindex: lib
+	$(TITLE)
+	@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp4IframeIndex.mak
+
 ##################################################################
 # includes
 ##################################################################