Packman Build Service PMBS

Changes of Revision 15

bento4.changes Changed

bento4.spec Changed

bento4-otherarchs.patch Changed

@@ -1,7 +1,7 @@
-Index: Bento4-1.5.0-616/Source/C++/Core/Ap4Config.h
+Index: Bento4-1.6.0-634/Source/C++/Core/Ap4Config.h
 ===================================================================
---- Bento4-1.5.0-616.orig/Source/C++/Core/Ap4Config.h
-+++ Bento4-1.5.0-616/Source/C++/Core/Ap4Config.h
+--- Bento4-1.6.0-634.orig/Source/C++/Core/Ap4Config.h
++++ Bento4-1.6.0-634/Source/C++/Core/Ap4Config.h
 @@ -50,13 +50,13 @@
  #define AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN 1
  
@@ -13,8 +13,8 @@
  #if defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64)
  #define AP4_PLATFORM_BYTE_ORDER AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN
  #endif
--#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__)
-+#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__PPC64LE__)
+-#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
++#elif defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || defined(__PPC64LE__)
  #define AP4_PLATFORM_BYTE_ORDER AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN
  #endif
  #endif

bento4-1.5.1r629.tar.gz/Test/DashTests.py Deleted

bento4-1.5.1r629.tar.gz/Test/Data/test-002.mp4 Deleted

bento4-1.5.1r629.tar.gz/Test/TestSuite Deleted

bento4-1.5.1r629.tar.gz/Test/TestSuite/bento4_tests.py Deleted

bento4-1.6.0r634.tar.gz/.github Added

bento4-1.6.0r634.tar.gz/.github/workflows Added

bento4-1.6.0r634.tar.gz/.github/workflows/ci.yml Added

@@ -0,0 +1,37 @@
+# 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-linux-macos:
+    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
+          - os: macos-latest
+            CMAKE_OPTIONS: -G Xcode
+          - os: windows-latest
+            CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release
+
+    steps:
+      # Checks-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
+          cmake ${{matrix.CMAKE_OPTIONS}} ..
+          cmake --build . --config Release

bento4-1.5.1r629.tar.gz/.gitignore -> bento4-1.6.0r634.tar.gz/.gitignore Changed

@@ -22,14 +22,19 @@
 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
@@ -42,6 +47,9 @@
 .vscode
 *.sdf
 *.opendb
-Build/Targets/x86_64-microsoft-win32-vs2015/**/Debug/
-Build/Targets/x86_64-microsoft-win32-vs2015/**/Release
 IDEWorkspaceChecks.plist
+.scannerwork
+Test/Output
+.coverage
+coverage_html
+Test/Output

bento4-1.5.1r629.tar.gz/.travis.yml -> bento4-1.6.0r634.tar.gz/.travis.yml Changed

bento4-1.6.0r634.tar.gz/Build/Docker Added

bento4-1.6.0r634.tar.gz/Build/Docker/Dockerfile Added

@@ -0,0 +1,36 @@
+FROM alpine:latest
+
+# Setup environment variables
+ENV BENTO4_VERSION 1.5.1-629
+
+# 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 && cd /tmp/bento4/cmakebuild && 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="bok@bok.net"
+
+# 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"]

bento4-1.6.0r634.tar.gz/Build/Docker/Dockerfile.dev Added

bento4-1.5.1r629.tar.gz/Build/Makefiles/Lib.mak -> bento4-1.6.0r634.tar.gz/Build/Makefiles/Lib.mak Changed

bento4-1.5.1r629.tar.gz/Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.pbxproj -> bento4-1.6.0r634.tar.gz/Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.pbxproj Changed

@@ -80,6 +80,10 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		AC28E6BA2389DE05005D9BE9 /* Ap4Dac3Atom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC28E6B82389DE04005D9BE9 /* Ap4Dac3Atom.cpp */; };
+		AC28E6BB2389DE05005D9BE9 /* Ap4Dac3Atom.h in Headers */ = {isa = PBXBuildFile; fileRef = AC28E6B92389DE05005D9BE9 /* Ap4Dac3Atom.h */; };
+		ACB4314823BF9B8F003C0A81 /* Ap4VpccAtom.h in Headers */ = {isa = PBXBuildFile; fileRef = ACB4314623BF9B8F003C0A81 /* Ap4VpccAtom.h */; };
+		ACB4314923BF9B8F003C0A81 /* Ap4VpccAtom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACB4314723BF9B8F003C0A81 /* Ap4VpccAtom.cpp */; };
 		CA00667D1015399A004C0D5F /* Mp42Ts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA00667C1015399A004C0D5F /* Mp42Ts.cpp */; };
 		CA00A65C1A1C38210064B4D3 /* Mp4Pssh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA00A65B1A1C38210064B4D3 /* Mp4Pssh.cpp */; };
 		CA00A6611A1C3BD90064B4D3 /* libBento4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAA7E6C914ACD763008AA54E /* libBento4.a */; };
@@ -1029,6 +1033,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		AC28E6B82389DE04005D9BE9 /* Ap4Dac3Atom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Dac3Atom.cpp; sourceTree = "<group>"; };
+		AC28E6B92389DE05005D9BE9 /* Ap4Dac3Atom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4Dac3Atom.h; sourceTree = "<group>"; };
+		ACB4314623BF9B8F003C0A81 /* Ap4VpccAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4VpccAtom.h; sourceTree = "<group>"; };
+		ACB4314723BF9B8F003C0A81 /* Ap4VpccAtom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4VpccAtom.cpp; sourceTree = "<group>"; };
 		CA00667310153951004C0D5F /* mp42ts */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mp42ts; sourceTree = BUILT_PRODUCTS_DIR; };
 		CA00667C1015399A004C0D5F /* Mp42Ts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mp42Ts.cpp; sourceTree = "<group>"; };
 		CA00A6531A1C36560064B4D3 /* mp4pssh */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mp4pssh; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2074,6 +2082,8 @@
 				CA93661F0B437D030067D50B /* Ap4ContainerAtom.h */,
 				CA9366200B437D040067D50B /* Ap4CttsAtom.cpp */,
 				CA9366210B437D040067D50B /* Ap4CttsAtom.h */,
+				AC28E6B82389DE04005D9BE9 /* Ap4Dac3Atom.cpp */,
+				AC28E6B92389DE05005D9BE9 /* Ap4Dac3Atom.h */,
 				CAA55DAA20F12F3C00CBAA11 /* Ap4Dac4Atom.cpp */,
 				CAA55DA920F12F3C00CBAA11 /* Ap4Dac4Atom.h */,
 				CA9366220B437D040067D50B /* Ap4DataBuffer.cpp */,
@@ -2278,6 +2288,8 @@
 				CA93669D0B437D040067D50B /* Ap4Version.h */,
 				CA93669E0B437D040067D50B /* Ap4VmhdAtom.cpp */,
 				CA93669F0B437D040067D50B /* Ap4VmhdAtom.h */,
+				ACB4314723BF9B8F003C0A81 /* Ap4VpccAtom.cpp */,
+				ACB4314623BF9B8F003C0A81 /* Ap4VpccAtom.h */,
 				CA9CB9BC0F86ABB400063C70 /* Ap48bdlAtom.cpp */,
 				CA9CB9BD0F86ABB400063C70 /* Ap48bdlAtom.h */,
 			);
@@ -2605,6 +2617,7 @@
 				CAD6A7C40F7AFFD800456513 /* Ap4DynamicCast.h in Headers */,
 				CA9CB9BF0F86ABB400063C70 /* Ap48bdlAtom.h in Headers */,
 				CAEFE10F0FB6993D00AF6434 /* Ap4MehdAtom.h in Headers */,
+				AC28E6BB2389DE05005D9BE9 /* Ap4Dac3Atom.h in Headers */,
 				CAEFE1350FB69CF600AF6434 /* Ap4TrexAtom.h in Headers */,
 				CAE724000FC33618008F2905 /* Ap4LinearReader.h in Headers */,
 				CAFC31DA0FEB95F700EF80A0 /* Ap4MovieFragment.h in Headers */,
@@ -2619,6 +2632,7 @@
 				CAA4FF2110B2CBB3009C8F5B /* Ap4Mp4AudioInfo.h in Headers */,
 				CA39215F13AC0B36006718F0 /* Ap4Stz2Atom.h in Headers */,
 				CA5733B813B27B7500953446 /* Ap4TfdtAtom.h in Headers */,
+				ACB4314823BF9B8F003C0A81 /* Ap4VpccAtom.h in Headers */,
 				CA5733E913B3AB0A00953446 /* Ap4CommonEncryption.h in Headers */,
 				CA57340C13B3B9C000953446 /* Ap4TencAtom.h in Headers */,
 				CA5734ED13B5DBB100953446 /* Ap4SaioAtom.h in Headers */,
@@ -3743,6 +3757,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CA9366A20B437D040067D50B /* Ap4Atom.cpp in Sources */,
+				ACB4314923BF9B8F003C0A81 /* Ap4VpccAtom.cpp in Sources */,
 				CA9366A40B437D040067D50B /* Ap4AtomFactory.cpp in Sources */,
 				CA9366A60B437D040067D50B /* Ap4AtomSampleTable.cpp in Sources */,
 				CA9366A80B437D040067D50B /* Ap4ByteStream.cpp in Sources */,
@@ -3791,6 +3806,7 @@
 				CA9367000B437D040067D50B /* Ap4SampleEntry.cpp in Sources */,
 				CA9367020B437D040067D50B /* Ap4SampleTable.cpp in Sources */,
 				CAEE5E7A1CC69FED0094DF0D /* Ap4DvccAtom.cpp in Sources */,
+				AC28E6BA2389DE05005D9BE9 /* Ap4Dac3Atom.cpp in Sources */,
 				CA9367040B437D040067D50B /* Ap4SchmAtom.cpp in Sources */,
 				CA9367060B437D040067D50B /* Ap4SdpAtom.cpp in Sources */,
 				CA9367080B437D040067D50B /* Ap4SLConfigDescriptor.cpp in Sources */,

bento4-1.6.0r634.tar.gz/Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.xcworkspace/xcshareddata Added

bento4-1.6.0r634.tar.gz/Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Added

bento4-1.5.1r629.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj -> bento4-1.6.0r634.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj Changed

@@ -90,6 +90,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dec3Atom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.cpp" />
@@ -105,6 +106,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Stz2Atom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Atom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AtomFactory.cpp" />
@@ -218,6 +220,7 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dec3Atom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.h" />
@@ -232,6 +235,7 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Stz2Atom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Array.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Atom.h" />

bento4-1.5.1r629.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj.filters -> bento4-1.6.0r634.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj.filters Changed

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019 Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Aac2Mp4 Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Aac2Mp4/Aac2Mp4.vcxproj Added

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2FCE14C9-42A9-4335-96EF-8B52A321720E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Aac2Mp4.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Aac2Mp4.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Aac2Mp4\Aac2Mp4.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Aac2Mp4/Aac2Mp4.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/AvcTrackWriterTest Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/AvcTrackWriterTest/AvcTrackWriterTest.vcxproj Added

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FA13F082-633C-4DAD-B282-6B0E1BDD3412}</ProjectGuid>
+    <RootNamespace>AvcTrackWriterTest</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\Avc\AvcTrackWriterTest.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/AvcTrackWriterTest/AvcTrackWriterTest.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\Avc\AvcTrackWriterTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4 Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4.sln Added

@@ -0,0 +1,334 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp42Aac", "Mp42Aac\Mp42Aac.vcxproj", "{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Tag", "Mp4Tag\Mp4Tag.vcxproj", "{73804182-47BC-4885-898D-939CA8672828}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aac2Mp4", "Aac2Mp4\Aac2Mp4.vcxproj", "{2FCE14C9-42A9-4335-96EF-8B52A321720E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Dump", "Mp4Dump\Mp4Dump.vcxproj", "{602F1304-0BE4-4C48-983E-9A4F84BD1585}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Info", "Mp4Info\Mp4Info.vcxproj", "{52A6B013-A542-4F5C-838E-F582CC6EF903}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Decrypt", "Mp4Decrypt\Mp4Decrypt.vcxproj", "{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Encrypt", "Mp4Encrypt\Mp4Encrypt.vcxproj", "{D467C78F-53CD-4AE8-82D4-BAE42530262B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Edit", "Mp4Edit\Mp4Edit.vcxproj", "{1B0690B7-BD89-4F6E-9C4A-A76682898963}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Extract", "Mp4Extract\Mp4Extract.vcxproj", "{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4RtpHintInfo", "Mp4RtpHintInfo\Mp4RtpHintInfo.vcxproj", "{D100E130-718D-4060-ACD9-1061A159DD79}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CryptoTest", "CryptoTest\CryptoTest.vcxproj", "{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bento4", "Bento4\Bento4.vcxproj", "{A714AA1C-45A9-403D-A6E1-020E520119A2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4DcfPackager", "Mp4DcfPackager\Mp4DcfPackager.vcxproj", "{9B072842-1D3B-4CAD-B7AE-E41E545EC420}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvcTrackWriterTest", "AvcTrackWriterTest\AvcTrackWriterTest.vcxproj", "{FA13F082-633C-4DAD-B282-6B0E1BDD3412}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PassthroughWriterTest", "PassthroughWriterTest\PassthroughWriterTest.vcxproj", "{B031A581-FDE5-4CDC-A124-573F6EECB54A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FixAacSampleDescription", "FixAacSampleDescription\FixAacSampleDescription.vcxproj", "{23C9BE84-E4D3-4F06-9188-533991022D48}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A714AA1C-45A9-403D-A6E1-020E520119A2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bento4CDll", "Bento4CDll\Bento4CDll.vcxproj", "{505B443B-5C00-4CB1-BF00-76F41DECE37F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp42Ts", "Mp42Ts\Mp42Ts.vcxproj", "{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Fragment", "Mp4Fragment\Mp4Fragment.vcxproj", "{17C36906-6E20-4458-AEC9-66A9473A9F40}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Compact", "Mp4Compact\Mp4Compact.vcxproj", "{34B27941-7DE3-42D9-BBEF-F5BB4901C103}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{92E4C2EB-ED44-4B47-805D-CC272C8838EB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FAE70B4A-0D9D-4748-9DED-991D4101AE93}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{A46ED050-6EE4-42DD-A62C-52FAD672BE2E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Split", "Mp4Split\Mp4Split.vcxproj", "{129909F3-DB70-43CE-B38F-52D6A0E23966}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp4Mux", "Mp4Mux\Mp4Mux.vcxproj", "{21D87376-66A7-46B9-9B20-5551924E5974}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FragmentBuilderTest", "FragmentBuilderTest\FragmentBuilderTest.vcxproj", "{ADC04793-9F45-40BD-8461-88411663A470}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mp42Hls", "Mp42Hls\Mp42Hls.vcxproj", "{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Debug|Win32.Build.0 = Debug|Win32
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Debug|x64.ActiveCfg = Debug|x64
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Debug|x64.Build.0 = Debug|x64
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Release|Win32.ActiveCfg = Release|Win32
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Release|Win32.Build.0 = Release|Win32
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Release|x64.ActiveCfg = Release|x64
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}.Release|x64.Build.0 = Release|x64
+		{73804182-47BC-4885-898D-939CA8672828}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73804182-47BC-4885-898D-939CA8672828}.Debug|Win32.Build.0 = Debug|Win32
+		{73804182-47BC-4885-898D-939CA8672828}.Debug|x64.ActiveCfg = Debug|x64
+		{73804182-47BC-4885-898D-939CA8672828}.Debug|x64.Build.0 = Debug|x64
+		{73804182-47BC-4885-898D-939CA8672828}.Release|Win32.ActiveCfg = Release|Win32
+		{73804182-47BC-4885-898D-939CA8672828}.Release|Win32.Build.0 = Release|Win32
+		{73804182-47BC-4885-898D-939CA8672828}.Release|x64.ActiveCfg = Release|x64
+		{73804182-47BC-4885-898D-939CA8672828}.Release|x64.Build.0 = Release|x64
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Debug|Win32.Build.0 = Debug|Win32
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Debug|x64.ActiveCfg = Debug|x64
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Debug|x64.Build.0 = Debug|x64
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Release|Win32.ActiveCfg = Release|Win32
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Release|Win32.Build.0 = Release|Win32
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Release|x64.ActiveCfg = Release|x64
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E}.Release|x64.Build.0 = Release|x64
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Debug|Win32.ActiveCfg = Debug|Win32
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Debug|Win32.Build.0 = Debug|Win32
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Debug|x64.ActiveCfg = Debug|x64
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Debug|x64.Build.0 = Debug|x64
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Release|Win32.ActiveCfg = Release|Win32
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Release|Win32.Build.0 = Release|Win32
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Release|x64.ActiveCfg = Release|x64
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585}.Release|x64.Build.0 = Release|x64
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Debug|Win32.ActiveCfg = Debug|Win32
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Debug|Win32.Build.0 = Debug|Win32
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Debug|x64.ActiveCfg = Debug|x64
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Debug|x64.Build.0 = Debug|x64
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Release|Win32.ActiveCfg = Release|Win32
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Release|Win32.Build.0 = Release|Win32
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Release|x64.ActiveCfg = Release|x64
+		{52A6B013-A542-4F5C-838E-F582CC6EF903}.Release|x64.Build.0 = Release|x64
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Debug|Win32.Build.0 = Debug|Win32
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Debug|x64.ActiveCfg = Debug|x64
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Debug|x64.Build.0 = Debug|x64
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Release|Win32.ActiveCfg = Release|Win32
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Release|Win32.Build.0 = Release|Win32
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Release|x64.ActiveCfg = Release|x64
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}.Release|x64.Build.0 = Release|x64
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Debug|Win32.Build.0 = Debug|Win32
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Debug|x64.ActiveCfg = Debug|x64
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Debug|x64.Build.0 = Debug|x64
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Release|Win32.ActiveCfg = Release|Win32
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Release|Win32.Build.0 = Release|Win32
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Release|x64.ActiveCfg = Release|x64
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B}.Release|x64.Build.0 = Release|x64
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Debug|Win32.Build.0 = Debug|Win32
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Debug|x64.ActiveCfg = Debug|x64
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Debug|x64.Build.0 = Debug|x64
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Release|Win32.ActiveCfg = Release|Win32
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Release|Win32.Build.0 = Release|Win32
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Release|x64.ActiveCfg = Release|x64
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963}.Release|x64.Build.0 = Release|x64
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Debug|Win32.Build.0 = Debug|Win32
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Debug|x64.ActiveCfg = Debug|x64
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Debug|x64.Build.0 = Debug|x64
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Release|Win32.ActiveCfg = Release|Win32
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Release|Win32.Build.0 = Release|Win32
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Release|x64.ActiveCfg = Release|x64
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}.Release|x64.Build.0 = Release|x64
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Debug|Win32.Build.0 = Debug|Win32
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Debug|x64.ActiveCfg = Debug|x64
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Debug|x64.Build.0 = Debug|x64
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Release|Win32.ActiveCfg = Release|Win32
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Release|Win32.Build.0 = Release|Win32
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Release|x64.ActiveCfg = Release|x64
+		{D100E130-718D-4060-ACD9-1061A159DD79}.Release|x64.Build.0 = Release|x64
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Debug|Win32.Build.0 = Debug|Win32
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Debug|x64.ActiveCfg = Debug|x64
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Debug|x64.Build.0 = Debug|x64
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Release|Win32.ActiveCfg = Release|Win32
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Release|Win32.Build.0 = Release|Win32
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Release|x64.ActiveCfg = Release|x64
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}.Release|x64.Build.0 = Release|x64
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Debug|Win32.Build.0 = Debug|Win32
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Debug|x64.ActiveCfg = Debug|x64
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Debug|x64.Build.0 = Debug|x64
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Release|Win32.ActiveCfg = Release|Win32
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Release|Win32.Build.0 = Release|Win32
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Release|x64.ActiveCfg = Release|x64
+		{A714AA1C-45A9-403D-A6E1-020E520119A2}.Release|x64.Build.0 = Release|x64
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Debug|Win32.Build.0 = Debug|Win32
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Debug|x64.ActiveCfg = Debug|x64
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Debug|x64.Build.0 = Debug|x64
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Release|Win32.ActiveCfg = Release|Win32
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Release|Win32.Build.0 = Release|Win32
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Release|x64.ActiveCfg = Release|x64
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420}.Release|x64.Build.0 = Release|x64
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Debug|Win32.Build.0 = Debug|Win32
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Debug|x64.ActiveCfg = Debug|x64
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Debug|x64.Build.0 = Debug|x64
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Release|Win32.ActiveCfg = Release|Win32
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Release|Win32.Build.0 = Release|Win32
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Release|x64.ActiveCfg = Release|x64
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412}.Release|x64.Build.0 = Release|x64
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Debug|Win32.Build.0 = Debug|Win32
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Debug|x64.ActiveCfg = Debug|x64
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Debug|x64.Build.0 = Debug|x64
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Release|Win32.ActiveCfg = Release|Win32
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Release|Win32.Build.0 = Release|Win32
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Release|x64.ActiveCfg = Release|x64
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A}.Release|x64.Build.0 = Release|x64
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Debug|Win32.ActiveCfg = Debug|Win32
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Debug|Win32.Build.0 = Debug|Win32
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Debug|x64.ActiveCfg = Debug|x64
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Debug|x64.Build.0 = Debug|x64
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Release|Win32.ActiveCfg = Release|Win32
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Release|Win32.Build.0 = Release|Win32
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Release|x64.ActiveCfg = Release|x64
+		{23C9BE84-E4D3-4F06-9188-533991022D48}.Release|x64.Build.0 = Release|x64
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Debug|Win32.Build.0 = Debug|Win32
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Debug|x64.ActiveCfg = Debug|x64
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Debug|x64.Build.0 = Debug|x64
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Release|Win32.ActiveCfg = Release|Win32
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Release|Win32.Build.0 = Release|Win32
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Release|x64.ActiveCfg = Release|x64
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F}.Release|x64.Build.0 = Release|x64
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Debug|Win32.Build.0 = Debug|Win32
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Debug|x64.ActiveCfg = Debug|x64
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Debug|x64.Build.0 = Debug|x64
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Release|Win32.ActiveCfg = Release|Win32
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Release|Win32.Build.0 = Release|Win32
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Release|x64.ActiveCfg = Release|x64
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}.Release|x64.Build.0 = Release|x64
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Debug|Win32.ActiveCfg = Debug|Win32
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Debug|Win32.Build.0 = Debug|Win32
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Debug|x64.ActiveCfg = Debug|x64
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Debug|x64.Build.0 = Debug|x64
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Release|Win32.ActiveCfg = Release|Win32
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Release|Win32.Build.0 = Release|Win32
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Release|x64.ActiveCfg = Release|x64
+		{17C36906-6E20-4458-AEC9-66A9473A9F40}.Release|x64.Build.0 = Release|x64
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Debug|Win32.ActiveCfg = Debug|Win32
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Debug|Win32.Build.0 = Debug|Win32
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Debug|x64.ActiveCfg = Debug|x64
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Debug|x64.Build.0 = Debug|x64
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Release|Win32.ActiveCfg = Release|Win32
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Release|Win32.Build.0 = Release|Win32
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Release|x64.ActiveCfg = Release|x64
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103}.Release|x64.Build.0 = Release|x64
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Debug|Win32.ActiveCfg = Debug|Win32
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Debug|Win32.Build.0 = Debug|Win32
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Debug|x64.ActiveCfg = Debug|x64
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Debug|x64.Build.0 = Debug|x64
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Release|Win32.ActiveCfg = Release|Win32
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Release|Win32.Build.0 = Release|Win32
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Release|x64.ActiveCfg = Release|x64
+		{129909F3-DB70-43CE-B38F-52D6A0E23966}.Release|x64.Build.0 = Release|x64
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Debug|Win32.ActiveCfg = Debug|Win32
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Debug|Win32.Build.0 = Debug|Win32
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Debug|x64.ActiveCfg = Debug|x64
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Debug|x64.Build.0 = Debug|x64
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Release|Win32.ActiveCfg = Release|Win32
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Release|Win32.Build.0 = Release|Win32
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Release|x64.ActiveCfg = Release|x64
+		{21D87376-66A7-46B9-9B20-5551924E5974}.Release|x64.Build.0 = Release|x64
+		{ADC04793-9F45-40BD-8461-88411663A470}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ADC04793-9F45-40BD-8461-88411663A470}.Debug|Win32.Build.0 = Debug|Win32
+		{ADC04793-9F45-40BD-8461-88411663A470}.Debug|x64.ActiveCfg = Debug|x64
+		{ADC04793-9F45-40BD-8461-88411663A470}.Debug|x64.Build.0 = Debug|x64
+		{ADC04793-9F45-40BD-8461-88411663A470}.Release|Win32.ActiveCfg = Release|Win32
+		{ADC04793-9F45-40BD-8461-88411663A470}.Release|Win32.Build.0 = Release|Win32
+		{ADC04793-9F45-40BD-8461-88411663A470}.Release|x64.ActiveCfg = Release|x64
+		{ADC04793-9F45-40BD-8461-88411663A470}.Release|x64.Build.0 = Release|x64
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Debug|Win32.Build.0 = Debug|Win32
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Debug|x64.ActiveCfg = Debug|x64
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Debug|x64.Build.0 = Debug|x64
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Release|Win32.ActiveCfg = Release|Win32
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Release|Win32.Build.0 = Release|Win32
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Release|x64.ActiveCfg = Release|x64
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{1EA74D37-A069-425F-9E9C-F7F83B1FACBB} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{73804182-47BC-4885-898D-939CA8672828} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{2FCE14C9-42A9-4335-96EF-8B52A321720E} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{602F1304-0BE4-4C48-983E-9A4F84BD1585} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{52A6B013-A542-4F5C-838E-F582CC6EF903} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{D467C78F-53CD-4AE8-82D4-BAE42530262B} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{1B0690B7-BD89-4F6E-9C4A-A76682898963} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{F0B2195A-2027-4FA1-8CE9-F5600764CB4E} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{D100E130-718D-4060-ACD9-1061A159DD79} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{B1B75DB0-46BA-4207-88BA-B62FD2AF8584} = {FAE70B4A-0D9D-4748-9DED-991D4101AE93}
+		{A714AA1C-45A9-403D-A6E1-020E520119A2} = {A46ED050-6EE4-42DD-A62C-52FAD672BE2E}
+		{9B072842-1D3B-4CAD-B7AE-E41E545EC420} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{FA13F082-633C-4DAD-B282-6B0E1BDD3412} = {FAE70B4A-0D9D-4748-9DED-991D4101AE93}
+		{B031A581-FDE5-4CDC-A124-573F6EECB54A} = {FAE70B4A-0D9D-4748-9DED-991D4101AE93}
+		{23C9BE84-E4D3-4F06-9188-533991022D48} = {FAE70B4A-0D9D-4748-9DED-991D4101AE93}
+		{505B443B-5C00-4CB1-BF00-76F41DECE37F} = {A46ED050-6EE4-42DD-A62C-52FAD672BE2E}
+		{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{17C36906-6E20-4458-AEC9-66A9473A9F40} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{34B27941-7DE3-42D9-BBEF-F5BB4901C103} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{129909F3-DB70-43CE-B38F-52D6A0E23966} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{21D87376-66A7-46B9-9B20-5551924E5974} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+		{ADC04793-9F45-40BD-8461-88411663A470} = {FAE70B4A-0D9D-4748-9DED-991D4101AE93}
+		{EA2B1E39-B9F4-4424-A01B-65628E87BEB5} = {92E4C2EB-ED44-4B47-805D-CC272C8838EB}
+	EndGlobalSection
+EndGlobal

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj Added

@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A714AA1C-45A9-403D-A6E1-020E520119A2}</ProjectGuid>
+    <RootNamespace>Bento4</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;AP4_DEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)Bento4.lib</OutputFile>
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;AP4_DEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)Bento4.lib</OutputFile>
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>$(OutDir)Bento4.lib</OutputFile>
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;AP4_PLATFORM_BYTE_ORDER=AP4_PLATFORM_BYTE_ORDER_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+    </ClCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+    </ProjectReference>
+    <Lib>
+      <OutputFile>$(OutDir)Bento4.lib</OutputFile>
+      <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4HevcParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4NalParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap48bdlAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AdtsParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dec3Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HvccAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4PsshAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SaioAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SaizAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SbgpAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SegmentBuilder.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SencAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SgpdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SidxAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Stz2Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AtomFactory.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AtomSampleTable.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AvccAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CttsAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DataBuffer.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Debug.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DecoderConfigDescriptor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DecoderSpecificInfoDescriptor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Descriptor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DescriptorFactory.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DrefAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ElstAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4EsDescriptor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4EsdsAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Expandable.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4File.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FileCopier.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FileWriter.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FragmentSampleTable.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FrmaAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FtypAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4GrpiAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HdlrAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HintTrackReader.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4Hmac.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HmhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IkmsAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IodsAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Ipmp.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IproAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IsfmAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IsltAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IsmaCryp.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4KeyWrap.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4LinearReader.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Marlin.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MdhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MehdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\MetaData\Ap4MetaData.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MfhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MfroAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MoovAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Movie.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MovieFragment.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Mp4AudioInfo.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Mpeg2Ts.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MvhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4NmhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SthdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ObjectDescriptor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OdafAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OddaAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OdheAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OhdrAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OmaDcf.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4PdinAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Piff.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Processor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Protection.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Results.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4RtpAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4RtpHint.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Sample.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleDescription.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleEntry.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleSource.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleTable.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SchmAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SdpAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SLConfigDescriptor.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SmhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StcoAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\System\StdC\Ap4StdCFileByteStream.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4StreamCipher.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4String.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StscAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StsdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StssAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StszAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SttsAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SyntheticSampleTable.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfraAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TimsAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TkhdAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Track.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrakAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrefTypeAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrexAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrunAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4UrlAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Utils.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4UuidAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4HevcParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4NalParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap48bdlAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AdtsParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dec3Atom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4PsshAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SaioAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SaizAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SbgpAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SegmentBuilder.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SencAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SgpdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SidxAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Stz2Atom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Array.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Atom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AtomFactory.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AtomSampleTable.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AvccAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Command.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Config.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Constants.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CttsAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DataBuffer.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Debug.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DecoderConfigDescriptor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DecoderSpecificInfoDescriptor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Descriptor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DescriptorFactory.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DrefAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DynamicCast.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ElstAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4EsDescriptor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4EsdsAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Expandable.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4File.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FileByteStream.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FileCopier.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FileWriter.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FragmentSampleTable.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FrmaAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FtypAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4GrpiAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4HdlrAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4HintTrackReader.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4Hmac.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4HmhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IkmsAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Interfaces.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IodsAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ipmp.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IproAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IsfmAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IsltAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IsmaCryp.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4KeyWrap.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4LinearReader.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4List.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Marlin.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MdhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MehdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\MetaData\Ap4MetaData.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MfhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MfroAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MoovAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Movie.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MovieFragment.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Mp4AudioInfo.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Mpeg2Ts.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MvhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4NmhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SthdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ObjectDescriptor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OdafAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OddaAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OdheAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OhdrAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OmaDcf.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4PdinAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Piff.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Processor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Protection.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Results.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4RtpAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4RtpHint.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Sample.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleDescription.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleEntry.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleSource.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleTable.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SchmAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SdpAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SLConfigDescriptor.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SmhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StcoAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4StreamCipher.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4String.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StscAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StsdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StssAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StszAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SttsAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SyntheticSampleTable.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfraAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TimsAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TkhdAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Track.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrakAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrefTypeAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrexAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrunAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Types.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4UrlAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Utils.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4UuidAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Version.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj.filters Added

@@ -0,0 +1,807 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap48bdlAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AdtsParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AtomFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AtomSampleTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AvccAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CttsAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DataBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Debug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DecoderConfigDescriptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DecoderSpecificInfoDescriptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Descriptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DescriptorFactory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DrefAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ElstAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4EsDescriptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4EsdsAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Expandable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4File.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FileCopier.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FileWriter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FragmentSampleTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FrmaAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4FtypAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4GrpiAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HdlrAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HintTrackReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4Hmac.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HmhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IkmsAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IodsAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Ipmp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IproAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IsfmAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IsltAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4IsmaCryp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4KeyWrap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4LinearReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Marlin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MdhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MehdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\MetaData\Ap4MetaData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MfhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MfroAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MoovAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Movie.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MovieFragment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Mp4AudioInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Mpeg2Ts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4MvhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4NmhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SthdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ObjectDescriptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OdafAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OddaAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OdheAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OhdrAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4OmaDcf.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Piff.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Processor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Protection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Results.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4RtpAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4RtpHint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Sample.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleDescription.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleEntry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleSource.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SampleTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SchmAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SdpAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SLConfigDescriptor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SmhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StcoAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\System\StdC\Ap4StdCFileByteStream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Crypto\Ap4StreamCipher.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4String.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StscAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StsdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StssAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4StszAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SttsAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SyntheticSampleTable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfraAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TimsAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TkhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Track.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrakAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrefTypeAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrexAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TrunAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4UrlAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4UuidAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Stz2Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SaioAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SaizAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SencAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4PdinAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4PsshAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dec3Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HvccAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4HevcParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4NalParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SegmentBuilder.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SidxAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SgpdAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4SbgpAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap48bdlAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AdtsParser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4AesBlockCipher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Array.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AtomFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AtomSampleTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AvccAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Command.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CttsAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DataBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DecoderConfigDescriptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DecoderSpecificInfoDescriptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Descriptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DescriptorFactory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DrefAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DynamicCast.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ElstAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4EsDescriptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4EsdsAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Expandable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4File.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FileByteStream.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FileCopier.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FileWriter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FragmentSampleTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FrmaAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4FtypAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4GrpiAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4HdlrAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4HintTrackReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4Hmac.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4HmhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IkmsAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Interfaces.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IodsAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ipmp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IproAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IsfmAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IsltAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4IsmaCryp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4KeyWrap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4LinearReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4List.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Marlin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MdhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MehdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\MetaData\Ap4MetaData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MfhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MfroAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MoovAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Movie.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MovieFragment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Mp4AudioInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Mpeg2Ts.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4MvhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4NmhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SthdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4ObjectDescriptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OdafAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OddaAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OdheAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OhdrAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4OmaDcf.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Piff.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Processor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Protection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Results.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4RtpAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4RtpHint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Sample.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleDescription.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleEntry.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleSource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SampleTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SchmAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SdpAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SLConfigDescriptor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SmhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StcoAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Crypto\Ap4StreamCipher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4String.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StscAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StsdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StssAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4StszAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SttsAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SyntheticSampleTable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfraAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TimsAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TkhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Track.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrakAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrefTypeAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrexAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TrunAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4UrlAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4UuidAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Stz2Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SaioAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SaizAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TencAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SencAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4TfdtAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4PdinAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4PsshAtom.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dec3Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4HevcParser.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4NalParser.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SegmentBuilder.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SidxAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SgpdAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SbgpAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4CDll Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4CDll/Bento4CDll.def Added

@@ -0,0 +1,167 @@
+LIBRARY	"Bento4CDll"
+EXPORTS
+AP4_ByteStream_AddReference
+AP4_ByteStream_Release
+AP4_ByteStream_ReadPartial
+AP4_ByteStream_Read
+AP4_ByteStream_ReadDouble
+AP4_ByteStream_ReadUI64
+AP4_ByteStream_ReadUI32
+AP4_ByteStream_ReadUI24
+AP4_ByteStream_ReadUI16
+AP4_ByteStream_ReadUI08
+AP4_ByteStream_ReadString
+AP4_ByteStream_WritePartial
+AP4_ByteStream_Write
+AP4_ByteStream_WriteDouble
+AP4_ByteStream_WriteUI64
+AP4_ByteStream_WriteUI32
+AP4_ByteStream_WriteUI24
+AP4_ByteStream_WriteUI16
+AP4_ByteStream_WriteUI08
+AP4_ByteStream_WriteString
+AP4_ByteStream_Seek
+AP4_ByteStream_Tell
+AP4_ByteStream_GetSize
+AP4_ByteStream_CopyTo
+Ap4_ByteStream_Flush
+AP4_ByteStream_FromDelegate
+
+AP4_SubStream_Create
+
+AP4_MemoryByteStream_Create
+AP4_MemoryByteStream_FromBuffer
+AP4_MemoryByteStream_AdaptDataBuffer
+
+AP4_FileByteStream_Create
+
+
+AP4_DataBuffer_SetBuffer
+AP4_DataBuffer_SetBufferSize
+AP4_DataBuffer_GetBufferSize
+AP4_DataBuffer_GetData
+AP4_DataBuffer_UseData
+AP4_DataBuffer_GetDataSize
+AP4_DataBuffer_SetDataSize
+AP4_DataBuffer_SetData
+AP4_DataBuffer_Reserve
+AP4_DataBuffer_Destroy
+AP4_DataBuffer_Create
+AP4_DataBuffer_FromData
+AP4_DataBuffer_Clone
+
+AP4_File_GetMovie
+AP4_File_GetFileType
+AP4_File_GetCompatibleBrand
+AP4_File_SetFileType
+AP4_File_IsMoovBeforeMdat
+AP4_File_Inspect
+AP4_File_GetMetaData
+AP4_File_Destroy
+AP4_File_Create
+AP4_File_FromStream
+
+AP4_Movie_GetTrackCount
+AP4_Movie_GetTrackByIndex
+AP4_Movie_GetTrackById
+AP4_Movie_GetTrackByType
+AP4_Movie_GetTimeScale
+AP4_Movie_GetDuration
+AP4_Movie_GetDurationMs
+AP4_Movie_AddTrack
+AP4_Movie_Destroy
+AP4_Movie_Create
+
+AP4_Track_GetType
+AP4_Track_GetHandlerType
+AP4_Track_GetDuration
+AP4_Track_GetDurationMs
+AP4_Track_GetSampleCount
+AP4_Track_GetSample
+AP4_Track_ReadSample
+AP4_Track_GetSampleIndexForTimeStampMs
+AP4_Track_GetSampleDescription
+AP4_Track_GetId
+AP4_Track_SetId
+AP4_Track_SetMovieTimeScale
+AP4_Track_GetMediaTimeScale
+AP4_Track_GetMediaDuration
+AP4_Track_GetName
+AP4_Track_GetLanguage
+AP4_Track_Destroy
+AP4_Track_Create
+
+AP4_SampleDescription_GetType
+AP4_SampleDescription_GetFormat
+AP4_SampleDescription_AsAudio
+AP4_SampleDescription_AsVideo
+AP4_SampleDescription_AsAvc
+AP4_SampleDescription_AsMpeg
+AP4_SampleDescription_AsMpegAudio
+AP4_SampleDescription_Destroy
+
+AP4_AudioSampleDescription_GetSampleRate
+AP4_AudioSampleDescription_GetSampleSize
+AP4_AudioSampleDescription_GetChannelCount
+
+AP4_VideoSampleDescription_GetWidth
+AP4_VideoSampleDescription_GetHeight
+AP4_VideoSampleDescription_GetDepth
+AP4_VideoSampleDescription_GetCompressorName
+
+AP4_AvcSampleDescription_GetConfigurationVersion
+AP4_AvcSampleDescription_GetProfile
+AP4_AvcSampleDescription_GetLevel
+AP4_AvcSampleDescription_GetProfileCompatibility
+AP4_AvcSampleDescription_GetNaluLengthSize
+AP4_AvcSampleDescription_GetSequenceParameterCount
+AP4_AvcSampleDescription_GetSequenceParameter
+AP4_AvcSampleDescription_GetPictureParameterCount
+AP4_AvcSampleDescription_GetPictureParameter
+AP4_AvcSampleDescription_GetRawBytes
+AP4_AvcSampleDescription_GetProfileName
+
+AP4_MpegSampleDescription_GetStreamType
+AP4_MpegSampleDescription_GetObjectTypeId
+AP4_MpegSampleDescription_GetBufferSize
+AP4_MpegSampleDescription_GetMaxBitrate
+AP4_MpegSampleDescription_GetAvgBitrate
+AP4_MpegSampleDescription_GetDecoderInfo
+
+AP4_MpegAudioSampleDescription_GetMpeg4AudioObjectType
+AP4_MpegAudioSampleDescription_GetMpegAudioObjectTypeString
+
+AP4_MpegVideoSampleDescription_Create
+AP4_MpegAudioSampleDescription_Create
+AP4_MpegSystemSampleDescription_Create
+AP4_AvcSampleDescription_Create
+
+AP4_Sample_ReadData
+AP4_Sample_ReadPartialData
+AP4_Sample_GetDataStream
+AP4_Sample_SetDataStream
+AP4_Sample_GetOffset
+AP4_Sample_SetOffset
+AP4_Sample_GetSize
+AP4_Sample_SetSize
+AP4_Sample_GetDescriptionIndex
+AP4_Sample_SetDescriptionIndex
+AP4_Sample_GetDts
+AP4_SampleSetDts
+AP4_Sample_GetCts
+AP4_Sample_SetCts
+AP4_Sample_IsSync
+AP4_Sample_SetSync
+AP4_Sample_Destroy
+AP4_Sample_CreateEmpty
+AP4_Sample_Create
+AP4_Sample_Clone
+
+AP4_SyntheticSampleTable_AddSampleDescription
+AP4_SyntheticSampleTable_AddSample
+AP4_SyntheticSampleTable_Destroy
+AP4_SyntheticSampleTable_Create
+
+AP4_AtomInspector_Destroy
+AP4_PrintInspector_Create
+AP4_AtomInspector_FromDelegate
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4CDll/Bento4CDll.vcxproj Added

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{505B443B-5C00-4CB1-BF00-76F41DECE37F}</ProjectGuid>
+    <RootNamespace>Bento4CDll</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BENTO4CDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BENTO4CDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BENTO4CDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BENTO4CDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\CApi\Bento4C.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Bento4CDll.def" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\CApi\Bento4C.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4CDll/Bento4CDll.vcxproj.filters Added

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\CApi\Bento4C.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Bento4CDll.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\CApi\Bento4C.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Build.py Added

@@ -0,0 +1,96 @@
+#! /usr/bin/env python
+"""
+
+Visual Studio 2005 Build Script
+
+$Id: Build.py 172 2008-07-22 18:26:24Z julien $
+
+"""
+
+import sys
+import getopt
+import subprocess
+
+# Setup some path stuff
+try:
+    if environ['VISUALSTUDIO_BIN']:
+        VSBINDIR = environ['VISUALSTUDIO_BIN']
+except NameError:
+    # Use default value for visual studio.
+    VSBINDIR = 'C:/Program Files/Microsoft Visual Studio 8/Common7/IDE'
+    print 'VISUALSTUDIO_BIN not set. Trying default value:'
+    print '    ' + VSBINDIR
+    print ''
+
+
+# ------------------------------------------------------------
+#       usage
+# ------------------------------------------------------------
+def usage(errMsg):
+    try:
+        print 'Error: %s' % (errMsg)
+    except NameError:
+        pass
+
+    print 'Usage: '
+    print '  %s -s <path to solution> -b [Release|Debug|etc.]' % (sys.argv[0])
+    print ''
+    print '    REQUIRED OPTIONS'
+    print '\t-s <solution>'
+    print '\t-b <configuration>'
+    print ''
+    print '    BUILD OPTIONS'
+    print '\t-c\tMake clean'
+    print '\t-r\tRe-build all'
+
+
+# ------------------------------------------------------------
+#       main
+# ------------------------------------------------------------
+try:
+    opts, args = getopt.getopt(sys.argv[1:], "s:b:rc")
+except getopt.GetoptError, (msg, opt):
+#    print 'Error: invalid argument, %s: %s' % (opt, msg)
+    usage('invalid argument, %s: %s' % (opt, msg))
+    sys.exit(2)
+
+# Build options
+doingBuild = False
+rebuildAll = False
+makeClean = False
+
+for opt, arg in opts:
+    if opt == '-s':
+        solutionFile = arg
+        doingBuild = True
+    elif opt == '-b':
+        buildName = arg
+        doingBuild = True
+    elif opt == '-r':
+        rebuildAll = True
+        doingBuild = True
+    elif opt == '-c':
+        makeClean = True
+
+if rebuildAll and makeClean:
+    usage('Error cannot specify -c and -r together')
+    sys.exit(2)
+
+try:
+    buildSwitch = 'build'
+    if rebuildAll: buildSwitch = 'rebuild'
+    elif makeClean: buildSwitch = 'clean'
+
+    cmd_list = ['%s/devenv.com' % VSBINDIR, '/%s' % buildSwitch, buildName, solutionFile]
+    cmd = " ".join(cmd_list)
+    print 'Executing:'
+    print cmd
+    retVal = subprocess.call(cmd_list)
+    # only the least sig 8 bits are the real return value
+    if retVal != 0:
+        print cmd
+        print '** BUILD FAILURE **'
+        sys.exit(retVal)
+except NameError, (name):
+    usage('missing argument %s' % (name))
+    sys.exit(2)

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/CryptoTest Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/CryptoTest/CryptoTest.vcxproj Added

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B1B75DB0-46BA-4207-88BA-B62FD2AF8584}</ProjectGuid>
+    <RootNamespace>CryptoTest</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\Crypto\CryptoTest.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/CryptoTest/CryptoTest.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\Crypto\CryptoTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FixAacSampleDescription Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FixAacSampleDescription/FixAacSampleDescription.vcxproj Added

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{23C9BE84-E4D3-4F06-9188-533991022D48}</ProjectGuid>
+    <RootNamespace>FixAacSampleDescription</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\FixAacSampleDescription\FixAacSampleDescription.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FixAacSampleDescription/FixAacSampleDescription.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\FixAacSampleDescription\FixAacSampleDescription.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FragmentBuilderTest Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FragmentBuilderTest/FragmentBuilderTest.vcxproj Added

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{ADC04793-9F45-40BD-8461-88411663A470}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>FragmentBuilderTest</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\FragmentCreator\FragmentCreatorTest.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Aac Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Aac/Mp42Aac.vcxproj Added

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1EA74D37-A069-425F-9E9C-F7F83B1FACBB}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/Ap42Aac.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/Ap42Aac.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp42aac.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Ap42Aac.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>.\Debug/Ap42Aac.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/Ap42Aac.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp42aac.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Ap42Aac.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/Ap42Aac.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/Ap42Aac.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp42aac.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/Ap42Aac.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>.\Release/Ap42Aac.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Config;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/Ap42Aac.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp42aac.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/Ap42Aac.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp42Aac\Mp42Aac.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Aac/Mp42Aac.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Hls Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Hls/Mp42Hls.vcxproj Added

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EA2B1E39-B9F4-4424-A01B-65628E87BEB5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Mp42Hls</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp42hls.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp42hls.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp42hls.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp42hls.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp42Hls\Mp42Hls.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\System\Win32\Ap4Win32Random.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Hls/Mp42Hls.vcxproj.filters Added

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp42Hls\Mp42Hls.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\System\Win32\Ap4Win32Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Ts Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Ts/Mp42Ts.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1AD35806-EE60-4AF7-9401-A3F7BDDB9FDE}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Mp42Ts</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp42ts.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp42ts.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp42ts.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp42ts.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp42Ts\Mp42Ts.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Ts/Mp42Ts.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp42Ts\Mp42Ts.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Compact Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Compact/Mp4Compact.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{34B27941-7DE3-42D9-BBEF-F5BB4901C103}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Mp4Compact</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4compact.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4compact.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4compact.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4compact.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Compact\Mp4Compact.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Compact/Mp4Compact.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Compact\Mp4Compact.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4DcfPackager Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4DcfPackager/Mp4DcfPackager.vcxproj Added

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9B072842-1D3B-4CAD-B7AE-E41E545EC420}</ProjectGuid>
+    <RootNamespace>Mp4DcfPackager</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4DcfPackager\Mp4DcfPackager.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4DcfPackager/Mp4DcfPackager.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4DcfPackager\Mp4DcfPackager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Decrypt Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Decrypt/Mp4Decrypt.vcxproj Added

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C5AE742F-4F4D-4BA9-BF6A-A9EE97364B90}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Decrypt.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Decrypt.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Decrypt\Mp4Decrypt.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Decrypt/Mp4Decrypt.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump/Mp4Dump.vcxproj Added

@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{602F1304-0BE4-4C48-983E-9A4F84BD1585}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/Mp4Dump.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/Mp4Dump.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dump.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Mp4Dump.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>.\Debug/Mp4Dump.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/Mp4Dump.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dump.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Mp4Dump.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/Mp4Dump.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/Mp4Dump.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dump.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/Mp4Dump.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>false</GenerateMapFile>
+      <MapFileName>
+      </MapFileName>
+      <MapExports>false</MapExports>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>.\Release/Mp4Dump.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/Mp4Dump.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4dump.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/Mp4Dump.pdb</ProgramDatabaseFile>
+      <GenerateMapFile>false</GenerateMapFile>
+      <MapFileName>
+      </MapFileName>
+      <MapExports>false</MapExports>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Dump\Mp4Dump.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump/Mp4Dump.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Edit Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Edit/Mp4Edit.vcxproj Added

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1B0690B7-BD89-4F6E-9C4A-A76682898963}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4edit.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Process.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4edit.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Process.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4edit.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4edit.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Edit\Mp4Edit.cpp">
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</RuntimeTypeInfo>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Edit/Mp4Edit.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Encrypt Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Encrypt/Mp4Encrypt.vcxproj Added

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D467C78F-53CD-4AE8-82D4-BAE42530262B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Encrypt.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Encrypt.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Encrypt\Mp4Encrypt.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\System\Win32\Ap4Win32Random.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Encrypt/Mp4Encrypt.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Extract Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Extract/Mp4Extract.vcxproj Added

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F0B2195A-2027-4FA1-8CE9-F5600764CB4E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4extract.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Extract.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4extract.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Extract.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4extract.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4extract.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Extract\Mp4Extract.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Extract/Mp4Extract.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Fragment Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Fragment/Mp4Fragment.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{17C36906-6E20-4458-AEC9-66A9473A9F40}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Mp4Fragment</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4fragment.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4fragment.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4fragment.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4fragment.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Fragment\Mp4Fragment.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Fragment/Mp4Fragment.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Fragment\Mp4Fragment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Info Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Info/Mp4Info.vcxproj Added

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{52A6B013-A542-4F5C-838E-F582CC6EF903}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/Mp4Info.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/Mp4Info.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4info.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Mp4Info.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>
+      </ShowProgress>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>.\Debug/Mp4Info.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/Mp4Info.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4info.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/Mp4Info.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>
+      </ShowProgress>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/Mp4Info.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/Mp4Info.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4info.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/Mp4Info.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>
+      </ShowProgress>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>.\Release/Mp4Info.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/Mp4Info.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4info.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/Mp4Info.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <ShowProgress>
+      </ShowProgress>
+    </Link>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Info\Mp4Info.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Info/Mp4Info.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Mux Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Mux/Mp4Mux.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{21D87376-66A7-46B9-9B20-5551924E5974}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Mp4Mux</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4mux.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4mux.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4mux.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4mux.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Mux\Mp4Mux.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Mux/Mp4Mux.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Mux\Mp4Mux.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4RtpHintInfo Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4RtpHintInfo/Mp4RtpHintInfo.vcxproj Added

@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D100E130-718D-4060-ACD9-1061A159DD79}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4RtpHintInfo.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4RtpHintInfo.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4RtpHintInfo\Mp4RtpHintInfo.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4RtpHintInfo/Mp4RtpHintInfo.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source%255cC++ Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4RtpHintInfo\Mp4RtpHintInfo.cpp">
+      <Filter>Source%255cC++ Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Split Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Split/Mp4Split.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{129909F3-DB70-43CE-B38F-52D6A0E23966}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Mp4Split</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4split.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)mp4split.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4split.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <OutputFile>$(OutDir)mp4split.exe</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Split\Mp4Split.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Split/Mp4Split.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Split\Mp4Split.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Tag Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Tag/Mp4Tag.vcxproj Added

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{73804182-47BC-4885-898D-939CA8672828}</ProjectGuid>
+    <RootNamespace>Mp4Tag</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4tag.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Tag.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4tag.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)Mp4Tag.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>false</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4tag.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <OmitFramePointers>false</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)mp4tag.exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Apps\Mp4Tag\Mp4Tag.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Tag/Mp4Tag.vcxproj.filters Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/PassthroughWriterTest Added

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/PassthroughWriterTest/PassthroughWriterTest.vcxproj Added

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B031A581-FDE5-4CDC-A124-573F6EECB54A}</ProjectGuid>
+    <RootNamespace>PassthroughWriterTest</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\PassthroughWriter\PassthroughWriterTest.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Bento4\Bento4.vcxproj">
+      <Project>{a714aa1c-45a9-403d-a6e1-020e520119a2}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/PassthroughWriterTest/PassthroughWriterTest.vcxproj.filters Added

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Test\PassthroughWriter\PassthroughWriterTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

bento4-1.6.0r634.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/make-sdk.sh Added

bento4-1.5.1r629.tar.gz/CMakeLists.txt -> bento4-1.6.0r634.tar.gz/CMakeLists.txt Changed

bento4-1.5.1r629.tar.gz/Documents/Doxygen/Doxyfile -> bento4-1.6.0r634.tar.gz/Documents/Doxygen/Doxyfile Changed

@@ -14,277 +14,277 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
 # http://www.gnu.org/software/libiconv for the list of possible encodings.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
 PROJECT_NAME           = "Bento4 MP4 SDK"
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.4
+PROJECT_NUMBER         = 1.6
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       =
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
 # otherwise cause performance problems for the file system.
 
 CREATE_SUBDIRS         = NO
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
 # Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
 # "represents" "a" "an" "the"
 
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       =
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
 # are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
 # be part of the file/class/namespace that contains it.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 4
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
-ALIASES                = 
+ALIASES                =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
 # scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
 # Fortran.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
 # VHDL.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
 # use: inc=Fortran f=C. Note that for custom extensions you also need to set
 # FILE_PATTERNS otherwise the files are not read by doxygen.
 
-EXTENSION_MAPPING      = 
+EXTENSION_MAPPING      =
 
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
 
 BUILTIN_STL_SUPPORT    = NO
 
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
 # instead of private inheritance when no explicit protection keyword is present.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
 # methods anyway, you should set this option to NO.
 
 IDL_PROPERTY_SUPPORT   = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
 
 SYMBOL_CACHE_SIZE      = 0
@@ -293,121 +293,121 @@
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
 # anonymous namespace are hidden.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
-# will list include files with double quotes in the documentation 
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
 # rather than with sharp brackets.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
 # declaration order.
 
 SORT_BRIEF_DOCS        = NO
@@ -422,162 +422,162 @@
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
 # the group names will appear in their defined order.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
+# The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
 # in the documentation. The default is NO.
 
 SHOW_DIRECTORIES       = NO
 
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
 # Folder Tree View (if specified). The default is YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index
 # and from the Folder Tree View (if specified). The default is YES.
 
 SHOW_NAMESPACES        = YES
 
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
 # is used as the file version. See the manual for examples.
 
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
 # of the layout file.
 
-LAYOUT_FILE            = 
+LAYOUT_FILE            =
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = YES
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
 # documentation.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
 # be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
 INPUT                  = ../../Source/C++/Core \
@@ -585,104 +585,104 @@
                          ../../Source/C++/MetaData \
                          ../../Source/C++/System
 
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
 # the list of possible encodings.
 
 INPUT_ENCODING         = UTF-8
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = *.h
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
 # from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be
 # ignored.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.  Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.  The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
 # is applied to all files.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
@@ -691,53 +691,53 @@
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
+# Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
 # link to the source code.  Otherwise they will link to the documentation.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
 # will need version 4.8.6 or higher.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = YES
@@ -746,21 +746,21 @@
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
 IGNORE_PREFIX          = SHI_
@@ -769,256 +769,256 @@
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
 # standard header.
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        =
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
-# page will contain the date and time when the page was generated. Setting 
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
 # this to NO can help when comparing the output of multiple runs.
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
 HTML_ALIGN_MEMBERS     = YES
 
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
 # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
 # See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
 # can be grouped.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
 # will append .docset to the name.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = YES
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
 # written to the html output directory.
 
 CHM_FILE               = ../Bento4.chm
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
 HHC_LOCATION           = "C:/Program Files/HTML Help Workshop/hhc.exe"
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
 # content.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
 # HTML documentation.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
 # The path specified is relative to the HTML output folder.
 
-QCH_FILE               = 
+QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#namespace
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
 # http://doc.trolltech.com/qthelpproject.html#virtual-folders
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
 # http://doc.trolltech.com/qthelpproject.html#custom-filters
 
-QHP_CUST_FILTER_NAME   = 
+QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
 # <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
 
-QHP_CUST_FILTER_ATTRS  = 
+QHP_CUST_FILTER_ATTRS  =
 
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
 # <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
 
-QHP_SECT_FILTER_ATTRS  = 
+QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
 # .qhp file.
 
-QHG_LOCATION           = 
+QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
-# will be generated, which together with the HTML files, form an Eclipse help  
-# plugin. To install this plugin and make it available under the help contents 
-# menu in Eclipse, the contents of the directory containing the HTML and XML 
-# files needs to be copied into the plugins directory of eclipse. The name of 
-# the directory within the plugins directory should be the same as 
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+# will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
 # the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
 # the help appears.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin 
-# the directory name containing the HTML and XML files should also have 
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
 # this name.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
 # the value YES disables it.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
+# This tag can be used to set the number of enum values (range [1..20])
 # that doxygen will group on one line in the generated HTML documentation.
 
 ENUM_VALUES_PER_LINE   = 1
 
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to YES, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
 # Windows users are probably better off using the HTML help feature.
 
 GENERATE_TREEVIEW      = NO
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
 # and Class Hierarchy pages using a tree view instead of an ordered list.
 
 USE_INLINE_TREES       = NO
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 250
 
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
 # to force them to be regenerated.
 
 FORMULA_FONTSIZE       = 10
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript 
+# for the HTML output. The underlying search engine uses javascript
 # and DHTML and should work on any modern browser. Note that when using
 # HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should 
-# typically be disabled. For large projects the javascript based search engine 
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
 # can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
 
 SEARCHENGINE           = NO
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
 # implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index 
+# using Javascript. Doxygen will generate the search PHP script and index
 # file to put on the web server. The advantage of the server
 # based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup 
+# full text search. The disadvances is that it is more difficult to setup
 # and does not have live searching capabilities.
 
 SERVER_BASED_SEARCH    = NO
@@ -1027,77 +1027,77 @@
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = YES
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name. 
-# Note that when enabling USE_PDFLATEX this option is only used for 
-# generating bitmaps for formulas in the HTML output, but not in the 
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
 # Makefile that is written to the output directory.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = letter
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
@@ -1113,68 +1113,68 @@
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
+# Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
+# The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
@@ -1183,33 +1183,33 @@
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
 # the code including all documentation.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_SCHEMA             = 
+XML_SCHEMA             =
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_DTD                = 
+XML_DTD                =
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
@@ -1218,10 +1218,10 @@
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -1230,97 +1230,97 @@
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
 # instead of the = operator.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
 # Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
 # the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
@@ -1329,41 +1329,41 @@
 # Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
+# The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
@@ -1372,192 +1372,192 @@
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
 # powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = NO
 
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
 # containing the font.
 
 DOT_FONTNAME           = FreeSans
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
 # The default size is 10pt.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
 # can find it using this tag.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
 # the CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
 # will generate a graph for groups, showing the direct groups dependencies
 
 GROUP_GRAPHS           = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the 
+# If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
 # for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
 # relations between the files in the directories.
 
 DIRECTORY_GRAPH        = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
 
-DOT_PATH               = 
+DOT_PATH               =
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
 # \dotfile command).
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
 # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
 # a graph (i.e. they become hard to read).
 
 DOT_TRANSPARENT        = NO
 
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
 # support this, this feature is disabled by default.
 
 DOT_MULTI_TARGETS      = NO
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES

bento4-1.6.0r634.tar.gz/Documents/MkDocs Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/mkdocs.yml Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/requirements.txt Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/src Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/src/images Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/src/images/bento4-small.jpg Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/src/images/tokyometro.jpg Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/src/index.md Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/theme Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/theme/partials Added

bento4-1.6.0r634.tar.gz/Documents/MkDocs/theme/partials/footer.html Added

@@ -0,0 +1,54 @@
+{#-
+  This file was automatically generated - do not edit
+-#}
+{% import "partials/language.html" as lang with context %}
+<footer class="md-footer">
+  {% if page.previous_page or page.next_page %}
+    <div class="md-footer-nav">
+      <nav class="md-footer-nav__inner md-grid">
+        {% if page.previous_page %}
+          <a href="{{ page.previous_page.url | url }}" title="{{ page.previous_page.title | striptags }}" class="md-flex md-footer-nav__link md-footer-nav__link--prev" rel="prev">
+            <div class="md-flex__cell md-flex__cell--shrink">
+              <i class="md-icon md-icon--arrow-back md-footer-nav__button"></i>
+            </div>
+            <div class="md-flex__cell md-flex__cell--stretch md-footer-nav__title">
+              <span class="md-flex__ellipsis">
+                <span class="md-footer-nav__direction">
+                  {{ lang.t("footer.previous") }}
+                </span>
+                {{ page.previous_page.title }}
+              </span>
+            </div>
+          </a>
+        {% endif %}
+        {% if page.next_page %}
+          <a href="{{ page.next_page.url | url }}" title="{{ page.next_page.title | striptags }}" class="md-flex md-footer-nav__link md-footer-nav__link--next" rel="next">
+            <div class="md-flex__cell md-flex__cell--stretch md-footer-nav__title">
+              <span class="md-flex__ellipsis">
+                <span class="md-footer-nav__direction">
+                  {{ lang.t("footer.next") }}
+                </span>
+                {{ page.next_page.title }}
+              </span>
+            </div>
+            <div class="md-flex__cell md-flex__cell--shrink">
+              <i class="md-icon md-icon--arrow-forward md-footer-nav__button"></i>
+            </div>
+          </a>
+        {% endif %}
+      </nav>
+    </div>
+  {% endif %}
+  <div class="md-footer-meta md-typeset">
+    <div class="md-footer-meta__inner md-grid">
+      <div class="md-footer-copyright">
+        {% if config.copyright %}
+          <div class="md-footer-copyright__highlight">
+            {{ config.copyright }}
+          </div>
+        {% endif %}
+      </div>
+      {% include "partials/social.html" %}
+    </div>
+  </div>
+</footer>

bento4-1.5.1r629.tar.gz/README.md -> bento4-1.6.0r634.tar.gz/README.md Changed

@@ -1,5 +1,6 @@
 Bento4
 =====
+![CI](https://github.com/axiomatic-systems/Bento4/workflows/CI/badge.svg?branch=master)
 [![Build Status](https://travis-ci.org/axiomatic-systems/Bento4.svg?branch=master)](https://travis-ci.org/axiomatic-systems/Bento4.svg?branch=master)
 [![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/axiomatic-systems/Bento4.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/axiomatic-systems/Bento4/context:cpp)
 [![Total Alerts](https://img.shields.io/lgtm/alerts/g/axiomatic-systems/Bento4.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/axiomatic-systems/Bento4/alerts)
@@ -16,6 +17,7 @@
 A number of formats and features based on the ISO-MP4 format and related technologies are also supported, including:
 
  * MPEG DASH with fragmented MP4 files, as defined in ISO/IEC 23009-1
+ * CMAF (Common Media Application Format) as defined in ISO/IEC 23000-19
  * MPEG Common Encryption (CENC) as specified in ISO/IEC 23001-7
  * PIFF (Protected Interoperable File Format): encrypted, fragmented MP4 format specified by Microsoft and used for encrypted HTTP Smooth Streaming.
  * Reading and writing 3GPP and iTunes-compatible metadata.
@@ -77,43 +79,56 @@
 ### Windows using Visual Studio
 Open the Visual Studio solution file Build/Targets/x86-microsoft-win32-vs2010/Bento4.sln and build
 
-### On Linux and other platforms, using SCons
-Make sure you the the SCons build tool installed on your host machine (http://www.scons.org).
-To build the Debug configuration, simply enter the command:
-
-```scons -u```
-
-in a terminal from any directory (either from the top level directory where you downloaded the Bento4 distribution, or from the Build/Targets/xxx subdirectory for your specific target).
-
-To build the Release configuration, use the command:
-
-```scons -u build_config=Release```
-
-To cross-compile for a target other than your host architecture, specify target=xxxx as an argument to the scons build command.
-
-Example:
-
-```scons -u build_config=Release target=x86_64-unknown-linux```
-
-### Using CMake
+### On Linux and other platforms, Using CMake
 CMake can generate Makefiles, Xcode project files, or Visual Studios project files.
 
 #### CMake/Make
+
 	mkdir cmakebuild
 	cd cmakebuild
 	cmake -DCMAKE_BUILD_TYPE=Release ..
 	make
 
 #### CMake/Xcode
+
 	mkdir cmakebuild
 	cd cmakebuild
-	cmake -G Xcode -DCMAKE_BUILD_TYPE=Release ..
+	cmake -G Xcode
+    cmake --build . --config Release
 
 #### CMake/Visual Studio
 	mkdir cmakebuild
 	cd cmakebuild
-	cmake -G "Visual Studio 10 Win64" -DCMAKE_BUILD_TYPE=Release ..
+	cmake -DCMAKE_BUILD_TYPE=Release ..
+    cmake --build . --config Release
+
+#### CMake for Android NDK
+    mkdir cmakebuild
+    cd cmakebuild
+    cmake -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI=$ABI -DANDROID_NATIVE_API_LEVEL=$MINSDKVERSION ..
+    make
+
+    See https://developer.android.com/ndk/guides/cmake for details on the choice of ABI and other parameters.
+    
+    Where $NDK is set to the directory path where you have installed the NDK, $ABI is the Android ABI (ex: arm64-v8a) and $MINSDKVERSION is the minimum SDK version (ex: 23)
+
+### On Linux and other platforms, using SCons (deprecated)
+Make sure you the the SCons build tool installed on your host machine (http://www.scons.org).
+To build the Debug configuration, simply enter the command:
+
+```scons -u```
+
+in a terminal from any directory (either from the top level directory where you downloaded the Bento4 distribution, or from the Build/Targets/xxx subdirectory for your specific target).
 
+To build the Release configuration, use the command:
+
+```scons -u build_config=Release```
+
+To cross-compile for a target other than your host architecture, specify target=xxxx as an argument to the scons build command.
+
+Example:
+
+```scons -u build_config=Release target=x86_64-unknown-linux```
 
 ### Using Make
 From a command shell, go to your build target directory.

bento4-1.5.1r629.tar.gz/Scripts/ExportSourceTree.py -> bento4-1.6.0r634.tar.gz/Scripts/ExportSourceTree.py Changed

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 import sys
 import os
@@ -12,22 +12,22 @@
     cmd = 'git status --porcelain -b'
     lines = os.popen(cmd).readlines()
     if not lines[0].startswith('## master'):
-        print 'ERROR: not on master branch'
+        print('ERROR: not on master branch')
         return None
     if len(lines) > 1:
-        print 'ERROR: git status not empty'
-        print ''.join(lines)
+        print('ERROR: git status not empty')
+        print(''.join(lines))
         return None
 
     cmd = 'git tag --contains HEAD'
     tags = os.popen(cmd).readlines()
     if len(tags) != 1:
-        print 'ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags
+        print('ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags)
         return None
     version = tags[0].strip()
     sep = version.find('-')
     if sep < 0:
-        print 'ERROR: unrecognized version string format:', version
+        print('ERROR: unrecognized version string format:', version)
     return version[sep+1:]
 
 #############################################################
@@ -53,14 +53,14 @@
 SDK_REVISION = GetSdkRevision()
 if SDK_REVISION is None:
     sys.exit(1)
-print "Exporting Revision", SDK_REVISION
+print("Exporting Revision", SDK_REVISION)
 
 # compute paths
 SDK_NAME='Bento4-SRC-'+BENTO4_VERSION+'-'+SDK_REVISION
 SDK_OUTPUT_ROOT=BENTO4_HOME+'/SDK'
 SDK_ROOT=SDK_OUTPUT_ROOT+'/'+SDK_NAME
 
-print SDK_NAME
+print(SDK_NAME)
 
 # remove any previous SDK directory
 if os.path.exists(SDK_ROOT):
@@ -72,6 +72,6 @@
 
 ### export
 cmd = 'git archive --format=zip HEAD -o '+SDK_ROOT+'.zip'
-print cmd
+print(cmd)
 #cmd = 'svn export -r'+SDK_REVISION+' https://zebulon.bok.net/svn/Bento4/trunk '+SDK_NAME
 os.system(cmd)

bento4-1.5.1r629.tar.gz/Scripts/SdkPackager.py -> bento4-1.6.0r634.tar.gz/Scripts/SdkPackager.py Changed

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 ########################################################################
 #
@@ -37,24 +37,25 @@
 def GetSdkRevision():
     cmd = 'git status --porcelain -b'
     lines = os.popen(cmd).readlines()
+    branch = ''
     if not lines[0].startswith('## master'):
-        print 'ERROR: not on master branch'
-        return None
+        print('WARNING: not on master branch')
+        branch = '+' + lines[0][3:].strip()
     if len(lines) > 1:
-        print 'ERROR: git status not empty'
-        print ''.join(lines)
+        print('ERROR: git status not empty')
+        print(''.join(lines))
         return None
 
     cmd = 'git tag --contains HEAD'
     tags = os.popen(cmd).readlines()
     if len(tags) != 1:
-        print 'ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags
+        print('ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags)
         return None
     version = tags[0].strip()
     sep = version.find('-')
     if sep < 0:
-        print 'ERROR: unrecognized version string format:', version
-    return version[sep+1:]
+        print('ERROR: unrecognized version string format:', version)
+    return version[sep+1:] + branch
 
 #############################################################
 # File Copy
@@ -69,11 +70,11 @@
                 if not os.path.exists(dest_dir):
                     os.makedirs(dest_dir)
                 filename = os.path.basename(file)
-                if rename_map.has_key(filename):
+                if filename in rename_map:
                     dest_name = dest_dir+'/'+rename_map[filename]
                 else:
                     dest_name = dest_dir
-                print 'COPY: '+file+' -> '+dest_name
+                print('COPY: '+file+' -> '+dest_name)
                 shutil.copy2(file, dest_name)
 
 #############################################################
@@ -94,7 +95,7 @@
 def ZipIt(basename, dir) :
     path = basename+'/'+dir
     zip_filename = path+'.zip'
-    print 'ZIP: '+path+' -> '+zip_filename
+    print('ZIP: '+path+' -> '+zip_filename)
 
     if os.path.exists(zip_filename):
         os.remove(zip_filename)
@@ -116,17 +117,17 @@
     SDK_TARGET = None
 
 if len(sys.argv) > 2:
-    BENTO4_HOME = sys.argv[1]
+    BENTO4_HOME = sys.argv[2]
 else:
     script_dir  = os.path.abspath(os.path.dirname(__file__))
     BENTO4_HOME = os.path.join(script_dir,'..')
 
 # ensure that BENTO4_HOME has been set and exists
 if not os.path.exists(BENTO4_HOME) :
-    print 'ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist'
+    print('ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist')
     sys.exit(1)
 else :
-    print 'BENTO4_HOME = ' + BENTO4_HOME
+    print('BENTO4_HOME = ' + BENTO4_HOME)
 
 # compute the target if it is not specified
 if SDK_TARGET is None:
@@ -149,17 +150,17 @@
         'linux-i386'  : 'x86-unknown-linux',
         'linux-x86_64': 'x86_64-unknown-linux',
         'linux2'      : 'x86-unknown-linux',
-        'win32'       : 'x86-microsoft-win32-vs2010',
+        'win32'       : 'x86_64-microsoft-win32',
         'darwin'      : 'universal-apple-macosx'
     }
 
-    if platform_to_target_map.has_key(platform_id):
+    if platform_id in platform_to_target_map:
         SDK_TARGET = platform_to_target_map[platform_id]
     else:
-        print 'ERROR: SDK_TARGET is not set and cannot be detected'
+        print('ERROR: SDK_TARGET is not set and cannot be detected')
         sys.exit(1)
 
-print "TARGET = " + SDK_TARGET
+print("TARGET = " + SDK_TARGET)
 
 BENTO4_VERSION = GetVersion()
 
@@ -167,17 +168,21 @@
 SDK_REVISION = GetSdkRevision()
 if SDK_REVISION is None:
     sys.exit(1)
-SDK_NAME='Bento4-SDK-'+BENTO4_VERSION+'-'+SDK_REVISION+'.'+SDK_TARGET
-SDK_BUILD_ROOT=BENTO4_HOME+'/SDK'
-SDK_ROOT=SDK_BUILD_ROOT+'/'+SDK_NAME
-SDK_TARGET_DIR='Build/Targets/'+SDK_TARGET
-SDK_TARGET_ROOT=BENTO4_HOME+'/'+SDK_TARGET_DIR
+SDK_NAME=f'Bento4-SDK-{BENTO4_VERSION}-{SDK_REVISION}.{SDK_TARGET}'
+SDK_BUILD_ROOT=f'{BENTO4_HOME}/SDK'
+SDK_ROOT=f'{SDK_BUILD_ROOT}/{SDK_NAME}'
+SDK_TARGET_DIR=f'Build/Targets/{SDK_TARGET}'
+SDK_TARGET_ROOT=f'{BENTO4_HOME}/{SDK_TARGET_DIR}'
 
-# special case for Xcode builds
-if SDK_TARGET == 'universal-apple-macosx':
-    SDK_TARGET_DIR='Build/Targets/universal-apple-macosx/build'
+# Different platforms have different build dirs
+SDK_BUILD_OUTPUT_SUBDIRS = {
+    'x86_64-microsoft-win32': '/Release',
+    'universal-apple-macosx': '/Release'
+}
+SDK_BUILD_OUTPUT_SUBDIR = SDK_BUILD_OUTPUT_SUBDIRS.get(SDK_TARGET, '')
+SDK_BUILD_OUTPUT_DIR = f'cmakebuild/{SDK_TARGET}{SDK_BUILD_OUTPUT_SUBDIR}'
 
-print SDK_NAME
+print(SDK_NAME)
 
 # remove any previous SDK directory
 if os.path.exists(SDK_ROOT):
@@ -212,7 +217,7 @@
     script_bin_dir = None
 
 # binaries
-bin_in = SDK_TARGET_DIR+'/Release'
+bin_in = SDK_BUILD_OUTPUT_DIR
 bin_files = [
     (bin_in,'mp4*.exe','bin'),
     (bin_in,'aac2mp4.exe','bin'),

bento4-1.5.1r629.tar.gz/Scripts/SdkPrepForRelease.py -> bento4-1.6.0r634.tar.gz/Scripts/SdkPrepForRelease.py Changed

@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/env python3
 
 ########################################################################
 #
@@ -18,7 +18,7 @@
 #############################################################
 # parse the command line
 if len(sys.argv) < 2:
-    print 'ERROR: SDK revision # expected as first argument'
+    print('ERROR: SDK revision # expected as first argument')
     sys.exit(1)
 
 SDK_REVISION = sys.argv[1]
@@ -31,26 +31,26 @@
 
 # ensure that BENTO4_HOME has been set and exists
 if not os.path.exists(BENTO4_HOME) :
-    print 'ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist'
+    print('ERROR: BENTO4_HOME ('+BENTO4_HOME+') does not exist')
     sys.exit(1)
 else :
-    print 'BENTO4_HOME = ' + BENTO4_HOME
+    print('BENTO4_HOME = ' + BENTO4_HOME)
 
 # patch files
 filename = os.path.join(BENTO4_HOME, "Source", "Python", "utils", "mp4-dash.py")
-print "Patching", filename
+print("Patching", filename)
 file_lines = open(filename).readlines()
 file_out = open(filename, "wb")
 for line in file_lines:
     if line.startswith("SDK_REVISION = "):
         line = "SDK_REVISION = '"+SDK_REVISION+"'\n"
-    file_out.write(line)
+    file_out.write(line.encode('ascii'))
 
 filename = os.path.join(BENTO4_HOME, "Source", "Python", "utils", "mp4-hls.py")
-print "Patching", filename
+print("Patching", filename)
 file_lines = open(filename).readlines()
 file_out = open(filename, "wb")
 for line in file_lines:
     if line.startswith("SDK_REVISION = "):
         line = "SDK_REVISION = '"+SDK_REVISION+"'\n"
-    file_out.write(line)
+    file_out.write(line.encode('ascii'))

bento4-1.5.1r629.tar.gz/Source/C++/Apps/Mp42Hls/Mp42Hls.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Apps/Mp42Hls/Mp42Hls.cpp Changed

@@ -127,6 +127,7 @@
             "\n\nusage: mp42hls [options] <input>\n"
             "Options:\n"
             "  --verbose\n"
+            "  --show-info\n"
             "  --hls-version <n> (default: 3)\n"
             "  --pmt-pid <pid>\n"
             "    PID to use for the PMT (default: 0x100)\n"
@@ -2110,8 +2111,13 @@
         }
 
         double frame_rate = 0.0;
-        if (Stats.segments_total_duration != 0.0) {
-            frame_rate = (double)video_track->GetSampleCount()/((double)video_track->GetMediaDuration()/(double)video_track->GetMediaTimeScale());
+        if (video_track && (Stats.segments_total_duration != 0.0)) {
+            double sample_count = (double)video_track->GetSampleCount();
+            double media_duration = (double)video_track->GetMediaDuration();
+            double timescale = (double)video_track->GetMediaTimeScale();
+            if (media_duration > 0.0) {
+                frame_rate = sample_count/(media_duration/timescale);
+            }
         }
 
         printf(

bento4-1.5.1r629.tar.gz/Source/C++/Apps/Mp4Encrypt/Mp4Encrypt.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Apps/Mp4Encrypt/Mp4Encrypt.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Apps/Mp4Fragment/Mp4Fragment.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Apps/Mp4Fragment/Mp4Fragment.cpp Changed

@@ -65,6 +65,7 @@
     double        tfdt_start;
     unsigned int  sequence_number_start;
     ForceSyncMode force_i_frame_sync;
+    bool          no_zero_elst;
 } Options;
 
 /*----------------------------------------------------------------------
@@ -91,6 +92,7 @@
             "  --force-i-frame-sync <auto|all> treat all I-frames as sync samples (for open-gop sequences)\n"
             "    'auto' only forces the flag if an open-gop source is detected, 'all' forces the flag in all cases\n"
             "  --copy-udta copy the moov/udta atom from input to output\n"
+            "  --no-zero-elst don't set the last edit list entry to 0 duration\n"
             );
     exit(1);
 }
@@ -373,9 +375,17 @@
                     // adjust the fields to match the correct timescale
                     for (unsigned int j=0; j<elst->GetEntries().ItemCount(); j++) {
                         AP4_ElstEntry new_elst_entry = elst->GetEntries()[j];
-                        new_elst_entry.m_SegmentDuration = AP4_ConvertTime(new_elst_entry.m_SegmentDuration,
-                                                                           input_movie->GetTimeScale(),
-                                                                           AP4_FRAGMENTER_OUTPUT_MOVIE_TIMESCALE);
+                        if (j == elst->GetEntries().ItemCount() - 1 &&
+                            new_elst_entry.m_SegmentDuration == track->GetDuration() &&
+                            !Options.no_zero_elst) {
+                            // if this is the last entry, make the segment duration 0 (i.e last until the end)
+                            // in order to be compliant with the CMAF specification
+                            new_elst_entry.m_SegmentDuration = 0;
+                        } else {
+                            new_elst_entry.m_SegmentDuration = AP4_ConvertTime(new_elst_entry.m_SegmentDuration,
+                                                                               input_movie->GetTimeScale(),
+                                                                               AP4_FRAGMENTER_OUTPUT_MOVIE_TIMESCALE);
+                        }
                         if (new_elst_entry.m_MediaTime > 0 && timescale) {
                             new_elst_entry.m_MediaTime = (AP4_SI64)AP4_ConvertTime(new_elst_entry.m_MediaTime,
                                                                                    track->GetMediaTimeScale(),
@@ -594,10 +604,7 @@
         // index of the first sample in the group, which may not be correct. This
         // should be fixed later)
         unsigned int sample_desc_index = cursor->m_Sample.GetDescriptionIndex();
-        unsigned int tfhd_flags = AP4_TFHD_FLAG_DEFAULT_BASE_IS_MOOF;
-        if (sample_desc_index > 0) {
-            tfhd_flags |= AP4_TFHD_FLAG_SAMPLE_DESCRIPTION_INDEX_PRESENT;
-        }
+        unsigned int tfhd_flags = AP4_TFHD_FLAG_DEFAULT_BASE_IS_MOOF | AP4_TFHD_FLAG_SAMPLE_DESCRIPTION_INDEX_PRESENT;
         if (cursor->m_Track->GetType() == AP4_Track::TYPE_VIDEO) {
             tfhd_flags |= AP4_TFHD_FLAG_DEFAULT_SAMPLE_FLAGS_PRESENT;
         }
@@ -757,8 +764,11 @@
                                                   compatible_brands.ItemCount());
         ftyp = new_ftyp;
     } else {
-        AP4_UI32 compat = AP4_FILE_BRAND_ISO5;
-        ftyp = new AP4_FtypAtom(AP4_FTYP_BRAND_MP42, 0, &compat, 1);
+        AP4_UI32 compat[2] = {
+            AP4_FILE_BRAND_ISOM,
+            AP4_FILE_BRAND_ISO5
+        };
+        ftyp = new AP4_FtypAtom(AP4_FTYP_BRAND_MP42, 0, &compat[0], 2);
     }
     ftyp->Write(output_stream);
     delete ftyp;
@@ -1161,6 +1171,8 @@
             }
         } else if (!strcmp(arg, "--copy-udta")) {
             copy_udta = true;
+        } else if (!strcmp(arg, "--no-zero-elst")) {
+            Options.no_zero_elst = true;
         } else {
             if (input_filename == NULL) {
                 input_filename = arg;

bento4-1.5.1r629.tar.gz/Source/C++/Apps/Mp4Info/Mp4Info.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Apps/Mp4Info/Mp4Info.cpp Changed

@@ -430,6 +430,23 @@
     }
 
     // Dolby Digital specifics
+    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_AC_3) {
+        AP4_Dac3Atom* dac3 = AP4_DYNAMIC_CAST(AP4_Dac3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DAC3));
+        if (dac3) {
+            printf("    AC-3 Data Rate: %d\n", dac3->GetDataRate());
+            printf("    AC-3 Stream:\n");
+            printf("        fscod       = %d\n", dac3->GetStreamInfo().fscod);
+            printf("        bsid        = %d\n", dac3->GetStreamInfo().bsid);
+            printf("        bsmod       = %d\n", dac3->GetStreamInfo().bsmod);
+            printf("        acmod       = %d\n", dac3->GetStreamInfo().acmod);
+            printf("        lfeon       = %d\n", dac3->GetStreamInfo().lfeon);
+            printf("    AC-3 dac3 payload: [");
+            ShowData(dac3->GetRawBytes());
+            printf("]\n");
+        }
+    }
+
+    // Dolby Digital Plus specifics
     if (desc->GetFormat() == AP4_SAMPLE_FORMAT_EC_3) {
         AP4_Dec3Atom* dec3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DEC3));
         if (dec3) {
@@ -544,9 +561,11 @@
                 printf(" (%s)", nalu_type_name);
             }
             printf("\n");
+            const char* sep = "";
             for (unsigned int j=0; j<seq.m_Nalus.ItemCount(); j++) {
-                printf("        ");
+                printf("%s        ", sep);
                 ShowData(seq.m_Nalus[j]);
+                sep = "\n";
             }
             printf("\n      }\n");
         }
@@ -574,6 +593,27 @@
         printf("      BL Present:  %s\n", dvcc->GetBlPresentFlag()?"true":"false");
     }
     
+    // VPx Specifics
+    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_VP8 ||
+        desc->GetFormat() == AP4_SAMPLE_FORMAT_VP9 ||
+        desc->GetFormat() == AP4_SAMPLE_FORMAT_VP10) {
+        AP4_VpccAtom* vpcc = AP4_DYNAMIC_CAST(AP4_VpccAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_VPCC));
+        if (vpcc) {
+            printf("    Profile:                  %d\n", vpcc->GetProfile());
+            printf("    Level:                    %d\n", vpcc->GetLevel());
+            printf("    Bit Depth:                %d\n", vpcc->GetBitDepth());
+            printf("    Chroma Subsampling:       %d\n", vpcc->GetChromaSubsampling());
+            printf("    Colour Primaries:         %d\n", vpcc->GetColourPrimaries());
+            printf("    Transfer Characteristics: %d\n", vpcc->GetTransferCharacteristics());
+            printf("    Matrix Coefficients:      %d\n", vpcc->GetMatrixCoefficients());
+            printf("    Video Full Range Flag:    %s\n", vpcc->GetVideoFullRangeFlag() ? "true" : "false");
+            AP4_String codec;
+            vpcc->GetCodecString(desc->GetFormat(), codec);
+            printf("    Codecs String:            %s", codec.GetChars());
+            printf("\n");
+        }
+    }
+
     // Subtitles
     if (desc->GetType() == AP4_SampleDescription::TYPE_SUBTITLES) {
         AP4_SubtitleSampleDescription* subt_desc = AP4_DYNAMIC_CAST(AP4_SubtitleSampleDescription, desc);
@@ -655,6 +695,27 @@
     }
 
     // Dolby Digital specifics
+    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_AC_3) {
+        AP4_Dac3Atom* dac3 = AP4_DYNAMIC_CAST(AP4_Dac3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE('d', 'a', 'c', '3')));
+        if (dac3) {
+            printf(",\n");
+            printf("\"dolby_digital_info\": {\n");
+            printf("  \"dac3_payload\": \"");
+            ShowData(dac3->GetRawBytes());
+            printf("\",\n");
+            printf("  \"data_rate\": %d,\n", dac3->GetDataRate());
+            printf("  \"stream_info\": {\n");
+            printf("    \"fscod\": %d,\n", dac3->GetStreamInfo().fscod);
+            printf("    \"bsid\": %d,\n",  dac3->GetStreamInfo().bsid);
+            printf("    \"bsmod\": %d,\n", dac3->GetStreamInfo().bsmod);
+            printf("    \"acmod\": %d,\n", dac3->GetStreamInfo().acmod);
+            printf("    \"lfeon\": %d\n", dac3->GetStreamInfo().lfeon);
+            printf("  }\n");
+            printf("}");
+        }
+    }
+
+    // Dolby Digital Plus specifics
     if (desc->GetFormat() == AP4_SAMPLE_FORMAT_EC_3) {
         AP4_Dec3Atom* dec3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE('d', 'e', 'c', '3')));
         if (dec3) {
@@ -821,7 +882,32 @@
         printf("   \"bl_present\": %s\n", dvcc->GetBlPresentFlag()?"true":"false");
         printf("}");
     }
-    
+
+    // VPx Specifics
+    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_VP8 ||
+        desc->GetFormat() == AP4_SAMPLE_FORMAT_VP9 ||
+        desc->GetFormat() == AP4_SAMPLE_FORMAT_VP10) {
+        AP4_VpccAtom* vpcc = AP4_DYNAMIC_CAST(AP4_VpccAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_VPCC));
+        if (vpcc) {
+            printf(",\n");
+            printf("\"vpx_info\": {\n");
+            printf("    \"profile\":%d,\n", vpcc->GetProfile());
+            printf("    \"level\":%d,\n", vpcc->GetLevel());
+            printf("    \"bit_depth\":%d,\n", vpcc->GetBitDepth());
+            printf("    \"chroma_subsampling\":%d,\n", vpcc->GetChromaSubsampling());
+            printf("    \"colour_primaries\":%d,\n", vpcc->GetColourPrimaries());
+            printf("    \"transfer_characteristics\":%d,\n", vpcc->GetTransferCharacteristics());
+            printf("    \"matrix_coefficients\":%d,\n", vpcc->GetMatrixCoefficients());
+            printf("    \"video_full_range_flag\":%s\n", vpcc->GetVideoFullRangeFlag() ? "true" : "false");
+            printf("},\n");
+            printf("\"codecs_string\":\"");
+            AP4_String codec;
+            vpcc->GetCodecString(desc->GetFormat(), codec);
+            printf("%s", codec.GetChars());
+            printf("\"");
+        }
+    }
+
     // Subtitles
     if (desc->GetType() == AP4_SampleDescription::TYPE_SUBTITLES) {
         printf(",\n");

bento4-1.5.1r629.tar.gz/Source/C++/Codecs/Ap4HevcParser.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Codecs/Ap4HevcParser.cpp Changed

@@ -197,7 +197,7 @@
 scaling_list_data(AP4_BitReader& bits)
 {
     for (unsigned int sizeId = 0; sizeId < 4; sizeId++) {
-        for (unsigned int matrixId = 0; matrixId < ((sizeId == 3)?2:6); matrixId++) {
+        for (unsigned int matrixId = 0; matrixId < (unsigned int)((sizeId == 3)?2:6); matrixId++) {
             unsigned int flag = bits.ReadBit(); // scaling_list_pred_mode_flag[ sizeId ][ matrixId ]
             if (!flag) {
                 ReadGolomb(bits); // scaling_list_pred_matrix_id_delta[ sizeId ][ matrixId ]
@@ -920,7 +920,7 @@
         return AP4_ERROR_INVALID_FORMAT;
     }
     for (unsigned int i=0; i<num_short_term_ref_pic_sets; i++) {
-        AP4_Result result = parse_st_ref_pic_set(&short_term_ref_pic_sets[i], this, i, num_short_term_ref_pic_sets, bits);
+        result = parse_st_ref_pic_set(&short_term_ref_pic_sets[i], this, i, num_short_term_ref_pic_sets, bits);
         if (AP4_FAILED(result)) return result;
     }
     long_term_ref_pics_present_flag = bits.ReadBit();

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4.h Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4Atom.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4Atom.h Changed

@@ -421,6 +421,9 @@
 const AP4_Atom::Type AP4_ATOM_TYPE_HVC1 = AP4_ATOM_TYPE('h','v','c','1');
 const AP4_Atom::Type AP4_ATOM_TYPE_DVHE = AP4_ATOM_TYPE('d','v','h','e');
 const AP4_Atom::Type AP4_ATOM_TYPE_DVH1 = AP4_ATOM_TYPE('d','v','h','1');
+const AP4_Atom::Type AP4_ATOM_TYPE_VP08 = AP4_ATOM_TYPE('v','p','0','8');
+const AP4_Atom::Type AP4_ATOM_TYPE_VP09 = AP4_ATOM_TYPE('v','p','0','9');
+const AP4_Atom::Type AP4_ATOM_TYPE_VP10 = AP4_ATOM_TYPE('v','p','1','0');
 const AP4_Atom::Type AP4_ATOM_TYPE_ALAC = AP4_ATOM_TYPE('a','l','a','c');
 const AP4_Atom::Type AP4_ATOM_TYPE_ENCA = AP4_ATOM_TYPE('e','n','c','a');
 const AP4_Atom::Type AP4_ATOM_TYPE_ENCV = AP4_ATOM_TYPE('e','n','c','v');
@@ -481,6 +484,7 @@
 const AP4_Atom::Type AP4_ATOM_TYPE_AVCC = AP4_ATOM_TYPE('a','v','c','C');
 const AP4_Atom::Type AP4_ATOM_TYPE_HVCC = AP4_ATOM_TYPE('h','v','c','C');
 const AP4_Atom::Type AP4_ATOM_TYPE_DVCC = AP4_ATOM_TYPE('d','v','c','C');
+const AP4_Atom::Type AP4_ATOM_TYPE_VPCC = AP4_ATOM_TYPE('v','p','c','C');
 const AP4_Atom::Type AP4_ATOM_TYPE_HVCE = AP4_ATOM_TYPE('h','v','c','E');
 const AP4_Atom::Type AP4_ATOM_TYPE_AVCE = AP4_ATOM_TYPE('a','v','c','E');
 const AP4_Atom::Type AP4_ATOM_TYPE_WAVE = AP4_ATOM_TYPE('w','a','v','e');
@@ -513,6 +517,7 @@
 const AP4_Atom::Type AP4_ATOM_TYPE_MKID = AP4_ATOM_TYPE('m','k','i','d');
 const AP4_Atom::Type AP4_ATOM_TYPE_PRFT = AP4_ATOM_TYPE('p','r','f','t');
 const AP4_Atom::Type AP4_ATOM_TYPE_STPP = AP4_ATOM_TYPE('s','t','p','p');
+const AP4_Atom::Type AP4_ATOM_TYPE_DAC3 = AP4_ATOM_TYPE('d','a','c','3');
 const AP4_Atom::Type AP4_ATOM_TYPE_DEC3 = AP4_ATOM_TYPE('d','e','c','3');
 const AP4_Atom::Type AP4_ATOM_TYPE_DAC4 = AP4_ATOM_TYPE('d','a','c','4');
 const AP4_Atom::Type AP4_ATOM_TYPE_SIDX = AP4_ATOM_TYPE('s','i','d','x');

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4AtomFactory.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4AtomFactory.cpp Changed

@@ -86,6 +86,7 @@
 #include "Ap4AvccAtom.h"
 #include "Ap4HvccAtom.h"
 #include "Ap4DvccAtom.h"
+#include "Ap4VpccAtom.h"
 #include "Ap4Marlin.h"
 #include "Ap48bdlAtom.h"
 #include "Ap4Piff.h"
@@ -100,6 +101,7 @@
 #include "Ap4BlocAtom.h"
 #include "Ap4AinfAtom.h"
 #include "Ap4PsshAtom.h"
+#include "Ap4Dac3Atom.h"
 #include "Ap4Dec3Atom.h"
 #include "Ap4Dac4Atom.h"
 #include "Ap4SidxAtom.h"
@@ -336,6 +338,12 @@
             atom = new AP4_AudioSampleEntry(type, size_32, stream, *this);
             break;
             
+          case AP4_ATOM_TYPE_VP08:
+          case AP4_ATOM_TYPE_VP09:
+          case AP4_ATOM_TYPE_VP10:
+            atom = new AP4_VisualSampleEntry(type, size_32, stream, *this);
+            break;
+
           case AP4_ATOM_TYPE_RTP_:
             atom = new AP4_RtpHintSampleEntry(size_32, stream, *this);
             break;
@@ -501,6 +509,11 @@
             atom = AP4_DvccAtom::Create(size_32, stream);
             break;
 
+          case AP4_ATOM_TYPE_VPCC:
+            if (atom_is_large) return AP4_ERROR_INVALID_FORMAT;
+            atom = AP4_VpccAtom::Create(size_32, stream);
+            break;
+
           case AP4_ATOM_TYPE_HVCE:
             if (atom_is_large) return AP4_ERROR_INVALID_FORMAT;
             atom = AP4_HvccAtom::Create(size_32, stream);
@@ -723,6 +736,13 @@
             }
             break;
 
+          case AP4_ATOM_TYPE_DAC3:
+            if (atom_is_large) return AP4_ERROR_INVALID_FORMAT;
+            if (GetContext() == AP4_ATOM_TYPE_AC_3 || GetContext() == AP4_ATOM_TYPE_ENCA) {
+                atom = AP4_Dac3Atom::Create(size_32, stream);
+            }
+            break;
+
           case AP4_ATOM_TYPE_DEC3:
             if (atom_is_large) return AP4_ERROR_INVALID_FORMAT;
             if (GetContext() == AP4_ATOM_TYPE_EC_3 || GetContext() == AP4_ATOM_TYPE_ENCA) {

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4CommonEncryption.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4CommonEncryption.cpp Changed

@@ -1913,6 +1913,12 @@
             in  += cleartext_size+encrypted_size;
             out += cleartext_size+encrypted_size;
         }
+
+        // copy any leftover partial block
+        unsigned int partial = (unsigned int)(in_end-in);
+        if (partial) {
+            AP4_CopyMemory(out, in, partial);
+        }
     } else {
         if (m_FullBlocksOnly) {
             unsigned int block_count = data_in.GetDataSize()/16;
@@ -1933,7 +1939,7 @@
         } else {
             // process the entire sample data at once
             AP4_Size encrypted_size = data_in.GetDataSize();
-            AP4_Result result = m_Cipher->ProcessBuffer(in, encrypted_size, out, &encrypted_size, false);
+            AP4_Result result = m_Cipher->ProcessBuffer(in, encrypted_size, out, &encrypted_size, true);
             if (AP4_FAILED(result)) return result;
         }
     }
@@ -2771,20 +2777,8 @@
         }
     }
 
-    // try to create a sample info table from senc
-    if (sample_info_table == NULL && sample_encryption_atom) {
-        AP4_Result result = sample_encryption_atom->CreateSampleInfoTable(0,
-                                                                          crypt_byte_block,
-                                                                          skip_byte_block,
-                                                                          per_sample_iv_size,
-                                                                          constant_iv_size,
-                                                                          constant_iv,
-                                                                          sample_info_table);
-        if (AP4_FAILED(result)) return result;
-    }
-
     // try to create a sample info table from saio/saiz
-    if (traf) {
+    if (sample_info_table == NULL && traf) {
         for (AP4_List<AP4_Atom>::Item* child = traf->GetChildren().FirstItem();
                                        child;
                                        child = child->GetNext()) {
@@ -2800,7 +2794,7 @@
                 }
             }
         }
-        if (sample_info_table == NULL && saio && saiz) {
+        if (saio && saiz) {
             AP4_Result result = Create(0,
                                        crypt_byte_block,
                                        skip_byte_block,
@@ -2817,6 +2811,18 @@
         }
     }
     
+    // try to create a sample info table from senc
+    if (sample_info_table == NULL && sample_encryption_atom) {
+        AP4_Result result = sample_encryption_atom->CreateSampleInfoTable(0,
+                                                                          crypt_byte_block,
+                                                                          skip_byte_block,
+                                                                          per_sample_iv_size,
+                                                                          constant_iv_size,
+                                                                          constant_iv,
+                                                                          sample_info_table);
+        if (AP4_FAILED(result)) return result;
+    }
+
     if (sample_info_table == NULL) {
         return AP4_ERROR_INVALID_FORMAT;
     }

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4Config.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4Config.h Changed

bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4Dac3Atom.cpp Added

@@ -0,0 +1,115 @@
+/*****************************************************************
+|
+|    AP4 - dac3 Atoms
+|
+|    Copyright 2002-2019 Axiomatic Systems, LLC
+|
+|
+|    This file is part of Bento4/AP4 (MP4 Atom Processing Library).
+|
+|    Unless you have obtained Bento4 under a difference license,
+|    this version of Bento4 is Bento4|GPL.
+|    Bento4|GPL is free software; you can redistribute it and/or modify
+|    it under the terms of the GNU General Public License as published by
+|    the Free Software Foundation; either version 2, or (at your option)
+|    any later version.
+|
+|    Bento4|GPL is distributed in the hope that it will be useful,
+|    but WITHOUT ANY WARRANTY; without even the implied warranty of
+|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+|    GNU General Public License for more details.
+|
+|    You should have received a copy of the GNU General Public License
+|    along with Bento4|GPL; see the file COPYING.  If not, write to the
+|    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+|    02111-1307, USA.
+|
+****************************************************************/
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Dac3Atom.h"
+#include "Ap4AtomFactory.h"
+#include "Ap4Utils.h"
+#include "Ap4Types.h"
+
+/*----------------------------------------------------------------------
+|   dynamic cast support
++---------------------------------------------------------------------*/
+AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_Dac3Atom)
+
+/*----------------------------------------------------------------------
+|   AP4_Dac3Atom::Create
++---------------------------------------------------------------------*/
+AP4_Dac3Atom*
+AP4_Dac3Atom::Create(AP4_Size size, AP4_ByteStream& stream)
+{
+    // read the raw bytes in a buffer
+    unsigned int payload_size = size-AP4_ATOM_HEADER_SIZE;
+    AP4_DataBuffer payload_data(payload_size);
+    AP4_Result result = stream.Read(payload_data.UseData(), payload_size);
+    if (AP4_FAILED(result)) return NULL;
+    
+    // check the version
+    const AP4_UI08* payload = payload_data.GetData();
+    return new AP4_Dac3Atom(size, payload);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac3Atom::AP4_Dac3Atom
++---------------------------------------------------------------------*/
+AP4_Dac3Atom::AP4_Dac3Atom(AP4_UI32 size, const AP4_UI08* payload) :
+    AP4_Atom(AP4_ATOM_TYPE_DAC3, size),
+    m_DataRate(0)
+{
+    // make a copy of our configuration bytes
+    unsigned int payload_size = size-AP4_ATOM_HEADER_SIZE;
+    m_RawBytes.SetData(payload, payload_size);
+
+    // sanity check
+    if (payload_size < 3) {
+        memset(&m_StreamInfo, 0, sizeof(m_StreamInfo));
+        return;
+    }
+    
+    // parse the payload
+    m_DataRate = (payload[0]<<5)|(payload[1]>>3);
+    m_StreamInfo.fscod         = (payload[0]>>6) & 0x03;
+    m_StreamInfo.bsid          = (payload[0]>>1) & 0x1F;
+    m_StreamInfo.bsmod         = ((payload[0]<<2) | (payload[1]>>6)) & 0x07;
+    m_StreamInfo.acmod         = (payload[1]>>3) & 0x07;
+    m_StreamInfo.lfeon         = (payload[1]>>2) & 0x01;
+    m_StreamInfo.bit_rate_code = ((payload[1]<<3) | (payload[2]>>5)) & 0x1F;
+
+    const unsigned int bit_rate_table[19] = {
+        32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640
+    };
+    if (m_StreamInfo.bit_rate_code < sizeof(bit_rate_table)/sizeof(bit_rate_table[0])) {
+        m_DataRate = bit_rate_table[m_StreamInfo.bit_rate_code];
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac3Atom::WriteFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac3Atom::WriteFields(AP4_ByteStream& stream)
+{
+    return stream.Write(m_RawBytes.GetData(), m_RawBytes.GetDataSize());
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac3Atom::InspectFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac3Atom::InspectFields(AP4_AtomInspector& inspector)
+{
+    inspector.AddField("data_rate", m_DataRate);
+    inspector.AddField("fscod", m_StreamInfo.fscod);
+    inspector.AddField("bsid", m_StreamInfo.bsid);
+    inspector.AddField("bsmod", m_StreamInfo.bsmod);
+    inspector.AddField("acmod", m_StreamInfo.acmod);
+    inspector.AddField("lfeon", m_StreamInfo.lfeon);
+    return AP4_SUCCESS;
+}

bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4Dac3Atom.h Added

@@ -0,0 +1,83 @@
+/*****************************************************************
+|
+|    AP4 - dac3 Atoms
+|
+|    Copyright 2002-2019 Axiomatic Systems, LLC
+|
+|
+|    This file is part of Bento4/AP4 (MP4 Atom Processing Library).
+|
+|    Unless you have obtained Bento4 under a difference license,
+|    this version of Bento4 is Bento4|GPL.
+|    Bento4|GPL is free software; you can redistribute it and/or modify
+|    it under the terms of the GNU General Public License as published by
+|    the Free Software Foundation; either version 2, or (at your option)
+|    any later version.
+|
+|    Bento4|GPL is distributed in the hope that it will be useful,
+|    but WITHOUT ANY WARRANTY; without even the implied warranty of
+|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+|    GNU General Public License for more details.
+|
+|    You should have received a copy of the GNU General Public License
+|    along with Bento4|GPL; see the file COPYING.  If not, write to the
+|    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+|    02111-1307, USA.
+|
+****************************************************************/
+
+#ifndef _AP4_DAC3_ATOM_H_
+#define _AP4_DAC3_ATOM_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Atom.h"
+#include "Ap4Array.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------
+|   AP4_Dac3Atom
++---------------------------------------------------------------------*/
+class AP4_Dac3Atom : public AP4_Atom
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D(AP4_Dac3Atom, AP4_Atom)
+
+    // types
+    struct StreamInfo {
+        unsigned int fscod;
+        unsigned int bsid;
+        unsigned int bsmod;
+        unsigned int acmod;
+        unsigned int lfeon;
+        unsigned int bit_rate_code;
+    };
+
+    // class methods
+    static AP4_Dac3Atom* Create(AP4_Size size, AP4_ByteStream& stream);
+
+    // methods
+    virtual AP4_Result InspectFields(AP4_AtomInspector& inspector);
+    virtual AP4_Result WriteFields(AP4_ByteStream& stream);
+    virtual AP4_Atom* Clone() { return new AP4_Dac3Atom(m_Size32, m_RawBytes.GetData()); }
+
+    // accessors
+    const AP4_DataBuffer& GetRawBytes()   const { return m_RawBytes;   }
+    unsigned int          GetDataRate()   const { return m_DataRate;   }
+    const StreamInfo&     GetStreamInfo() const { return m_StreamInfo; }
+
+private:
+    // methods
+    AP4_Dac3Atom(AP4_UI32 size, const AP4_UI08* payload);
+    
+    // members
+    unsigned int   m_DataRate;
+    StreamInfo     m_StreamInfo;
+    AP4_DataBuffer m_RawBytes;
+};
+
+#endif // _AP4_DAC3_ATOM_H_

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4ElstAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4ElstAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4Expandable.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4Expandable.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4FileByteStream.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4FileByteStream.h Changed

@@ -1,6 +1,6 @@
 /*****************************************************************
 |
-|    AP4 - FileByteStream 
+|    AP4 - FileByteStream
 |
 |    Copyright 2002-2008 Axiomatic Systems, LLC
 |
@@ -52,18 +52,18 @@
     /**
      * Create a stream from a file (opened or created).
      *
-     * @param name Name of the file open or create
+     * @param name Name of the file to open or create
      * @param mode Mode to use for the file
-     * @param stream Refrence to a pointer where the stream object will
+     * @param stream Reference to a pointer where the stream object will
      * be returned
      * @return AP4_SUCCESS if the file can be opened or created, or an error code if
      * it cannot
      */
     static AP4_Result Create(const char* name, Mode mode, AP4_ByteStream*& stream);
-    
+
     // constructors
     AP4_FileByteStream(AP4_ByteStream* delegate) : m_Delegate(delegate) {}
-    
+
 #if !defined(AP4_CONFIG_NO_EXCEPTIONS)
     /**
      * @deprecated
@@ -72,13 +72,13 @@
 #endif
 
     // AP4_ByteStream methods
-    AP4_Result ReadPartial(void*    buffer, 
-                           AP4_Size  bytesToRead, 
+    AP4_Result ReadPartial(void*    buffer,
+                           AP4_Size  bytesToRead,
                            AP4_Size& bytesRead) {
         return m_Delegate->ReadPartial(buffer, bytesToRead, bytesRead);
     }
-    AP4_Result WritePartial(const void* buffer, 
-                            AP4_Size    bytesToWrite, 
+    AP4_Result WritePartial(const void* buffer,
+                            AP4_Size    bytesToWrite,
                             AP4_Size&   bytesWritten) {
         return m_Delegate->WritePartial(buffer, bytesToWrite, bytesWritten);
     }

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4HvccAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4HvccAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4HvccAtom.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4HvccAtom.h Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4MdhdAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4MdhdAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4SaioAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4SaioAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4SaizAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4SaizAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4SampleDescription.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4SampleDescription.cpp Changed

@@ -35,6 +35,7 @@
 #include "Ap4SampleEntry.h"
 #include "Ap4AvccAtom.h"
 #include "Ap4HvccAtom.h"
+#include "Ap4VpccAtom.h"
 #include "Ap4Utils.h"
 #include "Ap4Mp4AudioInfo.h"
 
@@ -107,6 +108,9 @@
         case AP4_SAMPLE_FORMAT_VC_1: return "SMPTE VC-1";
         case AP4_SAMPLE_FORMAT_XML_: return "XML Metadata";
         case AP4_SAMPLE_FORMAT_STPP: return "Timed Text";
+        case AP4_SAMPLE_FORMAT_VP8:  return "VP8";
+        case AP4_SAMPLE_FORMAT_VP9:  return "VP9";
+        case AP4_SAMPLE_FORMAT_VP10: return "VP10";
         default: return NULL;
     }
 }
@@ -899,6 +903,9 @@
         case AP4_OTI_DTS_HIRES_AUDIO:      return "DTS High Resolution Audio";
         case AP4_OTI_DTS_MASTER_AUDIO:     return "DTS Master Audio";
         case AP4_OTI_DTS_EXPRESS_AUDIO:    return "DTS Express/LBR Audio";
+        case AP4_OTI_OPUS_AUDIO:           return "Opus Audio";
+        case AP4_OTI_VP9_VIDEO:            return "VP9 Video";
+        case AP4_OTI_VORBIS_AUDIO:         return "Vorbis Audio";
         case AP4_OTI_13K_VOICE:            return "13K Voice";
         default:                           return "UNKNOWN";
     }

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4SampleDescription.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4SampleDescription.h Changed

@@ -97,6 +97,9 @@
 const AP4_UI32 AP4_SAMPLE_FORMAT_STPP = AP4_ATOM_TYPE('s','t','p','p');
 const AP4_UI32 AP4_SAMPLE_FORMAT_FLAC = AP4_ATOM_TYPE('f','L','a','C');
 const AP4_UI32 AP4_SAMPLE_FORMAT_OPUS = AP4_ATOM_TYPE('O','p','u','s');
+const AP4_UI32 AP4_SAMPLE_FORMAT_VP8  = AP4_ATOM_TYPE('v','p','0','8');
+const AP4_UI32 AP4_SAMPLE_FORMAT_VP9  = AP4_ATOM_TYPE('v','p','0','9');
+const AP4_UI32 AP4_SAMPLE_FORMAT_VP10 = AP4_ATOM_TYPE('v','p','1','0');
 
 const char*
 AP4_GetFormatName(AP4_UI32 format);
@@ -635,6 +638,9 @@
 const AP4_MpegSampleDescription::OTI AP4_OTI_DTS_HIRES_AUDIO      = 0xAA;
 const AP4_MpegSampleDescription::OTI AP4_OTI_DTS_MASTER_AUDIO     = 0xAB;
 const AP4_MpegSampleDescription::OTI AP4_OTI_DTS_EXPRESS_AUDIO    = 0xAC;
+const AP4_MpegSampleDescription::OTI AP4_OTI_OPUS_AUDIO           = 0xAD;
+const AP4_MpegSampleDescription::OTI AP4_OTI_VP9_VIDEO            = 0xB1;
+const AP4_MpegSampleDescription::OTI AP4_OTI_VORBIS_AUDIO         = 0xDD; // Not standard!
 const AP4_MpegSampleDescription::OTI AP4_OTI_13K_VOICE            = 0xE1;
 
 const AP4_UI08 AP4_MPEG4_AUDIO_OBJECT_TYPE_AAC_MAIN              = 1;  /**< AAC Main Profile                             */

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4StsdAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4StsdAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4TrunAtom.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4TrunAtom.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/Core/Ap4Version.h -> bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4Version.h Changed

bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4VpccAtom.cpp Added

@@ -0,0 +1,184 @@
+/*****************************************************************
+|
+|    AP4 - vpcC Atoms
+|
+|    Copyright 2002-2020 Axiomatic Systems, LLC
+|
+|
+|    This file is part of Bento4/AP4 (MP4 Atom Processing Library).
+|
+|    Unless you have obtained Bento4 under a difference license,
+|    this version of Bento4 is Bento4|GPL.
+|    Bento4|GPL is free software; you can redistribute it and/or modify
+|    it under the terms of the GNU General Public License as published by
+|    the Free Software Foundation; either version 2, or (at your option)
+|    any later version.
+|
+|    Bento4|GPL is distributed in the hope that it will be useful,
+|    but WITHOUT ANY WARRANTY; without even the implied warranty of
+|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+|    GNU General Public License for more details.
+|
+|    You should have received a copy of the GNU General Public License
+|    along with Bento4|GPL; see the file COPYING.  If not, write to the
+|    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+|    02111-1307, USA.
+|
+****************************************************************/
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4VpccAtom.h"
+#include "Ap4AtomFactory.h"
+#include "Ap4Utils.h"
+#include "Ap4Types.h"
+#include "Ap4DataBuffer.h"
+#include "Ap4Utils.h"
+
+/*----------------------------------------------------------------------
+|   dynamic cast support
++---------------------------------------------------------------------*/
+AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_VpccAtom)
+
+/*----------------------------------------------------------------------
+|   AP4_VpccAtom::Create
++---------------------------------------------------------------------*/
+AP4_VpccAtom*
+AP4_VpccAtom::Create(AP4_Size size, AP4_ByteStream& stream)
+{
+    AP4_UI08 version;
+    AP4_UI32 flags;
+    if (size < AP4_FULL_ATOM_HEADER_SIZE) return NULL;
+    if (AP4_FAILED(AP4_Atom::ReadFullHeader(stream, version, flags))) return NULL;
+
+    unsigned int payload_size = size - AP4_FULL_ATOM_HEADER_SIZE;
+    if (payload_size < 8) {
+        return NULL;
+    }
+
+    AP4_UI08 profile;
+    stream.ReadUI08(profile);
+    AP4_UI08 level;
+    stream.ReadUI08(level);
+    AP4_UI08 byte;
+    stream.ReadUI08(byte);
+    AP4_UI08 bit_depth = (byte >> 4) & 0XF;
+    AP4_UI08 chroma_subsampling = (byte >> 1) & 7;
+    bool video_full_range_flag = (byte & 1) != 0;
+    AP4_UI08 colour_primaries;
+    stream.ReadUI08(colour_primaries);
+    AP4_UI08 transfer_characteristics;
+    stream.ReadUI08(transfer_characteristics);
+    AP4_UI08 matrix_coefficients;
+    stream.ReadUI08(matrix_coefficients);
+    AP4_UI16 codec_initialization_data_size = 0;
+    stream.ReadUI16(codec_initialization_data_size);
+    if (codec_initialization_data_size > payload_size - 8) {
+        return NULL;
+    }
+    AP4_DataBuffer codec_initialization_data;
+    AP4_Result result = codec_initialization_data.SetDataSize(codec_initialization_data_size);
+    if (AP4_FAILED(result)) {
+        return NULL;
+    }
+    return new AP4_VpccAtom(profile,
+                            level,
+                            bit_depth,
+                            chroma_subsampling,
+                            video_full_range_flag,
+                            colour_primaries,
+                            transfer_characteristics,
+                            matrix_coefficients,
+                            codec_initialization_data.GetData(),
+                            codec_initialization_data.GetDataSize());
+}
+
+/*----------------------------------------------------------------------
+|   AP4_VpccAtom::AP4_VpccAtom
++---------------------------------------------------------------------*/
+AP4_VpccAtom::AP4_VpccAtom(AP4_UI08        profile,
+                           AP4_UI08        level,
+                           AP4_UI08        bit_depth,
+                           AP4_UI08        chroma_subsampling,
+                           bool            videofull_range_flag,
+                           AP4_UI08        colour_primaries,
+                           AP4_UI08        transfer_characteristics,
+                           AP4_UI08        matrix_coefficients,
+                           const AP4_UI08* codec_initialization_data,
+                           unsigned int    codec_initialization_data_size) :
+    AP4_Atom(AP4_ATOM_TYPE_VPCC, AP4_FULL_ATOM_HEADER_SIZE + 8 + codec_initialization_data_size, 1, 0),
+    m_Profile(profile),
+    m_Level(level),
+    m_BitDepth(bit_depth),
+    m_ChromaSubsampling(chroma_subsampling),
+    m_VideoFullRangeFlag(videofull_range_flag),
+    m_ColourPrimaries(colour_primaries),
+    m_TransferCharacteristics(transfer_characteristics),
+    m_MatrixCoefficients(matrix_coefficients)
+{
+    if (codec_initialization_data && codec_initialization_data_size) {
+        m_CodecIntializationData.SetData(codec_initialization_data, codec_initialization_data_size);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_VpccAtom::GetCodecString
++---------------------------------------------------------------------*/
+void
+AP4_VpccAtom::GetCodecString(AP4_UI32 container_type, AP4_String& codec)
+{
+    char type_name[5];
+    AP4_FormatFourChars(type_name, container_type);
+    char string[64];
+    AP4_FormatString(string,
+                     sizeof(string),
+                     "%s.%02d.%02d.%02d.%02d.%02d.%02d.%02d.%02d",
+                     type_name,
+                     m_Profile,
+                     m_Level,
+                     m_BitDepth,
+                     m_ChromaSubsampling,
+                     m_ColourPrimaries,
+                     m_TransferCharacteristics,
+                     m_MatrixCoefficients,
+                     m_VideoFullRangeFlag ? 1 : 0);
+    codec = string;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_VpccAtom::WriteFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_VpccAtom::WriteFields(AP4_ByteStream& stream)
+{
+    stream.WriteUI08(m_Profile);
+    stream.WriteUI08(m_Level);
+    stream.WriteUI08((m_BitDepth << 4) | (m_ChromaSubsampling << 1) | (m_VideoFullRangeFlag ? 1 : 0));
+    stream.WriteUI08(m_ColourPrimaries);
+    stream.WriteUI08(m_TransferCharacteristics);
+    stream.WriteUI08(m_MatrixCoefficients);
+    stream.WriteUI16((AP4_UI16)m_CodecIntializationData.GetDataSize());
+    stream.Write(m_CodecIntializationData.GetData(), m_CodecIntializationData.GetDataSize());
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_VpccAtom::InspectFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_VpccAtom::InspectFields(AP4_AtomInspector& inspector)
+{
+    inspector.AddField("profile", m_Profile);
+    inspector.AddField("level", m_Level);
+    inspector.AddField("bit depth", m_BitDepth);
+    inspector.AddField("chroma subsampling", m_ChromaSubsampling);
+    inspector.AddField("video full range flag", m_VideoFullRangeFlag);
+    inspector.AddField("colour primaries", m_ColourPrimaries);
+    inspector.AddField("matrix coefficients", m_MatrixCoefficients);
+    inspector.AddField("codec initialization data",
+                       m_CodecIntializationData.GetData(),
+                       m_CodecIntializationData.GetDataSize());
+    return AP4_SUCCESS;
+}

bento4-1.6.0r634.tar.gz/Source/C++/Core/Ap4VpccAtom.h Added

@@ -0,0 +1,102 @@
+/*****************************************************************
+|
+|    AP4 - vpcC Atoms
+|
+|    Copyright 2002-2020 Axiomatic Systems, LLC
+|
+|
+|    This file is part of Bento4/AP4 (MP4 Atom Processing Library).
+|
+|    Unless you have obtained Bento4 under a difference license,
+|    this version of Bento4 is Bento4|GPL.
+|    Bento4|GPL is free software; you can redistribute it and/or modify
+|    it under the terms of the GNU General Public License as published by
+|    the Free Software Foundation; either version 2, or (at your option)
+|    any later version.
+|
+|    Bento4|GPL is distributed in the hope that it will be useful,
+|    but WITHOUT ANY WARRANTY; without even the implied warranty of
+|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+|    GNU General Public License for more details.
+|
+|    You should have received a copy of the GNU General Public License
+|    along with Bento4|GPL; see the file COPYING.  If not, write to the
+|    Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+|    02111-1307, USA.
+|
+****************************************************************/
+
+#ifndef _AP4_VPCC_ATOM_H_
+#define _AP4_VPCC_ATOM_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Atom.h"
+#include "Ap4Array.h"
+#include "Ap4DataBuffer.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+
+
+/*----------------------------------------------------------------------
+|   AP4_VpccAtom
++---------------------------------------------------------------------*/
+class AP4_VpccAtom : public AP4_Atom
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D(AP4_VpccAtom, AP4_Atom)
+
+    // class methods
+    static AP4_VpccAtom* Create(AP4_Size size, AP4_ByteStream& stream);
+
+    // constructors
+    AP4_VpccAtom(AP4_UI08        profile,
+                 AP4_UI08        level,
+                 AP4_UI08        bit_depth,
+                 AP4_UI08        chroma_subsampling,
+                 bool            videofull_range_flag,
+                 AP4_UI08        colour_primaries,
+                 AP4_UI08        transfer_characteristics,
+                 AP4_UI08        matrix_coefficients,
+                 const AP4_UI08* codec_initialization_data,
+                 unsigned int    codec_initialization_data_size
+    );
+
+    // methods
+    virtual AP4_Result InspectFields(AP4_AtomInspector& inspector);
+    virtual AP4_Result WriteFields(AP4_ByteStream& stream);
+
+    // accessors
+    AP4_UI08              GetProfile()                 { return m_Profile;                 }
+    AP4_UI08              GetLevel()                   { return m_Level;                   }
+    AP4_UI08              GetBitDepth()                { return m_BitDepth;                }
+    AP4_UI08              GetChromaSubsampling()       { return m_ChromaSubsampling;       }
+    bool                  GetVideoFullRangeFlag()      { return m_VideoFullRangeFlag;      }
+    AP4_UI08              GetColourPrimaries()         { return m_ColourPrimaries;         }
+    AP4_UI08              GetTransferCharacteristics() { return m_TransferCharacteristics; }
+    AP4_UI08              GetMatrixCoefficients()      { return m_MatrixCoefficients;      }
+    const AP4_DataBuffer& GetCodecInitializationData() { return m_CodecIntializationData;  }
+
+    // helpers
+    void GetCodecString(AP4_UI32 container_type, AP4_String& codec);
+
+private:
+    // methods
+    AP4_VpccAtom(AP4_UI32 size, const AP4_UI08* payload);
+
+    // members
+    AP4_UI08       m_Profile;
+    AP4_UI08       m_Level;
+    AP4_UI08       m_BitDepth;
+    AP4_UI08       m_ChromaSubsampling;
+    bool           m_VideoFullRangeFlag;
+    AP4_UI08       m_ColourPrimaries;
+    AP4_UI08       m_TransferCharacteristics;
+    AP4_UI08       m_MatrixCoefficients;
+    AP4_DataBuffer m_CodecIntializationData;
+};
+
+#endif // _AP4_VPCC_ATOM_H_

bento4-1.5.1r629.tar.gz/Source/C++/Crypto/Ap4AesBlockCipher.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Crypto/Ap4AesBlockCipher.cpp Changed

@@ -11,23 +11,23 @@
 
 LICENSE TERMS
 
-The free distribution and use of this software in both source and binary 
+The free distribution and use of this software in both source and binary
 form is allowed (with or without changes) provided that:
 
-1. distributions of this source code include the above copyright 
+1. distributions of this source code include the above copyright
 notice, this list of conditions and the following disclaimer;
 
 2. distributions in binary form include the above copyright
 notice, this list of conditions and the following disclaimer
 in the documentation and/or other associated materials;
 
-3. the copyright holder's name is not used to endorse products 
-built using this software without specific written permission. 
+3. the copyright holder's name is not used to endorse products
+built using this software without specific written permission.
 
 DISCLAIMER
 
 This software is provided 'as is' with no explicit or implied warranties
-in respect of its properties, including, but not limited to, correctness 
+in respect of its properties, including, but not limited to, correctness
 and fitness for purpose.
 -------------------------------------------------------------------------
 Issue Date: 29/07/2002
@@ -39,6 +39,7 @@
 #include "Ap4AesBlockCipher.h"
 #include "Ap4Results.h"
 #include "Ap4Utils.h"
+#include "Ap4Config.h"
 
 /*----------------------------------------------------------------------
 |   AES types
@@ -69,21 +70,21 @@
 /*  START OF CONFIGURATION OPTIONS
 
     USE OF DEFINES
-  
-    Later in this section there are a number of defines that control the 
-    operation of the code.  In each section, the purpose of each define is 
-    explained so that the relevant form can be included or excluded by 
-    setting either 1's or 0's respectively on the branches of the related 
+
+    Later in this section there are a number of defines that control the
+    operation of the code.  In each section, the purpose of each define is
+    explained so that the relevant form can be included or excluded by
+    setting either 1's or 0's respectively on the branches of the related
     #if clauses.
 */
 
 /*  1. BYTE ORDER IN 32-BIT WORDS
 
-    To obtain the highest speed on processors with 32-bit words, this code 
+    To obtain the highest speed on processors with 32-bit words, this code
     needs to determine the order in which bytes are packed into such words.
-    The following block of code is an attempt to capture the most obvious 
-    ways in which various environemnts define byte order. It may well fail, 
-    in which case the definitions will need to be set by editing at the 
+    The following block of code is an attempt to capture the most obvious
+    ways in which various environments define byte order. It may well fail,
+    in which case the definitions will need to be set by editing at the
     points marked **** EDIT HERE IF NECESSARY **** below.
 */
 #define AES_LITTLE_ENDIAN   1234 /* byte 0 is least significant (i386) */
@@ -105,27 +106,27 @@
 
 /*  2. BYTE ORDER WITHIN 32 BIT WORDS
 
-    The fundamental data processing units in Rijndael are 8-bit bytes. The 
-    input, output and key input are all enumerated arrays of bytes in which 
-    bytes are numbered starting at zero and increasing to one less than the 
-    number of bytes in the array in question. This enumeration is only used 
-    for naming bytes and does not imply any adjacency or order relationship 
-    from one byte to another. When these inputs and outputs are considered 
-    as bit sequences, bits 8*n to 8*n+7 of the bit sequence are mapped to 
-    byte[n] with bit 8n+i in the sequence mapped to bit 7-i within the byte. 
-    In this implementation bits are numbered from 0 to 7 starting at the 
+    The fundamental data processing units in Rijndael are 8-bit bytes. The
+    input, output and key input are all enumerated arrays of bytes in which
+    bytes are numbered starting at zero and increasing to one less than the
+    number of bytes in the array in question. This enumeration is only used
+    for naming bytes and does not imply any adjacency or order relationship
+    from one byte to another. When these inputs and outputs are considered
+    as bit sequences, bits 8*n to 8*n+7 of the bit sequence are mapped to
+    byte[n] with bit 8n+i in the sequence mapped to bit 7-i within the byte.
+    In this implementation bits are numbered from 0 to 7 starting at the
     numerically least significant end of each byte (bit n represents 2^n).
 
-    However, Rijndael can be implemented more efficiently using 32-bit 
+    However, Rijndael can be implemented more efficiently using 32-bit
     words by packing bytes into words so that bytes 4*n to 4*n+3 are placed
-    into word[n]. While in principle these bytes can be assembled into words 
-    in any positions, this implementation only supports the two formats in 
+    into word[n]. While in principle these bytes can be assembled into words
+    in any positions, this implementation only supports the two formats in
     which bytes in adjacent positions within words also have adjacent byte
-    numbers. This order is called big-endian if the lowest numbered bytes 
-    in words have the highest numeric significance and little-endian if the 
-    opposite applies. 
-    
-    This code can work in either order irrespective of the order used by the 
+    numbers. This order is called big-endian if the lowest numbered bytes
+    in words have the highest numeric significance and little-endian if the
+    opposite applies.
+
+    This code can work in either order irrespective of the order used by the
     machine on which it runs. Normally the internal byte order will be set
     to the order of the processor on which the code is to be run but this
     define can be used to reverse this in special situations
@@ -138,20 +139,20 @@
 #define INTERNAL_BYTE_ORDER AES_BIG_ENDIAN
 #endif
 
-/*  3. FAST INPUT/OUTPUT OPERATIONS.  
+/*  3. FAST INPUT/OUTPUT OPERATIONS.
 
-    On some machines it is possible to improve speed by transferring the 
-    bytes in the input and output arrays to and from the internal 32-bit 
-    variables by addressing these arrays as if they are arrays of 32-bit 
-    words.  On some machines this will always be possible but there may 
-    be a large performance penalty if the byte arrays are not aligned on 
-    the normal word boundaries. On other machines this technique will 
+    On some machines it is possible to improve speed by transferring the
+    bytes in the input and output arrays to and from the internal 32-bit
+    variables by addressing these arrays as if they are arrays of 32-bit
+    words.  On some machines this will always be possible but there may
+    be a large performance penalty if the byte arrays are not aligned on
+    the normal word boundaries. On other machines this technique will
     lead to memory access errors when such 32-bit word accesses are not
-    properly aligned. The option SAFE_IO avoids such problems but will 
-    often be slower on those machines that support misaligned access 
-    (especially so if care is taken to align the input  and output byte 
-    arrays on 32-bit word boundaries). If SAFE_IO is not defined it is 
-    assumed that access to byte arrays as if they are arrays of 32-bit 
+    properly aligned. The option SAFE_IO avoids such problems but will
+    often be slower on those machines that support misaligned access
+    (especially so if care is taken to align the input  and output byte
+    arrays on 32-bit word boundaries). If SAFE_IO is not defined it is
+    assumed that access to byte arrays as if they are arrays of 32-bit
     words will not cause problems when such accesses are misaligned.
 */
 #if 1
@@ -161,12 +162,12 @@
 /*  4. LOOP UNROLLING
 
     The code for encryption and decrytpion cycles through a number of rounds
-    that can be implemented either in a loop or by expanding the code into a 
+    that can be implemented either in a loop or by expanding the code into a
     long sequence of instructions, the latter producing a larger program but
     one that will often be much faster. The latter is called loop unrolling.
     There are also potential speed advantages in expanding two iterations in
     a loop with half the number of iterations, which is called partial loop
-    unrolling.  The following options allow partial or full loop unrolling 
+    unrolling.  The following options allow partial or full loop unrolling
     to be set independently for encryption and decryption
 */
 #if 0
@@ -187,8 +188,8 @@
 
 /*  5. FIXED OR DYNAMIC TABLES
 
-    When this section is included the tables used by the code are comipled 
-    statically into the binary file.  Otherwise they are computed once when 
+    When this section is included the tables used by the code are comipled
+    statically into the binary file.  Otherwise they are computed once when
     the code is first used.
 */
 #if 1
@@ -197,7 +198,7 @@
 
 /*  6. FAST FINITE FIELD OPERATIONS
 
-    If this section is included, tables are used to provide faster finite 
+    If this section is included, tables are used to provide faster finite
     field arithmetic (this has no effect if FIXED_TABLES is defined).
 */
 #if 1
@@ -206,8 +207,8 @@
 
 /*  7. INTERNAL STATE VARIABLE FORMAT
 
-    The internal state of Rijndael is stored in a number of local 32-bit 
-    word varaibles which can be defined either as an array or as individual 
+    The internal state of Rijndael is stored in a number of local 32-bit
+    word varaibles which can be defined either as an array or as individual
     names variables. Include this section if you want to store these local
     variables in arrays. Otherwise individual local variables will be used.
 */
@@ -217,10 +218,10 @@
 
 /* In this implementation the columns of the state array are each held in
    32-bit words. The state array can be held in various ways: in an array
-   of words, in a number of individual word variables or in a number of 
+   of words, in a number of individual word variables or in a number of
    processor registers. The following define maps a variable name x and
    a column number c to the way the state array variable is to be held.
-   The first define below maps the state into an array x[c] whereas the 
+   The first define below maps the state into an array x[c] whereas the
    second form maps the state into a number of individual variables x0,
    x1, etc.  Another form could map individual state colums to machine
    register names.
@@ -246,16 +247,16 @@
 
     This cipher proceeds by repeating in a number of cycles known as 'rounds'
     which are implemented by a round function which can optionally be speeded
-    up using tables.  The basic tables are each 256 32-bit words, with either 
+    up using tables.  The basic tables are each 256 32-bit words, with either
     one or four tables being required for each round function depending on
     how much speed is required. The encryption and decryption round functions
     are different and the last encryption and decrytpion round functions are
     different again making four different round functions in all.
 
     This means that:
-      1. Normal encryption and decryption rounds can each use either 0, 1 
+      1. Normal encryption and decryption rounds can each use either 0, 1
          or 4 tables and table spaces of 0, 1024 or 4096 bytes each.
-      2. The last encryption and decryption rounds can also use either 0, 1 
+      2. The last encryption and decryption rounds can also use either 0, 1
          or 4 tables and table spaces of 0, 1024 or 4096 bytes each.
 
     Include or exclude the appropriate definitions below to set the number
@@ -295,7 +296,7 @@
 #endif
 
 /*  The decryption key schedule can be speeded up with tables in the same
-    way that the round functions can.  Include or exclude the following 
+    way that the round functions can.  Include or exclude the following
     defines to set this requirement.
 */
 #if 1
@@ -317,7 +318,7 @@
 
 #if defined(BLOCK_SIZE) && ((BLOCK_SIZE & 3) || BLOCK_SIZE < 16 || BLOCK_SIZE > 32)
 #error An illegal block size has been specified.
-#endif  
+#endif
 
 #if !defined(BLOCK_SIZE)
 #define RC_LENGTH    29
@@ -332,7 +333,7 @@
 #define LAST_ENC_ROUND  NO_TABLES
 #elif ENC_ROUND == ONE_TABLE && LAST_ENC_ROUND == FOUR_TABLES
 #undef  LAST_ENC_ROUND
-#define LAST_ENC_ROUND  ONE_TABLE 
+#define LAST_ENC_ROUND  ONE_TABLE
 #endif
 
 #if ENC_ROUND == NO_TABLES && ENC_UNROLL != NONE
@@ -345,7 +346,7 @@
 #define LAST_DEC_ROUND  NO_TABLES
 #elif DEC_ROUND == ONE_TABLE && LAST_DEC_ROUND == FOUR_TABLES
 #undef  LAST_DEC_ROUND
-#define LAST_DEC_ROUND  ONE_TABLE 
+#define LAST_DEC_ROUND  ONE_TABLE
 #endif
 
 #if DEC_ROUND == NO_TABLES && DEC_UNROLL != NONE
@@ -355,11 +356,11 @@
 
 /*  upr(x,n):  rotates bytes within words by n positions, moving bytes to
                higher index positions with wrap around into low positions
-    ups(x,n):  moves bytes by n positions to higher index positions in 
+    ups(x,n):  moves bytes by n positions to higher index positions in
                words but without wrap around
     bval(x,n): extracts a byte from a word
 
-    NOTE:      The definitions given here are intended only for use with 
+    NOTE:      The definitions given here are intended only for use with
                unsigned variables and with shift counts that are compile
                time constants
 */
@@ -401,7 +402,7 @@
 #if !defined(_MSC_VER)
 #define _lrotl(x,n)     ((((aes_32t)(x)) <<  n) | (((aes_32t)(x)) >> (32 - n)))
 #endif
-#define bswap_32(x)     ((_lrotl((x),8) & 0x00ff00ff) | (_lrotl((x),24) & 0xff00ff00)) 
+#define bswap_32(x)     ((_lrotl((x),8) & 0x00ff00ff) | (_lrotl((x),24) & 0xff00ff00))
 #endif
 
 #define word_in(x)      bswap_32(*(aes_32t*)(x))
@@ -424,9 +425,9 @@
    give improved performance if a fast 32-bit multiply is not available. Note
    that a temporary variable u needs to be defined where FFmulX is used.
 
-#define FFmulX(x) (u = (x) & m1, u |= (u >> 1), ((x) & m2) << 1) ^ ((u >> 3) | (u >> 6)) 
+#define FFmulX(x) (u = (x) & m1, u |= (u >> 1), ((x) & m2) << 1) ^ ((u >> 3) | (u >> 6))
 #define m4  (0x01010101 * BPOLY)
-#define FFmulX(x) (u = (x) & m1, ((x) & m2) << 1) ^ ((u - (u >> 7)) & m4) 
+#define FFmulX(x) (u = (x) & m1, ((x) & m2) << 1) ^ ((u - (u >> 7)) & m4)
 */
 
 /* Work out which tables are needed for the different options   */
@@ -651,7 +652,7 @@
 /*----------------------------------------------------------------------
 |   tables
 +---------------------------------------------------------------------*/
-#if defined(FIXED_TABLES) || !defined(FF_TABLES) 
+#if defined(FIXED_TABLES) || !defined(FF_TABLES)
 
 /*  finite field arithmetic operations */
 
@@ -773,7 +774,7 @@
 
 #define h0(x)   (x)
 
-/*  These defines are used to ensure tables are generated in the 
+/*  These defines are used to ensure tables are generated in the
     right format depending on the internal byte order required
 */
 
@@ -831,7 +832,7 @@
 static const aes_32t ft_tab[256] = { sb_data(u0) };
 #endif
 #ifdef  FT4_SET
-static const aes_32t ft_tab[4][256] = 
+static const aes_32t ft_tab[4][256] =
     { {  sb_data(u0) }, {  sb_data(u1) }, {  sb_data(u2) }, {  sb_data(u3) } };
 #endif
 
@@ -839,7 +840,7 @@
 static const aes_32t fl_tab[256] = { sb_data(w0) };
 #endif
 #ifdef  FL4_SET
-static const aes_32t fl_tab[4][256] = 
+static const aes_32t fl_tab[4][256] =
     { {  sb_data(w0) }, {  sb_data(w1) }, {  sb_data(w2) }, {  sb_data(w3) } };
 #endif
 
@@ -855,7 +856,7 @@
 static const aes_32t il_tab[256] = { isb_data(w0) };
 #endif
 #ifdef  IL4_SET
-static const aes_32t il_tab[4][256] = 
+static const aes_32t il_tab[4][256] =
     { { isb_data(w0) }, { isb_data(w1) }, { isb_data(w2) }, { isb_data(w3) } };
 #endif
 
@@ -863,7 +864,7 @@
 static const aes_32t ls_tab[256] = { sb_data(w0) };
 #endif
 #ifdef  LS4_SET
-/* GBG: unused? 
+/* GBG: unused?
 static const aes_32t ls_tab[4][256] =
     { {  sb_data(w0) }, {  sb_data(w1) }, {  sb_data(w2) }, {  sb_data(w3) } };
 */
@@ -873,7 +874,7 @@
 static const aes_32t im_tab[256] = { mm_data(v0) };
 #endif
 #ifdef  IM4_SET
-static const aes_32t im_tab[4][256] = 
+static const aes_32t im_tab[4][256] =
     { {  mm_data(v0) }, {  mm_data(v1) }, {  mm_data(v2) }, {  mm_data(v3) } };
 #endif
 
@@ -938,8 +939,8 @@
 
 /*  Generate the tables for the dynamic table option
 
-    It will generally be sensible to use tables to compute finite 
-    field multiplies and inverses but where memory is scarse this 
+    It will generally be sensible to use tables to compute finite
+    field multiplies and inverses but where memory is scarse this
     code might sometimes be better. But it only has effect during
     initialisation so its pretty unimportant in overall terms.
 */
@@ -951,7 +952,7 @@
 
 static aes_08t hibit(const aes_32t x)
 {   aes_08t r = (aes_08t)((x >> 1) | (x >> 2));
-    
+
     r |= (r >> 2);
     r |= (r >> 4);
     return (r + 1) >> 1;
@@ -969,14 +970,14 @@
         if(!n1) return v1;
 
         while(n2 >= n1)
-        {   
+        {
             n2 /= n1; p2 ^= p1 * n2; v2 ^= v1 * n2; n2 = hibit(p2);
         }
-        
+
         if(!n2) return v2;
 
         while(n1 >= n2)
-        {   
+        {
             n1 /= n2; p1 ^= p2 * n1; v1 ^= v2 * n1; n1 = hibit(p1);
         }
     }
@@ -1016,9 +1017,9 @@
         root is 0x03, used here to generate the tables
     */
 
-    i = 0; w = 1; 
+    i = 0; w = 1;
     do
-    {   
+    {
         pow[i] = (aes_08t)w;
         pow[i + 255] = (aes_08t)w;
         log[w] = (aes_08t)i++;
@@ -1128,8 +1129,8 @@
     if(!tab_init) gen_tabs();
 #endif
 
-    if((blen & 7) || blen < 16 || blen > 32) 
-    {     
+    if((blen & 7) || blen < 16 || blen > 32)
+    {
         cx->n_blk = 0; return aes_bad;
     }
 
@@ -1144,10 +1145,10 @@
    This corresponds to bit lengths of 128, 192 and 256 bits, and
    to Nk values of 4, 6 and 8 respectively.
 
-   The following macros implement a single cycle in the key 
-   schedule generation process. The number of cycles needed 
+   The following macros implement a single cycle in the key
+   schedule generation process. The number of cycles needed
    for each cx->n_col and nk value is:
- 
+
     nk =             4  5  6  7  8
     ------------------------------
     cx->n_col = 4   10  9  8  7  7
@@ -1190,7 +1191,7 @@
 #if defined(ENCRYPTION_KEY_SCHEDULE)
 
 static aes_rval aes_enc_key(const unsigned char in_key[], unsigned int klen, aes_ctx cx[1])
-{   aes_32t    ss[8]; 
+{   aes_32t    ss[8];
 
 #if !defined(FIXED_TABLES)
     if(!tab_init) gen_tabs();
@@ -1201,7 +1202,7 @@
 #else
     cx->n_blk = BLOCK_SIZE;
 #endif
-    
+
     cx->n_blk = (cx->n_blk & ~3) | 1;
 
     cx->k_sch[0] = ss[0] = word_in(in_key     );
@@ -1213,29 +1214,29 @@
 
     switch(klen)
     {
-    case 16:    ke4(cx->k_sch, 0); ke4(cx->k_sch, 1); 
+    case 16:    ke4(cx->k_sch, 0); ke4(cx->k_sch, 1);
                 ke4(cx->k_sch, 2); ke4(cx->k_sch, 3);
-                ke4(cx->k_sch, 4); ke4(cx->k_sch, 5); 
+                ke4(cx->k_sch, 4); ke4(cx->k_sch, 5);
                 ke4(cx->k_sch, 6); ke4(cx->k_sch, 7);
-                ke4(cx->k_sch, 8); kel4(cx->k_sch, 9); 
+                ke4(cx->k_sch, 8); kel4(cx->k_sch, 9);
                 cx->n_rnd = 10; break;
     case 24:    cx->k_sch[4] = ss[4] = word_in(in_key + 16);
                 cx->k_sch[5] = ss[5] = word_in(in_key + 20);
-                ke6(cx->k_sch, 0); ke6(cx->k_sch, 1); 
+                ke6(cx->k_sch, 0); ke6(cx->k_sch, 1);
                 ke6(cx->k_sch, 2); ke6(cx->k_sch, 3);
-                ke6(cx->k_sch, 4); ke6(cx->k_sch, 5); 
-                ke6(cx->k_sch, 6); kel6(cx->k_sch, 7); 
+                ke6(cx->k_sch, 4); ke6(cx->k_sch, 5);
+                ke6(cx->k_sch, 6); kel6(cx->k_sch, 7);
                 cx->n_rnd = 12; break;
     case 32:    cx->k_sch[4] = ss[4] = word_in(in_key + 16);
                 cx->k_sch[5] = ss[5] = word_in(in_key + 20);
                 cx->k_sch[6] = ss[6] = word_in(in_key + 24);
                 cx->k_sch[7] = ss[7] = word_in(in_key + 28);
-                ke8(cx->k_sch, 0); ke8(cx->k_sch, 1); 
+                ke8(cx->k_sch, 0); ke8(cx->k_sch, 1);
                 ke8(cx->k_sch, 2); ke8(cx->k_sch, 3);
-                ke8(cx->k_sch, 4); ke8(cx->k_sch, 5); 
-                kel8(cx->k_sch, 6); 
+                ke8(cx->k_sch, 4); ke8(cx->k_sch, 5);
+                kel8(cx->k_sch, 6);
                 cx->n_rnd = 14; break;
-    default:    cx->n_rnd = 0; return aes_bad; 
+    default:    cx->n_rnd = 0; return aes_bad;
     }
 #else
     {   aes_32t i, l;
@@ -1259,7 +1260,7 @@
                     for(i = 0; i < l; ++i)
                         ke8(cx->k_sch,  i);
                     break;
-        default:    cx->n_rnd = 0; return aes_bad; 
+        default:    cx->n_rnd = 0; return aes_bad;
         }
     }
 #endif
@@ -1357,7 +1358,7 @@
 }
 
 static aes_rval aes_dec_key(const unsigned char in_key[], unsigned int klen, aes_ctx cx[1])
-{   aes_32t    ss[8]; 
+{   aes_32t    ss[8];
     d_vars
 
 #if !defined(FIXED_TABLES)
@@ -1381,29 +1382,29 @@
 
     switch(klen)
     {
-    case 16:    kdf4(cx->k_sch, 0); kd4(cx->k_sch, 1); 
+    case 16:    kdf4(cx->k_sch, 0); kd4(cx->k_sch, 1);
                 kd4(cx->k_sch, 2); kd4(cx->k_sch, 3);
-                kd4(cx->k_sch, 4); kd4(cx->k_sch, 5); 
+                kd4(cx->k_sch, 4); kd4(cx->k_sch, 5);
                 kd4(cx->k_sch, 6); kd4(cx->k_sch, 7);
-                kd4(cx->k_sch, 8); kdl4(cx->k_sch, 9); 
+                kd4(cx->k_sch, 8); kdl4(cx->k_sch, 9);
                 cx->n_rnd = 10; break;
     case 24:    cx->k_sch[4] = ff(ss[4] = word_in(in_key + 16));
                 cx->k_sch[5] = ff(ss[5] = word_in(in_key + 20));
-                kdf6(cx->k_sch, 0); kd6(cx->k_sch, 1); 
+                kdf6(cx->k_sch, 0); kd6(cx->k_sch, 1);
                 kd6(cx->k_sch, 2); kd6(cx->k_sch, 3);
-                kd6(cx->k_sch, 4); kd6(cx->k_sch, 5); 
-                kd6(cx->k_sch, 6); kdl6(cx->k_sch, 7); 
+                kd6(cx->k_sch, 4); kd6(cx->k_sch, 5);
+                kd6(cx->k_sch, 6); kdl6(cx->k_sch, 7);
                 cx->n_rnd = 12; break;
     case 32:    cx->k_sch[4] = ff(ss[4] = word_in(in_key + 16));
                 cx->k_sch[5] = ff(ss[5] = word_in(in_key + 20));
                 cx->k_sch[6] = ff(ss[6] = word_in(in_key + 24));
                 cx->k_sch[7] = ff(ss[7] = word_in(in_key + 28));
-                kdf8(cx->k_sch, 0); kd8(cx->k_sch, 1); 
+                kdf8(cx->k_sch, 0); kd8(cx->k_sch, 1);
                 kd8(cx->k_sch, 2); kd8(cx->k_sch, 3);
-                kd8(cx->k_sch, 4); kd8(cx->k_sch, 5); 
-                kdl8(cx->k_sch, 6); 
+                kd8(cx->k_sch, 4); kd8(cx->k_sch, 5);
+                kdl8(cx->k_sch, 6);
                 cx->n_rnd = 14; break;
-    default:    cx->n_rnd = 0; return aes_bad; 
+    default:    cx->n_rnd = 0; return aes_bad;
     }
 #else
     {   aes_32t i, l;
@@ -1412,7 +1413,7 @@
 
         switch(klen)
         {
-        case 16: 
+        case 16:
                     for(i = 0; i < l; ++i)
                         ke4(cx->k_sch, i);
                     break;
@@ -1428,7 +1429,7 @@
                     for(i = 0; i < l; ++i)
                         ke8(cx->k_sch,  i);
                     break;
-        default:    cx->n_rnd = 0; return aes_bad; 
+        default:    cx->n_rnd = 0; return aes_bad;
         }
 #if (DEC_ROUND != NO_TABLES)
         for(i = nc; i < nc * cx->n_rnd; ++i)
@@ -1456,7 +1457,7 @@
 #define locals(y,x)     x[4],y[4]
 #else
 #define locals(y,x)     x##0,x##1,x##2,x##3,y##0,y##1,y##2,y##3
- /* 
+ /*
    the following defines prevent the compiler requiring the declaration
    of generated but unused variables in the fwd_var and inv_var macros
  */
@@ -1570,18 +1571,18 @@
 #if defined(ENCRYPTION)
 
 /* I am grateful to Frank Yellin for the following construction
-   (and that for decryption) which, given the column (c) of the 
-   output state variable, gives the input state variables which 
+   (and that for decryption) which, given the column (c) of the
+   output state variable, gives the input state variables which
    are needed in its computation for each row (r) of the state.
 
-   For the fixed block size options, compilers should be able to 
-   reduce this complex expression (and the equivalent one for 
-   decryption) to a static variable reference at compile time. 
+   For the fixed block size options, compilers should be able to
+   reduce this complex expression (and the equivalent one for
+   decryption) to a static variable reference at compile time.
    But for variable block size code, there will be some limbs on
    which conditional clauses will be returned.
 */
 
-/* y = output word, x = input word, r = row, c = column for r = 0, 
+/* y = output word, x = input word, r = row, c = column for r = 0,
    1, 2 and 3 = column accessed for row r.
 */
 
@@ -1650,7 +1651,7 @@
 
     if(!(cx->n_blk & 1)) return aes_bad;
 
-    state_in(b0, in_blk, kp); 
+    state_in(b0, in_blk, kp);
 
 #if (ENC_UNROLL == FULL)
 
@@ -1658,31 +1659,31 @@
 
     switch(cx->n_rnd)
     {
-    case 14:    round(fwd_rnd,  b1, b0, kp - 4 * nc); 
+    case 14:    round(fwd_rnd,  b1, b0, kp - 4 * nc);
                 round(fwd_rnd,  b0, b1, kp - 3 * nc);
-    case 12:    round(fwd_rnd,  b1, b0, kp - 2 * nc); 
+    case 12:    round(fwd_rnd,  b1, b0, kp - 2 * nc);
                 round(fwd_rnd,  b0, b1, kp -     nc);
-    case 10:    round(fwd_rnd,  b1, b0, kp         );             
+    case 10:    round(fwd_rnd,  b1, b0, kp         );
                 round(fwd_rnd,  b0, b1, kp +     nc);
-                round(fwd_rnd,  b1, b0, kp + 2 * nc); 
+                round(fwd_rnd,  b1, b0, kp + 2 * nc);
                 round(fwd_rnd,  b0, b1, kp + 3 * nc);
-                round(fwd_rnd,  b1, b0, kp + 4 * nc); 
+                round(fwd_rnd,  b1, b0, kp + 4 * nc);
                 round(fwd_rnd,  b0, b1, kp + 5 * nc);
-                round(fwd_rnd,  b1, b0, kp + 6 * nc); 
+                round(fwd_rnd,  b1, b0, kp + 6 * nc);
                 round(fwd_rnd,  b0, b1, kp + 7 * nc);
                 round(fwd_rnd,  b1, b0, kp + 8 * nc);
                 round(fwd_lrnd, b0, b1, kp + 9 * nc);
     }
 #else
-    
+
 #if (ENC_UNROLL == PARTIAL)
     {   aes_32t    rnd;
         for(rnd = 0; rnd < (cx->n_rnd >> 1) - 1; ++rnd)
         {
             kp += nc;
-            round(fwd_rnd, b1, b0, kp); 
+            round(fwd_rnd, b1, b0, kp);
             kp += nc;
-            round(fwd_rnd, b0, b1, kp); 
+            round(fwd_rnd, b0, b1, kp);
         }
         kp += nc;
         round(fwd_rnd,  b1, b0, kp);
@@ -1691,7 +1692,7 @@
         for(rnd = 0; rnd < cx->n_rnd - 1; ++rnd)
         {
             kp += nc;
-            round(fwd_rnd, p1, p0, kp); 
+            round(fwd_rnd, p1, p0, kp);
             pt = p0; p0 = p1; p1 = pt;
         }
 #endif
@@ -1784,27 +1785,27 @@
                 round(inv_rnd,  b0, b1, kp + 3 * nc);
     case 12:    round(inv_rnd,  b1, b0, kp + 2 * nc);
                 round(inv_rnd,  b0, b1, kp + nc    );
-    case 10:    round(inv_rnd,  b1, b0, kp         );             
+    case 10:    round(inv_rnd,  b1, b0, kp         );
                 round(inv_rnd,  b0, b1, kp -     nc);
-                round(inv_rnd,  b1, b0, kp - 2 * nc); 
+                round(inv_rnd,  b1, b0, kp - 2 * nc);
                 round(inv_rnd,  b0, b1, kp - 3 * nc);
-                round(inv_rnd,  b1, b0, kp - 4 * nc); 
+                round(inv_rnd,  b1, b0, kp - 4 * nc);
                 round(inv_rnd,  b0, b1, kp - 5 * nc);
-                round(inv_rnd,  b1, b0, kp - 6 * nc); 
+                round(inv_rnd,  b1, b0, kp - 6 * nc);
                 round(inv_rnd,  b0, b1, kp - 7 * nc);
                 round(inv_rnd,  b1, b0, kp - 8 * nc);
                 round(inv_lrnd, b0, b1, kp - 9 * nc);
     }
 #else
-    
+
 #if (DEC_UNROLL == PARTIAL)
     {   aes_32t    rnd;
         for(rnd = 0; rnd < (cx->n_rnd >> 1) - 1; ++rnd)
         {
-            kp -= nc; 
-            round(inv_rnd, b1, b0, kp); 
-            kp -= nc; 
-            round(inv_rnd, b0, b1, kp); 
+            kp -= nc;
+            round(inv_rnd, b1, b0, kp);
+            kp -= nc;
+            round(inv_rnd, b0, b1, kp);
         }
         kp -= nc;
         round(inv_rnd, b1, b0, kp);
@@ -1813,7 +1814,7 @@
         for(rnd = 0; rnd < cx->n_rnd - 1; ++rnd)
         {
             kp -= nc;
-            round(inv_rnd, p1, p0, kp); 
+            round(inv_rnd, p1, p0, kp);
             pt = p0; p0 = p1; p1 = pt;
         }
 #endif
@@ -1837,9 +1838,9 @@
     AP4_AesCbcBlockCipher(CipherDirection direction,
                           aes_ctx*        context) :
         AP4_AesBlockCipher(direction, CBC, context) {}
-        
+
     // AP4_BlockCipher methods
-    virtual AP4_Result Process(const AP4_UI08* input, 
+    virtual AP4_Result Process(const AP4_UI08* input,
                                AP4_Size        input_size,
                                AP4_UI08*       output,
                                const AP4_UI08* iv);
@@ -1848,8 +1849,8 @@
 /*----------------------------------------------------------------------
 |   AP4_AesCbcBlockCipher::Process
 +---------------------------------------------------------------------*/
-AP4_Result 
-AP4_AesCbcBlockCipher::Process(const AP4_UI08* input, 
+AP4_Result
+AP4_AesCbcBlockCipher::Process(const AP4_UI08* input,
                                AP4_Size        input_size,
                                AP4_UI08*       output,
                                const AP4_UI08* iv)
@@ -1858,7 +1859,7 @@
     if (input_size%AP4_AES_BLOCK_SIZE) {
         return AP4_ERROR_INVALID_PARAMETERS;
     }
-    
+
     // setup the chaining block from the IV
     AP4_UI08 chaining_block[AP4_AES_BLOCK_SIZE];
     if (iv) {
@@ -1866,7 +1867,7 @@
     } else {
         AP4_SetMemory(chaining_block, 0, AP4_AES_BLOCK_SIZE);
     }
-    
+
     // process all blocks
     unsigned int block_count = input_size/AP4_AES_BLOCK_SIZE;
     if (m_Direction == ENCRYPT) {
@@ -1880,7 +1881,7 @@
             input  += AP4_AES_BLOCK_SIZE;
             output += AP4_AES_BLOCK_SIZE;
         }
-    } else {        
+    } else {
         for (unsigned int i=0; i<block_count; i++) {
             aes_dec_blk(input, output, m_Context);
             for (unsigned int j=0; j<AP4_AES_BLOCK_SIZE; j++) {
@@ -1891,7 +1892,7 @@
             output += AP4_AES_BLOCK_SIZE;
         }
     }
-    
+
     return AP4_SUCCESS;
 }
 
@@ -1906,9 +1907,9 @@
                           aes_ctx*        context) :
         AP4_AesBlockCipher(direction, CTR, context)
         /*m_CounterSize(counter_size)*/ {}
-        
+
     // AP4_BlockCipher methods
-    virtual AP4_Result Process(const AP4_UI08* input, 
+    virtual AP4_Result Process(const AP4_UI08* input,
                                AP4_Size        input_size,
                                AP4_UI08*       output,
                                const AP4_UI08* iv);
@@ -1920,8 +1921,8 @@
 /*----------------------------------------------------------------------
 |   AP4_AesCtrBlockCipher::Process
 +---------------------------------------------------------------------*/
-AP4_Result 
-AP4_AesCtrBlockCipher::Process(const AP4_UI08* input, 
+AP4_Result
+AP4_AesCtrBlockCipher::Process(const AP4_UI08* input,
                                AP4_Size        input_size,
                                AP4_UI08*       output,
                                const AP4_UI08* iv)
@@ -1933,7 +1934,7 @@
     } else {
         AP4_SetMemory(counter, 0, AP4_AES_BLOCK_SIZE);
     }
-    
+
     // process all blocks
     while (input_size) {
         AP4_UI08 block[AP4_AES_BLOCK_SIZE];
@@ -1954,7 +1955,7 @@
                     break;
                 }
             }
-            
+
             // move to the next block
             input  += AP4_AES_BLOCK_SIZE;
             output += AP4_AES_BLOCK_SIZE;
@@ -1967,7 +1968,7 @@
 |   AP4_AesBlockCipher::Create
 +---------------------------------------------------------------------*/
 AP4_Result
-AP4_AesBlockCipher::Create(const AP4_UI08*      key, 
+AP4_AesBlockCipher::Create(const AP4_UI08*      key,
                            CipherDirection      direction,
                            CipherMode           mode,
                            const void*          mode_params,
@@ -1976,7 +1977,7 @@
     cipher = NULL;
 
     aes_ctx* context = new aes_ctx();
-    
+
     switch (mode) {
         case AP4_BlockCipher::CBC:
             if (direction == AP4_BlockCipher::ENCRYPT) {
@@ -1986,7 +1987,7 @@
             }
             cipher = new AP4_AesCbcBlockCipher(direction, context);
             break;
-            
+
         case AP4_BlockCipher::CTR: {
             aes_enc_key(key, AP4_AES_KEY_LENGTH, context);
             const AP4_BlockCipher::CtrParams* ctr_params = (const AP4_BlockCipher::CtrParams*)mode_params;
@@ -1997,7 +1998,7 @@
             cipher = new AP4_AesCtrBlockCipher(direction, counter_size, context);
             break;
         }
-            
+
         default:
             return AP4_ERROR_INVALID_PARAMETERS;
     }

bento4-1.5.1r629.tar.gz/Source/C++/Crypto/Ap4StreamCipher.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/Crypto/Ap4StreamCipher.cpp Changed

bento4-1.5.1r629.tar.gz/Source/C++/System/StdC/Ap4StdCFileByteStream.cpp -> bento4-1.6.0r634.tar.gz/Source/C++/System/StdC/Ap4StdCFileByteStream.cpp Changed

bento4-1.5.1r629.tar.gz/Source/Python/utils/aes.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/aes.py Changed

@@ -1,14 +1,6 @@
 # Based on the public domain code from tlslite (Trevor Perrin, http://trevp.net/tlslite/)
 
 import copy
-import string
-
-
-
-import exceptions
-if hasattr(exceptions, "FutureWarning"):
-    import warnings
-    warnings.filterwarnings("ignore", category=FutureWarning, append=1)
 
 shifts = [[[0, 0], [1, 3], [2, 2], [3, 1]],
           [[0, 0], [1, 5], [2, 4], [3, 3]],
@@ -29,14 +21,14 @@
 # produce log and alog tables, needed for multiplying in the
 # field GF(2^m) (generator = 3)
 alog = [1]
-for i in xrange(255):
+for i in range(255):
     j = (alog[-1] << 1) ^ alog[-1]
     if j & 0x100 != 0:
         j ^= 0x11B
     alog.append(j)
 
 log = [0] * 256
-for i in xrange(1, 255):
+for i in range(1, 255):
     log[alog[i]] = i
 
 # multiply two elements of GF(2^m)
@@ -46,29 +38,29 @@
     return alog[(log[a & 0xFF] + log[b & 0xFF]) % 255]
 
 # substitution box based on F^{-1}(x)
-box = [[0] * 8 for i in xrange(256)]
+box = [[0] * 8 for i in range(256)]
 box[1][7] = 1
-for i in xrange(2, 256):
+for i in range(2, 256):
     j = alog[255 - log[i]]
-    for t in xrange(8):
+    for t in range(8):
         box[i][t] = (j >> (7 - t)) & 0x01
 
 B = [0, 1, 1, 0, 0, 0, 1, 1]
 
 # affine transform:  box[i] <- B + A*box[i]
-cox = [[0] * 8 for i in xrange(256)]
-for i in xrange(256):
-    for t in xrange(8):
+cox = [[0] * 8 for i in range(256)]
+for i in range(256):
+    for t in range(8):
         cox[i][t] = B[t]
-        for j in xrange(8):
+        for j in range(8):
             cox[i][t] ^= A[t][j] * box[i][j]
 
 # S-boxes and inverse S-boxes
 S =  [0] * 256
 Si = [0] * 256
-for i in xrange(256):
+for i in range(256):
     S[i] = cox[i][0] << 7
-    for t in xrange(1, 8):
+    for t in range(1, 8):
         S[i] ^= cox[i][t] << (7-t)
     Si[S[i] & 0xFF] = i
 
@@ -78,36 +70,36 @@
     [1, 3, 2, 1],
     [1, 1, 3, 2]]
 
-AA = [[0] * 8 for i in xrange(4)]
+AA = [[0] * 8 for i in range(4)]
 
-for i in xrange(4):
-    for j in xrange(4):
+for i in range(4):
+    for j in range(4):
         AA[i][j] = G[i][j]
         AA[i][i+4] = 1
 
-for i in xrange(4):
+for i in range(4):
     pivot = AA[i][i]
     if pivot == 0:
         t = i + 1
         while AA[t][i] == 0 and t < 4:
             t += 1
             assert t != 4, 'G matrix must be invertible'
-            for j in xrange(8):
+            for j in range(8):
                 AA[i][j], AA[t][j] = AA[t][j], AA[i][j]
             pivot = AA[i][i]
-    for j in xrange(8):
+    for j in range(8):
         if AA[i][j] != 0:
             AA[i][j] = alog[(255 + log[AA[i][j] & 0xFF] - log[pivot & 0xFF]) % 255]
-    for t in xrange(4):
+    for t in range(4):
         if i != t:
-            for j in xrange(i+1, 8):
+            for j in range(i+1, 8):
                 AA[t][j] ^= mul(AA[i][j], AA[t][i])
             AA[t][i] = 0
 
-iG = [[0] * 4 for i in xrange(4)]
+iG = [[0] * 4 for i in range(4)]
 
-for i in xrange(4):
-    for j in xrange(4):
+for i in range(4):
+    for j in range(4):
         iG[i][j] = AA[i][j + 4]
 
 def mul4(a, bs):
@@ -133,7 +125,7 @@
 U3 = []
 U4 = []
 
-for t in xrange(256):
+for t in range(256):
     s = S[t]
     T1.append(mul4(s, G[0]))
     T2.append(mul4(s, G[1]))
@@ -154,7 +146,7 @@
 # round constants
 rcon = [1]
 r = 1
-for t in xrange(1, 30):
+for t in range(1, 30):
     r = mul(2, r)
     rcon.append(r)
 
@@ -185,26 +177,26 @@
         self.block_size = block_size
 
         ROUNDS = num_rounds[len(key)][block_size]
-        BC = block_size / 4
+        BC = block_size // 4
         # encryption round keys
-        Ke = [[0] * BC for i in xrange(ROUNDS + 1)]
+        Ke = [[0] * BC for i in range(ROUNDS + 1)]
         # decryption round keys
-        Kd = [[0] * BC for i in xrange(ROUNDS + 1)]
+        Kd = [[0] * BC for i in range(ROUNDS + 1)]
         ROUND_KEY_COUNT = (ROUNDS + 1) * BC
         KC = len(key) // 4
 
         # copy user material bytes into temporary ints
         tk = []
-        for i in xrange(0, KC):
-            tk.append((ord(key[i * 4]) << 24) | (ord(key[i * 4 + 1]) << 16) |
-                (ord(key[i * 4 + 2]) << 8) | ord(key[i * 4 + 3]))
+        for i in range(0, KC):
+            tk.append((key[i * 4] << 24) | (key[i * 4 + 1] << 16) |
+                (key[i * 4 + 2] << 8) | key[i * 4 + 3])
 
         # copy values into round key arrays
         t = 0
         j = 0
         while j < KC and t < ROUND_KEY_COUNT:
-            Ke[t / BC][t % BC] = tk[j]
-            Kd[ROUNDS - (t / BC)][t % BC] = tk[j]
+            Ke[t // BC][t % BC] = tk[j]
+            Kd[ROUNDS - (t // BC)][t % BC] = tk[j]
             j += 1
             t += 1
         tt = 0
@@ -219,28 +211,28 @@
                      (rcon[rconpointer]    & 0xFF) << 24
             rconpointer += 1
             if KC != 8:
-                for i in xrange(1, KC):
+                for i in range(1, KC):
                     tk[i] ^= tk[i-1]
             else:
-                for i in xrange(1, KC / 2):
+                for i in range(1, KC // 2):
                     tk[i] ^= tk[i-1]
-                tt = tk[KC / 2 - 1]
-                tk[KC / 2] ^= (S[ tt        & 0xFF] & 0xFF)       ^ \
+                tt = tk[KC // 2 - 1]
+                tk[KC // 2] ^= (S[ tt        & 0xFF] & 0xFF)       ^ \
                               (S[(tt >>  8) & 0xFF] & 0xFF) <<  8 ^ \
                               (S[(tt >> 16) & 0xFF] & 0xFF) << 16 ^ \
                               (S[(tt >> 24) & 0xFF] & 0xFF) << 24
-                for i in xrange(KC / 2 + 1, KC):
+                for i in range(KC // 2 + 1, KC):
                     tk[i] ^= tk[i-1]
             # copy values into round key arrays
             j = 0
             while j < KC and t < ROUND_KEY_COUNT:
-                Ke[t / BC][t % BC] = tk[j]
-                Kd[ROUNDS - (t / BC)][t % BC] = tk[j]
+                Ke[t // BC][t % BC] = tk[j]
+                Kd[ROUNDS - (t // BC)][t % BC] = tk[j]
                 j += 1
                 t += 1
         # inverse MixColumn where needed
-        for r in xrange(1, ROUNDS):
-            for j in xrange(BC):
+        for r in range(1, ROUNDS):
+            for j in range(BC):
                 tt = Kd[r][j]
                 Kd[r][j] = U1[(tt >> 24) & 0xFF] ^ \
                            U2[(tt >> 16) & 0xFF] ^ \
@@ -254,7 +246,7 @@
             raise ValueError('wrong block length, expected ' + str(self.block_size) + ' got ' + str(len(plaintext)))
         Ke = self.Ke
 
-        BC = self.block_size / 4
+        BC = self.block_size // 4
         ROUNDS = len(Ke) - 1
         if BC == 4:
             SC = 0
@@ -269,14 +261,14 @@
         # temporary work array
         t = []
         # plaintext to ints + key
-        for i in xrange(BC):
-            t.append((ord(plaintext[i * 4    ]) << 24 |
-                      ord(plaintext[i * 4 + 1]) << 16 |
-                      ord(plaintext[i * 4 + 2]) <<  8 |
-                      ord(plaintext[i * 4 + 3])        ) ^ Ke[0][i])
+        for i in range(BC):
+            t.append((plaintext[i * 4    ] << 24 |
+                      plaintext[i * 4 + 1] << 16 |
+                      plaintext[i * 4 + 2] <<  8 |
+                      plaintext[i * 4 + 3]        ) ^ Ke[0][i])
         # apply round transforms
-        for r in xrange(1, ROUNDS):
-            for i in xrange(BC):
+        for r in range(1, ROUNDS):
+            for i in range(BC):
                 a[i] = (T1[(t[ i           ] >> 24) & 0xFF] ^
                         T2[(t[(i + s1) % BC] >> 16) & 0xFF] ^
                         T3[(t[(i + s2) % BC] >>  8) & 0xFF] ^
@@ -284,20 +276,20 @@
             t = copy.copy(a)
         # last round is special
         result = []
-        for i in xrange(BC):
+        for i in range(BC):
             tt = Ke[ROUNDS][i]
             result.append((S[(t[ i           ] >> 24) & 0xFF] ^ (tt >> 24)) & 0xFF)
             result.append((S[(t[(i + s1) % BC] >> 16) & 0xFF] ^ (tt >> 16)) & 0xFF)
             result.append((S[(t[(i + s2) % BC] >>  8) & 0xFF] ^ (tt >>  8)) & 0xFF)
             result.append((S[ t[(i + s3) % BC]        & 0xFF] ^  tt       ) & 0xFF)
-        return string.join(map(chr, result), '')
+        return bytes(result)
 
     def decrypt(self, ciphertext):
         if len(ciphertext) != self.block_size:
             raise ValueError('wrong block length, expected ' + str(self.block_size) + ' got ' + str(len(ciphertext)))
         Kd = self.Kd
 
-        BC = self.block_size / 4
+        BC = self.block_size // 4
         ROUNDS = len(Kd) - 1
         if BC == 4:
             SC = 0
@@ -312,14 +304,14 @@
         # temporary work array
         t = [0] * BC
         # ciphertext to ints + key
-        for i in xrange(BC):
-            t[i] = (ord(ciphertext[i * 4    ]) << 24 |
-                    ord(ciphertext[i * 4 + 1]) << 16 |
-                    ord(ciphertext[i * 4 + 2]) <<  8 |
-                    ord(ciphertext[i * 4 + 3])        ) ^ Kd[0][i]
+        for i in range(BC):
+            t[i] = (ciphertext[i * 4    ] << 24 |
+                    ciphertext[i * 4 + 1] << 16 |
+                    ciphertext[i * 4 + 2] <<  8 |
+                    ciphertext[i * 4 + 3]        ) ^ Kd[0][i]
         # apply round transforms
-        for r in xrange(1, ROUNDS):
-            for i in xrange(BC):
+        for r in range(1, ROUNDS):
+            for i in range(BC):
                 a[i] = (T5[(t[ i           ] >> 24) & 0xFF] ^
                         T6[(t[(i + s1) % BC] >> 16) & 0xFF] ^
                         T7[(t[(i + s2) % BC] >>  8) & 0xFF] ^
@@ -327,29 +319,29 @@
             t = copy.copy(a)
         # last round is special
         result = []
-        for i in xrange(BC):
+        for i in range(BC):
             tt = Kd[ROUNDS][i]
             result.append((Si[(t[ i           ] >> 24) & 0xFF] ^ (tt >> 24)) & 0xFF)
             result.append((Si[(t[(i + s1) % BC] >> 16) & 0xFF] ^ (tt >> 16)) & 0xFF)
             result.append((Si[(t[(i + s2) % BC] >>  8) & 0xFF] ^ (tt >>  8)) & 0xFF)
             result.append((Si[ t[(i + s3) % BC]        & 0xFF] ^  tt       ) & 0xFF)
-        return string.join(map(chr, result), '')
+        return bytes(result)
 
 def cbc_encrypt(plaintext, key, IV):
     # padding
-    padding_size = 16-(len(plaintext) % 16)
-    plaintext += chr(padding_size)*padding_size
+    padding_size = 16 - (len(plaintext) % 16)
+    plaintext += bytes([padding_size]) * padding_size
 
     # init
     chainBytes = IV
     cipher = rijndael(key)
-    ciphertext = ''
+    ciphertext = b''
 
     # CBC Mode: For each block...
     for x in range(len(plaintext)//16):
 
         # XOR with the chaining block
-        block = ''.join([chr(ord(plaintext[x*16+y]) ^ ord(chainBytes[y])) for y in range(16)])
+        block = bytes([plaintext[x*16+y] ^ chainBytes[y] for y in range(16)])
 
         # Encrypt and chain
         chainBytes = cipher.encrypt(block)
@@ -360,7 +352,7 @@
 def cbc_decrypt(ciphertext, key, IV):
     chainBytes = IV
     cipher = rijndael(key)
-    plaintext = ''
+    plaintext = b''
 
     # sanity check
     if len(ciphertext)%16: raise ValueError('ciphertext not an integral number of blocks')
@@ -373,13 +365,13 @@
         decrypted = cipher.decrypt(block)
 
         # XOR with the chaining block and add to plaintext
-        plaintext += ''.join([chr(ord(decrypted[y]) ^ ord(chainBytes[y])) for y in range(16)])
+        plaintext += bytes([decrypted[y] ^ chainBytes[y] for y in range(16)])
 
         # Set the next chaining block
         chainBytes = block
 
     # padding
-    padding_size = ord(plaintext[-1:])
+    padding_size = plaintext[-1]
     if padding_size > 16: raise ValueError('invalid padding')
 
     return plaintext[:-padding_size]

bento4-1.5.1r629.tar.gz/Source/Python/utils/check-indexes.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/check-indexes.py Changed

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import mp4utils
 import sys
@@ -23,7 +23,7 @@
 
 class Sidx(object): pass
 
-mp4_file = mp4utils.Mp4File(options, mp4utils.MediaSource(sys.argv[1]))
+mp4_file = mp4utils.Mp4File(options, mp4utils.MediaSource(options, sys.argv[1]))
 moof_offsets = []
 sidx_anchors = []
 for atom in mp4_file.atoms:
@@ -32,8 +32,8 @@
 	elif atom.type == 'sidx':
 		sidx_anchors.append(atom.position+atom.size)
 
-print 'sidx anchors:', sidx_anchors
-print len(moof_offsets), 'moof boxes found:', moof_offsets
+print('sidx anchors:', sidx_anchors)
+print(len(moof_offsets), 'moof boxes found:', moof_offsets)
 
 sidx = None
 sidx_index = 0
@@ -45,7 +45,7 @@
 		sidx.timescale = int(atom['timescale'])
 		sidx.earliest_presentation_time = int(atom['earliest_presentation_time'])
 		sidx.first_offset = int(atom['first_offset'])
-		for (name, value) in atom.items():
+		for (name, value) in list(atom.items()):
 			if name.startswith('entry '):
 				entry = {}
 				for field in value.split(', '):
@@ -60,21 +60,21 @@
 			if entry['reference_type'] == 0:
 				#print sidx_anchors[sidx_index]+offset
 				if sidx_anchors[sidx_index]+offset not in moof_offsets:
-					print 'sidx offset', sidx_anchors[sidx_index], '+', offset, 'does not point to a moof box'
+					print('sidx offset', sidx_anchors[sidx_index], '+', offset, 'does not point to a moof box')
 			offset += entry['referenced_size']
 		sidx_index += 1
-		print 'sidx OK'
+		print('sidx OK')
 	elif atom['name'] == 'mfra':
 		for child in atom['children']:
 			if child['name'] == 'tfra':
-				for (name, value) in child.items():
+				for (name, value) in list(child.items()):
 					if name.startswith('entry'):
 						entry = {}
 						for field in value.split(', '):
 							(field_name, field_value) = field.split('=')
 							entry[field_name] = int(field_value)
 						if entry['moof_offset'] not in moof_offsets:
-							print 'tfra offset', moof_offset, 'does not point to a moof box'
-		print 'mfra OK'
+							print('tfra offset', entry['moof_offset'], 'does not point to a moof box')
+		print('mfra OK')
 
-print '=== Done ==='
\ No newline at end of file
+print('=== Done ===')

bento4-1.5.1r629.tar.gz/Source/Python/utils/mp4-dash-clone.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/mp4-dash-clone.py Changed

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 __author__    = 'Gilles Boccon-Gibod (bok@bok.net)'
 __copyright__ = 'Copyright 2011-2012 Axiomatic Systems, LLC.'
@@ -16,10 +16,9 @@
 ### Imports
 import sys
 import os
-import os.path
+import os.path as path
 from optparse import OptionParser
-import urllib2
-import urlparse
+import urllib.request, urllib.error, urllib.parse
 import shutil
 import json
 import sys
@@ -35,7 +34,7 @@
 MARLIN_MAS_NS      = '{'+MARLIN_MAS_NS_URN+'}'
 
 def Bento4Command(name, *args, **kwargs):
-    cmd = [os.path.join(Options.exec_dir, name)]
+    cmd = [path.join(Options.exec_dir, name)]
     for kwarg in kwargs:
         arg = kwarg.replace('_', '-')
         cmd.append('--'+arg)
@@ -45,7 +44,7 @@
     #print cmd
     try:
         return check_output(cmd)
-    except CalledProcessError, e:
+    except CalledProcessError as e:
         #print e
         raise Exception("binary tool failed with error %d" % e.returncode)
 
@@ -185,7 +184,7 @@
     def GenerateSegmentUrlsFromTemplate(self):
         media = self.SegmentBaseLookup('media')
         if media is None:
-            print 'WARNING: no media attribute found for representation'
+            print('WARNING: no media attribute found for representation')
             return
 
         timeline = self.SegmentBaseLookup('segment_timeline')
@@ -206,7 +205,7 @@
             for s in timeline:
                 if 't' in s:
                     current_time = s['t']
-                for r in xrange(1+s['r']):
+                for _ in range(1+s['r']):
                     url = ProcessUrlTemplate(media, representation_id=self.id, bandwidth=self.bandwidth, time=str(current_time), number=str(current_number))
                     current_number += 1
                     current_time += s['d']
@@ -278,7 +277,7 @@
         DASH_NS = DASH_NS_COMPAT
         DASH_NS_URN = DASH_NS_URN_COMPAT
         if Options.verbose:
-            print '@@@ Using backward compatible namespace'
+            print('@@@ Using backward compatible namespace')
 
     mpd = DashMPD(url, mpd_tree)
 
@@ -288,12 +287,12 @@
     return mpd
 
 def MakeNewDir(dir, is_warning=False):
-    if os.path.exists(dir):
+    if path.exists(dir):
         if is_warning:
-            print 'WARNING: ',
+            print('WARNING: ', end=' ')
         else:
-            print 'ERROR: ',
-        print 'directory "'+dir+'" already exists'
+            print('ERROR: ', end=' ')
+        print('directory "'+dir+'" already exists')
         if not is_warning:
             sys.exit(1)
     else:
@@ -303,16 +302,16 @@
     if url.startswith("file://"):
         return open(url[7:], 'rb')
     else:
-        return urllib2.urlopen(url)
+        return urllib.request.urlopen(url)
 
 def ComputeUrl(base_url, url):
     if url.startswith('http://') or url.startswith('https://'):
         raise Exception('Absolute URLs are not supported')
 
     if base_url.startswith('file://'):
-        return os.path.join(os.path.dirname(base_url), url)
+        return path.join(path.dirname(base_url), url)
     else:
-        return urlparse.urljoin(base_url, url)
+        return urllib.parse.urljoin(base_url, url)
 
 class Cloner:
     def __init__(self, root_dir):
@@ -323,27 +322,27 @@
     def CloneSegment(self, url, path_out, is_init):
         while path_out.startswith('/'):
             path_out = path_out[1:]
-        target_dir = os.path.join(self.root_dir, path_out)
+        target_dir = path.join(self.root_dir, path_out)
         if Options.verbose:
-            print 'Cloning', url, 'to', path_out
+            print('Cloning', url, 'to', path_out)
 
         #os.makedirs(target_dir)
         try:
-            os.makedirs(os.path.dirname(target_dir))
+            os.makedirs(path.dirname(target_dir))
         except OSError:
-            if os.path.exists(target_dir):
+            if path.exists(target_dir):
                 pass
         except:
             raise
 
         data = OpenURL(url)
-        outfile_name = os.path.join(self.root_dir, path_out)
+        outfile_name = path.join(self.root_dir, path_out)
         use_temp_file = False
         if Options.encrypt:
             use_temp_file = True
             outfile_name_final = outfile_name
             outfile_name += '.tmp'
-        outfile = open(outfile_name, 'wb+')
+        outfile = open(outfile_name, 'wb')
         try:
             shutil.copyfileobj(data, outfile)
             outfile.close()
@@ -367,7 +366,7 @@
                     args += ["--fragments-info", self.init_filename]
 
                 if Options.verbose:
-                    print 'mp4encrypt '+(' '.join(args))
+                    print('mp4encrypt '+(' '.join(args)))
                 Bento4Command("mp4encrypt", *args)
         finally:
             if use_temp_file and not is_init:
@@ -394,7 +393,7 @@
                       dest='encrypt', default=None,
                       help="Encrypt the media, with KID and KEY specified in Hex (32 characters each)")
     parser.add_option('', "--exec-dir", metavar="<exec_dir>",
-                      dest="exec_dir", default=os.path.join(SCRIPT_PATH, 'bin', platform),
+                      dest="exec_dir", default=path.join(SCRIPT_PATH, 'bin', platform),
                       help="Directory where the Bento4 executables are located")
 
     global Options
@@ -409,21 +408,21 @@
     if Options.encrypt:
         if len(Options.encrypt) != 65:
             raise Exception('Invalid argument for --encrypt option')
-        Options.kid = Options.encrypt[:32].decode('hex')
-        Options.key = Options.encrypt[33:].decode('hex')
+        Options.kid = bytes.fromhex(Options.encrypt[:32])
+        Options.key = bytes.fromhex(Options.encrypt[33:])
 
     # create the output dir
     MakeNewDir(output_dir, True)
 
     # load and parse the MPD
-    if Options.verbose: print "Loading MPD from", mpd_url
+    if Options.verbose: print("Loading MPD from", mpd_url)
     try:
-        mpd_xml = OpenURL(mpd_url).read()
+        mpd_xml = OpenURL(mpd_url).read().decode('utf-8')
     except Exception as e:
-        print "ERROR: failed to load MPD:", e
+        print("ERROR: failed to load MPD:", e)
         sys.exit(1)
 
-    if Options.verbose: print "Parsing MPD"
+    if Options.verbose: print("Parsing MPD")
     mpd_xml = mpd_xml.replace('nitialisation', 'nitialization')
     mpd = ParseMpd(mpd_url, mpd_xml)
 
@@ -437,22 +436,22 @@
                 # compute the base URL
                 base_url = representation.AttributeLookup('base_urls')[0]
                 if Options.verbose:
-                    print 'Base URL = '+base_url
+                    print('Base URL = '+base_url)
 
                 # process the init segment
                 if Options.verbose:
-                    print '### Processing Initialization Segment'
+                    print('### Processing Initialization Segment')
                 url = ComputeUrl(base_url, representation.init_segment_url)
                 cloner.CloneSegment(url, representation.init_segment_url, True)
 
                 # process all segment URLs
                 if Options.verbose:
-                    print '### Processing Media Segments for AdaptationSet', representation.id
+                    print('### Processing Media Segments for AdaptationSet', representation.id)
                 for seg_url in representation.GenerateSegmentUrls():
                     url = ComputeUrl(base_url, seg_url)
                     try:
                         cloner.CloneSegment(url, seg_url, False)
-                    except (urllib2.HTTPError, urllib2.URLError, IOError):
+                    except (urllib.error.HTTPError, urllib.error.URLError, IOError):
                         # move to the next representation
                         break
 
@@ -472,9 +471,9 @@
 
     # write the MPD
     xml_tree = ElementTree.ElementTree(mpd.xml)
-    xml_tree.write(os.path.join(output_dir, os.path.basename(urlparse.urlparse(mpd_url).path)), encoding="UTF-8", xml_declaration=True)
+    xml_tree.write(path.join(output_dir, path.basename(urllib.parse.urlparse(mpd_url).path)), encoding="UTF-8", xml_declaration=True)
 
 ###########################
-SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
+SCRIPT_PATH = path.abspath(path.dirname(__file__))
 if __name__ == '__main__':
     main()

bento4-1.5.1r629.tar.gz/Source/Python/utils/mp4-dash-encode.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/mp4-dash-encode.py Changed

@@ -1,10 +1,14 @@
+#! /usr/bin/env python3
+
 from optparse import OptionParser
-from mp4utils import *
 from subprocess import check_output, CalledProcessError
 from pipes import quote
+import sys
 import os
+import os.path as path
 import json
 import math
+from mp4utils import MakeNewDir, PrintErrorAndExit
 
 # setup main options
 VERSION = "1.0.0"
@@ -17,8 +21,8 @@
 RESOLUTION_ROUNDING_V = 2
 
 def scale_resolution(pixels, aspect_ratio):
-    x = RESOLUTION_ROUNDING_H*((int(math.ceil(math.sqrt(pixels*aspect_ratio)))+RESOLUTION_ROUNDING_H-1)/RESOLUTION_ROUNDING_H)
-    y = RESOLUTION_ROUNDING_V*((int(math.ceil(x/aspect_ratio))+RESOLUTION_ROUNDING_V-1)/RESOLUTION_ROUNDING_V)
+    x = RESOLUTION_ROUNDING_H*((int(math.ceil(math.sqrt(pixels*aspect_ratio)))+RESOLUTION_ROUNDING_H-1) // RESOLUTION_ROUNDING_H)
+    y = RESOLUTION_ROUNDING_V*((int(math.ceil(x/aspect_ratio))+RESOLUTION_ROUNDING_V-1) // RESOLUTION_ROUNDING_V)
     return (x,y)
 
 def compute_bitrates_and_resolutions(options):
@@ -34,19 +38,19 @@
     bits_per_pixel = [1000.0*bitrates[i]/(24*pixels[i]) for i in range(len(pixels))]
 
     if options.debug:
-        print 'BITRATES:', bitrates
-        print 'PIXELS: ', pixels
-        print 'RESOLUTIONS: ', resolutions
-        print 'BITS PER PIXEL:', bits_per_pixel
+        print('BITRATES:', bitrates)
+        print('PIXELS: ', pixels)
+        print('RESOLUTIONS: ', resolutions)
+        print('BITS PER PIXEL:', bits_per_pixel)
 
     return (bitrates, resolutions)
 
 def run_command(options, cmd):
     if options.debug:
-        print 'COMMAND: ', cmd
+        print('COMMAND: ', cmd)
     try:
         return check_output(cmd, shell=True)
-    except CalledProcessError, e:
+    except CalledProcessError as e:
         message = "binary tool failed with error %d" % e.returncode
         if options.verbose:
             message += " - " + str(cmd)
@@ -144,13 +148,13 @@
         MakeNewDir(dir=options.output_dir, exit_if_exists = not (options.force_output), severity='ERROR')
 
     if options.verbose:
-        print 'Encoding', options.bitrates, 'bitrates, min bitrate =', options.min_bitrate, 'max bitrate =', options.max_bitrate
+        print('Encoding', options.bitrates, 'bitrates, min bitrate =', options.min_bitrate, 'max bitrate =', options.max_bitrate)
 
     media_source = MediaSource(options, args[0])
     if not options.resolution:
         options.resolution = [media_source.width, media_source.height]
     if options.verbose:
-        print 'Media Source:', media_source
+        print('Media Source:', media_source)
 
     if not options.segment_size:
         options.segment_size = 3*int(media_source.frame_rate+0.5)
@@ -161,7 +165,7 @@
     (bitrates, resolutions) = compute_bitrates_and_resolutions(options)
 
     for i in range(options.bitrates):
-        output_filename = os.path.join(options.output_dir, 'video_%05d.mp4' % int(bitrates[i]))
+        output_filename = path.join(options.output_dir, 'video_%05d.mp4' % int(bitrates[i]))
         temp_filename = output_filename+'_'
         base_cmd  = 'ffmpeg -i %s -strict experimental -codec:a %s -ac 2 -ab %dk -preset slow -map_metadata -1 -codec:v %s' % (quote(args[0]), options.audio_codec, options.audio_bitrate, options.video_codec)
         if options.video_codec == 'libx264':
@@ -169,11 +173,11 @@
         if options.text_overlay:
             if not options.text_overlay_font:
                 font_file = "/Library/Fonts/Courier New.ttf"
-                if os.path.exists(font_file):
-                    options.text_overlay_font = font_file;
+                if path.exists(font_file):
+                    options.text_overlay_font = font_file
                 else:
                     raise Exception('ERROR: no default font file, please use the --text-overlay-font option')
-            if not os.path.exists(options.text_overlay_font):
+            if not path.exists(options.text_overlay_font):
                 raise Exception('ERROR: font file "'+options.text_overlay_font+'" does not exist')
             base_cmd += ' -vf "drawtext=fontfile='+options.text_overlay_font+': text='+str(int(bitrates[i]))+'kbps '+str(resolutions[i][0])+'*'+str(resolutions[i][1])+': fontsize=50:  x=(w)/8: y=h-(2*lh): fontcolor=white:"'
         if options.select_streams:
@@ -199,7 +203,7 @@
             video_opts += ' ' + options.encoder_params
         cmd = base_cmd+' '+video_opts+' -s '+str(resolutions[i][0])+'x'+str(resolutions[i][1])+' -f mp4 '+temp_filename
         if options.verbose:
-            print 'ENCODING bitrate: %d, resolution: %dx%d' % (int(bitrates[i]), resolutions[i][0], resolutions[i][1])
+            print('ENCODING bitrate: %d, resolution: %dx%d' % (int(bitrates[i]), resolutions[i][0], resolutions[i][1]))
         run_command(options, cmd)
 
         cmd = 'mp4fragment "%s" "%s"' % (temp_filename, output_filename)
@@ -213,8 +217,8 @@
     Options = None # global
     try:
         main()
-    except Exception, err:
-        if Options is None or Options.debug:
+    except Exception as err:
+        if Options and Options.debug:
             raise
         else:
             PrintErrorAndExit('ERROR: %s\n' % str(err))

bento4-1.5.1r629.tar.gz/Source/Python/utils/mp4-dash.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/mp4-dash.py Changed

@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 __author__    = 'Gilles Boccon-Gibod (bok@bok.net)'
-__copyright__ = 'Copyright 2011-2016 Axiomatic Systems, LLC.'
+__copyright__ = 'Copyright 2011-2020 Axiomatic Systems, LLC.'
 
 ###
 # NOTE: this script needs Bento4 command line binaries to run
@@ -22,13 +22,42 @@
 import re
 import platform
 import sys
+import os
+import os.path as path
+import json
 import math
-from mp4utils import *
-from subtitles import *
+import operator
+from functools import reduce
+from subtitles import SubtitlesFile
+from mp4utils import MakePsshBox,\
+                     MakePsshBoxV1,\
+                     Base64Encode,\
+                     Base64Decode,\
+                     ComputeWidevineHeader,\
+                     ComputePlayReadyHeader,\
+                     ComputePrimetimeMetaData,\
+                     ComputeDolbyAc4AudioChannelConfig,\
+                     ComputeDolbyDigitalPlusAudioChannelConfig,\
+                     ComputeDolbyDigitalPlusSmoothStreamingInfo,\
+                     ComputeMarlinPssh,\
+                     Mp4IframeIndex,\
+                     Mp4File,\
+                     Mp4Encrypt,\
+                     Mp4Fragment,\
+                     Mp4Split,\
+                     MediaSource,\
+                     WalkAtoms,\
+                     GetEncryptionKey,\
+                     DerivePlayReadyKey,\
+                     LanguageNames,\
+                     LanguageCodeMap,\
+                     XmlDuration,\
+                     PrintErrorAndExit,\
+                     MakeNewDir
 
 # setup main options
-VERSION = "1.8.0"
-SDK_REVISION = '629'
+VERSION = "2.0.0"
+SDK_REVISION = '634'
 SCRIPT_PATH = path.abspath(path.dirname(__file__))
 sys.path += [SCRIPT_PATH]
 
@@ -75,6 +104,11 @@
 EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID = '1077efecc0b24d02ace33c1e52e2fb4b'
 EME_COMMON_ENCRYPTION_SCHEME_ID_URI  = 'urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b'
 
+CLEARKEY_CONTENT_PROTECTION_VALUE = 'ClearKey1.0'
+CLEARKEY_SCHEME_ID_URI            = 'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e'
+CLEARKEY_LICENSE_TYPE             = 'EME-1.0'
+CLEARKEY_CKEY_NAMESPACE           = 'http://dashif.org/guidelines/clearKey'
+
 SMOOTH_DEFAULT_TIMESCALE    = 10000000
 
 SMIL_NAMESPACE              = 'http://www.w3.org/2001/SMIL20/Language'
@@ -208,37 +242,44 @@
         AddSegmentList(options, container, subdir, track, use_byte_range)
 
 #############################################
-def AddContentProtection(options, container, tracks):
+def AddContentProtection(options, container, tracks, all_tracks):
     kids = []
     for track in tracks:
-        kid = track.kid
-        if kid is None and not options.no_media:
-            PrintErrorAndExit('ERROR: no encryption info found in track '+str(track))
-        if kid not in kids:
+        kid = track.key_info.get('kid')
+        if kid != None and kid not in kids:
             kids.append(kid)
+    if not kids:
+        return # nothing encrypted here
 
     # resolve the default KID and KEY
     key_info = None
-    if len(tracks):
+    if tracks:
         key_info = tracks[0].key_info
 
     if key_info:
         default_kid = key_info['kid']
-        default_key = key_info['key']
+        default_key = key_info.get('key', None)
     else:
         default_kid = kids[0]
         default_key = None
 
+    # compute a list of all keys if we need to merge keys into a single list
+    if options.merge_keys:
+        key_set = GetKeySet(all_tracks)
+        kids    = [x[0] for x in key_set]
+    else:
+        key_set = [(default_kid, default_key)]
+
     # EME Common Encryption
     if options.eme_signaling in ['pssh-v0', 'pssh-v1']:
         container.append(xml.Comment(' EME Common Encryption '))
         xml.register_namespace('cenc', CENC_2013_NAMESPACE)
         cp = xml.SubElement(container, 'ContentProtection', schemeIdUri=EME_COMMON_ENCRYPTION_SCHEME_ID_URI, value=options.encryption_cenc_scheme)
         if options.eme_signaling == 'pssh-v1':
-            pssh_box = MakePsshBoxV1(EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID.decode('hex'), [default_kid], '')
+            pssh_box = MakePsshBoxV1(bytes.fromhex(EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID), kids, b'')
         else:
-            pssh_box = MakePsshBox(EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID.decode('hex'), '')
-        pssh_b64 = pssh_box.encode('base64').replace('\n', '')
+            pssh_box = MakePsshBox(bytes.fromhex(EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID), b'')
+        pssh_b64 = Base64Encode(pssh_box)
         pssh = xml.SubElement(cp, '{' + CENC_2013_NAMESPACE + '}pssh')
         pssh.text = pssh_b64
 
@@ -249,6 +290,15 @@
     default_kid_with_dashes = (default_kid[0:8]+'-'+default_kid[8:12]+'-'+default_kid[12:16]+'-'+default_kid[16:20]+'-'+default_kid[20:32]).lower()
     cp.set('{'+CENC_2013_NAMESPACE+'}default_KID', default_kid_with_dashes)
 
+    # Clearkey
+    if options.clearkey:
+        container.append(xml.Comment(' Clear Key '))
+        xml.register_namespace('ckey', CLEARKEY_CKEY_NAMESPACE)
+        cp = xml.SubElement(container, 'ContentProtection', schemeIdUri=CLEARKEY_SCHEME_ID_URI, value=CLEARKEY_CONTENT_PROTECTION_VALUE)
+        if options.clearkey_license_uri:
+            ck_license = xml.SubElement(cp, '{'+CLEARKEY_CKEY_NAMESPACE+'}Laurl', Lic_type=CLEARKEY_LICENSE_TYPE)
+            ck_license.text = options.clearkey_license_uri
+
     # Marlin
     if options.marlin:
         container.append(xml.Comment(' Marlin '))
@@ -267,21 +317,28 @@
             playread_scheme_id_uri = PLAYREADY_SCHEME_ID_URI_V10
         else:
             playread_scheme_id_uri = PLAYREADY_SCHEME_ID_URI
-        cp = xml.SubElement(container, 'ContentProtection', schemeIdUri=playread_scheme_id_uri)
-        if options.playready_header:
-            header_bin = ComputePlayReadyHeader(options.playready_header, default_kid, default_key)
-            header_b64 = header_bin.encode('base64').replace('\n', '')
-            pro = xml.SubElement(cp, '{' + PLAYREADY_MSPR_NAMESPACE + '}pro')
-            pro.text = header_b64
+        cp = xml.SubElement(container, 'ContentProtection', schemeIdUri=playread_scheme_id_uri, value="2.0")
+
+        header_bin = ComputePlayReadyHeader(options.playready_version,
+                                            options.playready_header,
+                                            options.encryption_cenc_scheme,
+                                            key_set)
+        header_b64 = Base64Encode(header_bin)
+        pro = xml.SubElement(cp, '{' + PLAYREADY_MSPR_NAMESPACE + '}pro')
+        pro.text = header_b64
+        pssh_box = MakePsshBox(bytes.fromhex(PLAYREADY_PSSH_SYSTEM_ID), header_bin)
+        pssh_b64 = Base64Encode(pssh_box)
+        pssh = xml.SubElement(cp, '{' + CENC_2013_NAMESPACE + '}pssh')
+        pssh.text = pssh_b64
 
     # Widevine
     if options.widevine:
         container.append(xml.Comment(' Widevine '))
         cp = xml.SubElement(container, 'ContentProtection', schemeIdUri=WIDEVINE_SCHEME_ID_URI)
         if options.widevine_header:
-            pssh_payload = ComputeWidevineHeader(options.widevine_header, default_kid)
-            pssh_box = MakePsshBox(WIDEVINE_PSSH_SYSTEM_ID.decode('hex'), pssh_payload)
-            pssh_b64 = pssh_box.encode('base64').replace('\n', '')
+            pssh_payload = ComputeWidevineHeader(options.widevine_header, options.encryption_cenc_scheme, default_kid)
+            pssh_box = MakePsshBox(bytes.fromhex(WIDEVINE_PSSH_SYSTEM_ID), pssh_payload)
+            pssh_b64 = Base64Encode(pssh_box)
             pssh = xml.SubElement(cp, '{' + CENC_2013_NAMESPACE + '}pssh')
             pssh.text = pssh_b64
 
@@ -291,8 +348,8 @@
         cp = xml.SubElement(container, 'ContentProtection', schemeIdUri=PRIMETIME_SCHEME_ID_URI)
         if options.primetime_metadata:
             pssh_payload = ComputePrimetimeMetaData(options.primetime_metadata, default_kid)
-            pssh_box = MakePsshBox(PRIMETIME_PSSH_SYSTEM_ID.decode('hex'), pssh_payload)
-            pssh_b64 = pssh_box.encode('base64').replace('\n', '')
+            pssh_box = MakePsshBox(bytes.fromhex(PRIMETIME_PSSH_SYSTEM_ID), pssh_payload)
+            pssh_b64 = Base64Encode(pssh_box)
             pssh = xml.SubElement(cp, '{' + CENC_2013_NAMESPACE + '}pssh')
             pssh.text = pssh_b64
 
@@ -304,7 +361,8 @@
         attributes = set_attributes.get(category_name)
         if attributes:
             set_name = category_name
-    if not attributes: return
+    if not attributes:
+        return
 
     for descriptor_name in attributes:
         descriptor_values = attributes[descriptor_name]
@@ -337,16 +395,16 @@
 
 #############################################
 def OutputDash(options, set_attributes, audio_sets, video_sets, subtitles_sets, subtitles_files):
-    all_audio_tracks     = sum(audio_sets.values(),     [])
-    all_video_tracks     = sum(video_sets.values(),     [])
-    all_subtitles_tracks = sum(subtitles_sets.values(), [])
+    all_audio_tracks     = sum(list(audio_sets.values()),     [])
+    all_video_tracks     = sum(list(video_sets.values()),     [])
+    all_subtitles_tracks = sum(list(subtitles_sets.values()), [])
 
     # compute the total duration (we take the duration of the video)
-    if len(all_video_tracks):
+    if all_video_tracks:
         presentation_duration = all_video_tracks[0].total_duration
-    elif len(all_audio_tracks):
+    elif all_audio_tracks:
         presentation_duration = all_audio_tracks[0].total_duration
-    elif len(all_subtitles_tracks):
+    elif all_subtitles_tracks:
         presentation_duration = all_subtitles_tracks[0].total_duration
     else:
         return
@@ -366,10 +424,10 @@
     period = xml.SubElement(mpd, 'Period')
 
     # process the video tracks
-    if len(video_sets):
+    if video_sets:
         period.append(xml.Comment(' Video '))
 
-        for video_tracks in video_sets.values():
+        for video_tracks in list(video_sets.values()):
             # compute the max values
             maxWidth  = 0
             maxHeight = 0
@@ -390,7 +448,7 @@
 
             # setup content protection
             if options.encryption_key or options.marlin or options.playready or options.widevine:
-                AddContentProtection(options, adaptation_set, video_tracks)
+                AddContentProtection(options, adaptation_set, video_tracks, all_audio_tracks + all_video_tracks)
 
             if options.on_demand:
                 adaptation_set.set('subsegmentAlignment', 'true')
@@ -428,9 +486,9 @@
                     AddSegments(options, representation, video_track)
 
     # process the audio tracks
-    if len(audio_sets):
+    if audio_sets:
         period.append(xml.Comment(' Audio '))
-        for adaptation_set_name, audio_tracks in audio_sets.items():
+        for _, audio_tracks in list(audio_sets.items()):
             args = [period, 'AdaptationSet']
             kwargs = {'mimeType': AUDIO_MIMETYPE, 'startWithSAP': '1', 'segmentAlignment': 'true'}
             language = audio_tracks[0].language
@@ -443,7 +501,7 @@
 
             # setup content protection
             if options.encryption_key or options.marlin or options.playready or options.widevine:
-                AddContentProtection(options, adaptation_set, audio_tracks)
+                AddContentProtection(options, adaptation_set, audio_tracks, all_audio_tracks + all_video_tracks)
 
             if options.on_demand:
                 adaptation_set.set('subsegmentAlignment', 'true')
@@ -467,13 +525,18 @@
                                                 bandwidth=str(audio_track.bandwidth),
                                                 audioSamplingRate=str(audio_track.sample_rate))
                 if audio_track.codec == 'ec-3':
-                    audio_channel_config_value = ComputeDolbyDigitalAudioChannelConfig(audio_track)
+                    audio_channel_config_value = ComputeDolbyDigitalPlusAudioChannelConfig(audio_track)
                     scheme_id_uri = DOLBY_DIGITAL_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI
                 elif audio_track.codec.startswith('ac-4'):
                     audio_channel_config_value = ComputeDolbyAc4AudioChannelConfig(audio_track)
                     scheme_id_uri = DOLBY_AC4_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI
                 else:
-                    audio_channel_config_value = str(audio_track.channels)
+                    # detect the actual number of channels
+                    sample_description = audio_track.info['sample_descriptions'][0]
+                    if 'mpeg_4_audio_decoder_config' in sample_description:
+                        audio_channel_config_value = str(sample_description['mpeg_4_audio_decoder_config']['channels'])
+                    else:
+                        audio_channel_config_value = str(audio_track.channels)
                     scheme_id_uri = MPEG_DASH_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI
                 xml.SubElement(representation,
                                'AudioChannelConfiguration',
@@ -491,9 +554,9 @@
                     AddSegments(options, representation, audio_track)
 
     # process all the subtitles tracks
-    if len(subtitles_sets):
+    if subtitles_sets:
         period.append(xml.Comment(' Subtitles (Encapsulated) '))
-        for adaptation_set_name, subtitles_tracks in subtitles_sets.items():
+        for _, subtitles_tracks in list(subtitles_sets.items()):
             for subtitles_track in subtitles_tracks:
                 args = [period, 'AdaptationSet']
                 kwargs = {'mimeType': SUBTITLES_MIMETYPE, 'startWithSAP': '1'}
@@ -533,7 +596,7 @@
                     AddSegments(options, representation, subtitles_track)
 
     # process all the subtitles files
-    if len(subtitles_files):
+    if subtitles_files:
         period.append(xml.Comment(' Subtitles (Sidecar) '))
         for subtitles_file in subtitles_files:
             args = [period, 'AdaptationSet']
@@ -568,27 +631,37 @@
         mpd_xml = parseString(xml.tostring(mpd)).toprettyxml("  ")
         # use a regex to fix a bug in toprettyxml() that inserts newlines in text content
         mpd_xml = re.sub(r'((?<=>)(\n[\s]*)(?=[^<\s]))|(?<=[^>\s])(\n[\s]*)(?=<)', '', mpd_xml)
-        open(path.join(options.output_dir, options.mpd_filename), "wb").write(mpd_xml)
+        open(path.join(options.output_dir, options.mpd_filename), 'w').write(mpd_xml)
 
 
 #############################################
 def ComputeHlsWidevineKeyLine(options, track):
-    try:
-        pairs = options.widevine_header.split('#')
-        fields = {}
-        for pair in pairs:
-            name, value = pair.split(':', 1)
-            fields[name] = value
-    except:
-        raise Exception('invalid syntax for --widevine-header option')
-
-    if 'content_id' not in fields:
-        fields['content_id'] = '*'
-    if 'kid' not in fields:
-        fields['kid'] = track.key_info['kid']
+    # V2 key line
+    kid = track.key_info['kid']
+    widevine_header = ComputeWidevineHeader(options.widevine_header, options.encryption_cenc_scheme, kid)
+    pssh_box = MakePsshBox(bytes.fromhex(WIDEVINE_PSSH_SYSTEM_ID), widevine_header)
+    key_line = 'URI="data:text/plain;base64,{}",KEYFORMAT="urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed",KEYID=0x{},KEYFORMATVERSIONS="1"'.format(
+        Base64Encode(pssh_box),
+        kid
+    )
 
-    json_param = '{ "provider": "%(provider)s", "content_id": "%(content_id)s", "key_ids": ["%(kid)s"] }' % fields
-    key_line   = 'URI="data:text/plain;base64,'+json_param.encode('base64').replace('\n','')+'",KEYFORMAT="com.widevine",KEYFORMATVERSIONS="1",IV=0x'+track.key_info['iv']
+    return key_line
+
+#############################################
+def ComputeHlsPlayReadyKeyLine(options, track, all_tracks):
+    # compute a list of all keys if we need to merge keys into a single list
+    if options.merge_keys:
+        key_set = GetKeySet(all_tracks)
+    else:
+        key_set = [(track.key_info.get('kid'), track.key_info.get('key'))]
+
+    pr_header = ComputePlayReadyHeader(options.playready_version,
+                                       options.playready_header,
+                                       options.encryption_cenc_scheme,
+                                       key_set)
+    key_line = 'URI="data:text/plain;charset=UTF-16;base64,{}",KEYFORMAT="com.microsoft.playready",KEYFORMATVERSIONS="1"'.format(
+        Base64Encode(pr_header)
+    )
 
     return key_line
 
@@ -597,23 +670,23 @@
     return 'URI="'+options.fairplay_key_uri+'",KEYFORMAT="com.apple.streamingkeydelivery",KEYFORMATVERSIONS="1"'
 
 #############################################
-def OutputHlsCommon(options, track, media_subdir, playlist_name, media_file_name):
+def OutputHlsCommon(options, track, all_tracks, media_subdir, playlist_name, media_file_name):
     hls_target_duration = math.ceil(max(track.segment_durations))
 
-    playlist_file = open(path.join(options.output_dir, media_subdir, playlist_name), 'wb+')
-    playlist_file.write('#EXTM3U\r\n')
-    playlist_file.write('# Created with Bento4 mp4-dash.py, VERSION=' + VERSION + '-' + SDK_REVISION+'\r\n')
-    playlist_file.write('#\r\n')
-    playlist_file.write('#EXT-X-VERSION:6\r\n')
-    playlist_file.write('#EXT-X-PLAYLIST-TYPE:VOD\r\n')
-    playlist_file.write('#EXT-X-INDEPENDENT-SEGMENTS\r\n')
-    playlist_file.write('#EXT-X-TARGETDURATION:%d\r\n' % (hls_target_duration))
-    playlist_file.write('#EXT-X-MEDIA-SEQUENCE:0\r\n')
+    playlist_file = open(path.join(options.output_dir, media_subdir, playlist_name), 'w', newline='\r\n')
+    playlist_file.write('#EXTM3U\n')
+    playlist_file.write('# Created with Bento4 mp4-dash.py, VERSION=' + VERSION + '-' + SDK_REVISION+'\n')
+    playlist_file.write('#\n')
+    playlist_file.write('#EXT-X-VERSION:6\n')
+    playlist_file.write('#EXT-X-PLAYLIST-TYPE:VOD\n')
+    playlist_file.write('#EXT-X-INDEPENDENT-SEGMENTS\n')
+    playlist_file.write('#EXT-X-TARGETDURATION:{}\n'.format(hls_target_duration))
+    playlist_file.write('#EXT-X-MEDIA-SEQUENCE:0\n')
     if options.split:
-        playlist_file.write('#EXT-X-MAP:URI="%s"\r\n' % (SPLIT_INIT_SEGMENT_NAME))
+        playlist_file.write('#EXT-X-MAP:URI="{}"\n'.format(SPLIT_INIT_SEGMENT_NAME))
     else:
         init_segment_size = track.parent.init_segment.position + track.parent.init_segment.size
-        playlist_file.write('#EXT-X-MAP:URI="%s",BYTERANGE="%d@0"\r\n' % (media_file_name, init_segment_size))
+        playlist_file.write('#EXT-X-MAP:URI="{}",BYTERANGE="{}@0"\n'.format(media_file_name, init_segment_size))
 
     if options.encryption_key:
         key_lines = []
@@ -621,42 +694,59 @@
             key_lines.append(ComputeHlsFairplayKeyLine(options))
         if options.widevine_header:
             key_lines.append(ComputeHlsWidevineKeyLine(options, track))
+        if options.playready:
+            key_lines.append(ComputeHlsPlayReadyKeyLine(options, track, all_tracks))
 
-        if len(key_lines) == 0:
+        if not key_lines:
             key_lines.append('URI="'+options.hls_key_url+'",IV=0x'+track.key_info['iv'])
 
         for key_line in key_lines:
-            playlist_file.write('#EXT-X-KEY:METHOD=SAMPLE-AES,'+key_line+'\r\n')
+            playlist_file.write('#EXT-X-KEY:METHOD=SAMPLE-AES,'+key_line+'\n')
 
     return playlist_file
 
 #############################################
-def OutputHlsTrack(options, track, media_subdir, media_playlist_name, media_file_name):
-    media_playlist_file = OutputHlsCommon(options, track, media_subdir, media_playlist_name, media_file_name)
+def OutputHlsTrack(options, track, all_tracks, media_subdir, media_playlist_name, media_file_name):
+    media_playlist_file = OutputHlsCommon(options, track, all_tracks, media_subdir, media_playlist_name, media_file_name)
 
     if options.split:
         segment_pattern = SEGMENT_PATTERN.replace('ll','')
 
     for i in range(len(track.segment_durations)):
-        media_playlist_file.write('#EXTINF:%f,\r\n' % (track.segment_durations[i]))
+        media_playlist_file.write('#EXTINF:{},\n'.format(track.segment_durations[i]))
         if options.on_demand or not options.split:
             segment          = track.parent.segments[track.moofs[i]]
             segment_position = segment[0].position
             segment_size     = reduce(operator.add, [atom.size for atom in segment], 0)
-            media_playlist_file.write('#EXT-X-BYTERANGE:%d@%d\r\n' % (segment_size, segment_position))
+            media_playlist_file.write('#EXT-X-BYTERANGE:{}@{}\n'.format(segment_size, segment_position))
             media_playlist_file.write(media_file_name)
         else:
             media_playlist_file.write(segment_pattern % (i+1))
-        media_playlist_file.write('\r\n')
+        media_playlist_file.write('\n')
 
-    media_playlist_file.write('#EXT-X-ENDLIST\r\n')
+    media_playlist_file.write('#EXT-X-ENDLIST\n')
 
 #############################################
-def OutputHlsIframeIndex(options, track, media_subdir, iframes_playlist_name, media_file_name):
-    index_playlist_file = OutputHlsCommon(options, track, media_subdir, iframes_playlist_name, media_file_name)
+def OutputHlsWebvttPlaylist(options, media_subdir, media_playlist_name, media_file_name, total_duration):
+    # output a playlist with a single segment that covers the entire WebVTT file
+    playlist_file = open(path.join(options.output_dir, media_subdir, media_playlist_name), 'w', newline='\r\n')
+    playlist_file.write('#EXTM3U\n')
+    playlist_file.write('# Created with Bento4 mp4-dash.py, VERSION=' + VERSION + '-' + SDK_REVISION+'\n')
+    playlist_file.write('#\n')
+    playlist_file.write('#EXT-X-VERSION:6\n')
+    playlist_file.write('#EXT-X-INDEPENDENT-SEGMENTS\n')
+    playlist_file.write('#EXT-X-PLAYLIST-TYPE:VOD\n')
+    playlist_file.write('#EXT-X-TARGETDURATION:{}\n'.format(total_duration))
+    playlist_file.write('#EXTINF:{},\n'.format(total_duration))
+    playlist_file.write(media_file_name)
+    playlist_file.write('\n')
+    playlist_file.write('#EXT-X-ENDLIST\n')
 
-    index_playlist_file.write('#EXT-X-I-FRAMES-ONLY\r\n')
+#############################################
+def OutputHlsIframeIndex(options, track, all_tracks, media_subdir, iframes_playlist_name, media_file_name):
+    index_playlist_file = OutputHlsCommon(options, track, all_tracks, media_subdir, iframes_playlist_name, media_file_name)
 
+    index_playlist_file.write('#EXT-X-I-FRAMES-ONLY\n')
 
     iframe_total_segment_size = 0
     iframe_total_segment_duration = 0
@@ -665,13 +755,13 @@
 
     if not options.split:
         # get the I-frame index for a single file
-        json_index = Mp4IframIndex(options, path.join(options.output_dir, media_file_name))
+        json_index = Mp4IframeIndex(options, path.join(options.output_dir, media_file_name))
         index = json.loads(json_index)
         for i in range(len(track.segment_durations)):
             if i < len(index):
                 index_entry = index[i]
                 iframe_segment_duration = track.segment_durations[i]
-                index_playlist_file.write('#EXTINF:%f,\r\n' % (iframe_segment_duration))
+                index_playlist_file.write('#EXTINF:{},\n'.format(iframe_segment_duration))
                 fragment_start    = int(index_entry['fragmentStart'])
                 iframe_offset     = int(index_entry['offset'])
                 iframe_size       = int(index_entry['size'])
@@ -683,8 +773,8 @@
                     iframe_max_bitrate = iframe_bitrate
 
                 iframe_range_size = iframe_size + (iframe_offset-fragment_start)
-                index_playlist_file.write('#EXT-X-BYTERANGE:%d@%d\r\n' % (iframe_range_size, fragment_start))
-                index_playlist_file.write(media_file_name+'\r\n')
+                index_playlist_file.write('#EXT-X-BYTERANGE:{}@{}\n'.format(iframe_range_size, fragment_start))
+                index_playlist_file.write(media_file_name+'\n')
     else:
         segment_pattern = SEGMENT_PATTERN.replace('ll','')
         for i in range(len(track.segment_durations)):
@@ -693,7 +783,7 @@
             init_file = path.join(options.output_dir, media_subdir, options.init_segment)
             if not path.exists(fragment_file):
                 break
-            json_index = Mp4IframIndex(options, fragment_file, fragments_info=init_file)
+            json_index = Mp4IframeIndex(options, fragment_file, fragments_info=init_file)
             index = json.loads(json_index)
             if len(index) < 1:
                 break
@@ -701,9 +791,9 @@
             iframe_offset     = int(index[0]['offset'])
             iframe_range_size = iframe_size + iframe_offset
             iframe_segment_duration = track.segment_durations[i]
-            index_playlist_file.write('#EXTINF:%f,\r\n' % (iframe_segment_duration))
-            index_playlist_file.write('#EXT-X-BYTERANGE:%d@0\r\n' % (iframe_range_size))
-            index_playlist_file.write(fragment_basename+'\r\n')
+            index_playlist_file.write('#EXTINF:{},\n'.format(iframe_segment_duration))
+            index_playlist_file.write('#EXT-X-BYTERANGE:{}@0\n'.format(iframe_range_size))
+            index_playlist_file.write(fragment_basename+'\n')
 
             iframe_total_segment_size += iframe_size
             iframe_total_segment_duration += iframe_segment_duration
@@ -712,7 +802,7 @@
             if iframe_bitrate > iframe_max_bitrate:
                 iframe_max_bitrate = iframe_bitrate
 
-    index_playlist_file.write('#EXT-X-ENDLIST\r\n')
+    index_playlist_file.write('#EXT-X-ENDLIST\n')
 
     iframe_average_segment_bitrate = 8.0*(iframe_total_segment_size/iframe_total_segment_duration)
 
@@ -720,24 +810,24 @@
 
 #############################################
 def OutputHls(options, set_attributes, audio_sets, video_sets, subtitles_sets, subtitles_files):
-    # all_audio_tracks     = sum(audio_sets.values(),     [])
-    all_video_tracks     = sum(video_sets.values(),     [])
-    all_subtitles_tracks = sum(subtitles_sets.values(), [])
-
-    master_playlist_file = open(path.join(options.output_dir, options.hls_master_playlist_name), 'wb+')
-    master_playlist_file.write('#EXTM3U\r\n')
-    master_playlist_file.write('# Created with Bento4 mp4-dash.py, VERSION=' + VERSION + '-' + SDK_REVISION+'\r\n')
-    master_playlist_file.write('#\r\n')
-    master_playlist_file.write('#EXT-X-VERSION:6\r\n')
-    master_playlist_file.write('\r\n')
-    master_playlist_file.write('# Media Playlists\r\n')
+    all_audio_tracks     = sum(audio_sets.values(),           [])
+    all_video_tracks     = sum(list(video_sets.values()),     [])
+    all_subtitles_tracks = sum(list(subtitles_sets.values()), [])
+
+    master_playlist_file = open(path.join(options.output_dir, options.hls_master_playlist_name), 'w', newline='\r\n')
+    master_playlist_file.write('#EXTM3U\n')
+    master_playlist_file.write('# Created with Bento4 mp4-dash.py, VERSION=' + VERSION + '-' + SDK_REVISION+'\n')
+    master_playlist_file.write('#\n')
+    master_playlist_file.write('#EXT-X-VERSION:6\n')
+    master_playlist_file.write('\n')
+    master_playlist_file.write('# Media Playlists\n')
 
-    master_playlist_file.write('\r\n')
-    master_playlist_file.write('# Audio\r\n')
+    master_playlist_file.write('\n')
+    master_playlist_file.write('# Audio\n')
     audio_groups = {}
-    for adaptation_set_name, audio_tracks in audio_sets.items():
-        language = audio_tracks[0].language.decode('utf-8')
-        language_name = LanguageNames.get(language, language).decode('utf-8')
+    for adaptation_set_name, audio_tracks in list(audio_sets.items()):
+        language = audio_tracks[0].language
+        language_name = LanguageNames.get(language, language)
 
         audio_group_name = adaptation_set_name[0]+'/'+adaptation_set_name[2]
         audio_groups[audio_group_name] = {
@@ -745,6 +835,7 @@
             'average_segment_bitrate': 0,
             'max_segment_bitrate': 0
         }
+        select_as_default = True
         for audio_track in audio_tracks:
             # update the avergage and max bitrates
             if audio_track.average_segment_bitrate > audio_groups[audio_group_name]['average_segment_bitrate']:
@@ -757,7 +848,7 @@
                 audio_groups[audio_group_name]['codec'] = audio_track.codec
             else:
                 if audio_groups[audio_group_name]['codec'] != audio_track.codec:
-                    print 'WARNING: audio codecs not all the same:', audio_groups[audio_group_name]['codec'], audio_track.codec
+                    print('WARNING: audio codecs not all the same:', audio_groups[audio_group_name]['codec'], audio_track.codec)
 
             if options.on_demand or not options.split:
                 media_subdir        = ''
@@ -770,16 +861,28 @@
                 media_playlist_name = options.hls_media_playlist_name
                 media_playlist_path = media_subdir+'/'+media_playlist_name
 
-            master_playlist_file.write(('#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="%s",LANGUAGE="%s",NAME="%s",AUTOSELECT=YES,DEFAULT=YES,URI="%s"\r\n' % (
-                                        audio_group_name,
-                                        language,
-                                        language_name,
-                                        media_playlist_path)).encode('utf-8'))
-            OutputHlsTrack(options, audio_track, media_subdir, media_playlist_name, media_file_name)
+            master_playlist_file.write('#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="{}",LANGUAGE="{}",NAME="{}",AUTOSELECT=YES,DEFAULT={},URI="{}"\n'.format(
+                                       audio_group_name,
+                                       language,
+                                       language_name,
+                                       'YES' if select_as_default else 'NO',
+                                       media_playlist_path))
+            select_as_default = False
+            OutputHlsTrack(options, audio_track, all_audio_tracks + all_video_tracks, media_subdir, media_playlist_name, media_file_name)
+
+            # Add an audio stream entry for audio-only presentations
+            if not all_video_tracks:
+                master_playlist_file.write('#EXT-X-STREAM-INF:AUDIO="{}",AVERAGE-BANDWIDTH={:.0f},BANDWIDTH={:.0f},CODECS="{}"\n'.format(
+                                            audio_group_name,
+                                            audio_track.average_segment_bitrate,
+                                            audio_track.max_segment_bitrate,
+                                            audio_track.codec))
+                master_playlist_file.write(media_playlist_path+'\n')
 
-    master_playlist_file.write('\r\n')
-    master_playlist_file.write('# Video\r\n')
+    master_playlist_file.write('\n')
+    master_playlist_file.write('# Video\n')
     iframe_playlist_lines = []
+    subtitles_group = 'SUBTITLES="subtitles",' if subtitles_files else ''
     for video_track in all_video_tracks:
         if options.on_demand or not options.split:
             media_subdir          = ''
@@ -796,11 +899,12 @@
             iframes_playlist_name = options.hls_iframes_playlist_name
             iframes_playlist_path = media_subdir+'/'+iframes_playlist_name
 
-        if len(audio_groups):
+        if audio_groups:
             # one entry per audio group
             for audio_group_name in audio_groups:
                 audio_codec = audio_groups[audio_group_name]['codec']
-                master_playlist_file.write('#EXT-X-STREAM-INF:AUDIO="%s",AVERAGE-BANDWIDTH=%d,BANDWIDTH=%d,CODECS="%s",RESOLUTION=%dx%d,FRAME-RATE=%s\r\n' % (
+                master_playlist_file.write('#EXT-X-STREAM-INF:{}AUDIO="{}",AVERAGE-BANDWIDTH={:.0f},BANDWIDTH={:.0f},CODECS="{}",RESOLUTION={:.0f}x{:.0f},FRAME-RATE={:.3f}\n'.format(
+                                           subtitles_group,
                                            audio_group_name,
                                            video_track.average_segment_bitrate + audio_groups[audio_group_name]['average_segment_bitrate'],
                                            video_track.max_segment_bitrate + audio_groups[audio_group_name]['max_segment_bitrate'],
@@ -808,24 +912,24 @@
                                            video_track.width,
                                            video_track.height,
                                            video_track.frame_rate))
-                master_playlist_file.write(media_playlist_path+'\r\n')
+                master_playlist_file.write(media_playlist_path+'\n')
         else:
             # no audio
-            master_playlist_file.write('#EXT-X-STREAM-INF:AVERAGE-BANDWIDTH=%d,BANDWIDTH=%d,CODECS="%s",RESOLUTION=%dx%d,FRAME-RATE=%s\r\n' % (
+            master_playlist_file.write('#EXT-X-STREAM-INF:{}AVERAGE-BANDWIDTH={:.0f},BANDWIDTH={:.0f},CODECS="{}",RESOLUTION={:.0f}x{:.0f},FRAME-RATE={:.3f}\n'.format(
+                                       subtitles_group,
                                        video_track.average_segment_bitrate,
                                        video_track.max_segment_bitrate,
                                        video_track.codec,
                                        video_track.width,
                                        video_track.height,
                                        video_track.frame_rate))
-            master_playlist_file.write(media_playlist_path+'\r\n')
-
-        OutputHlsTrack(options, video_track, media_subdir, media_playlist_name, media_file_name)
-        iframe_average_segment_bitrate,iframe_max_bitrate = OutputHlsIframeIndex(options, video_track, media_subdir, iframes_playlist_name, media_file_name)
+            master_playlist_file.write(media_playlist_path+'\n')
 
+        OutputHlsTrack(options, video_track, all_audio_tracks + all_video_tracks, media_subdir, media_playlist_name, media_file_name)
+        iframe_average_segment_bitrate,iframe_max_bitrate = OutputHlsIframeIndex(options, video_track, all_audio_tracks + all_video_tracks, media_subdir, iframes_playlist_name, media_file_name)
 
         # this will be written later
-        iframe_playlist_lines.append('#EXT-X-I-FRAME-STREAM-INF:AVERAGE-BANDWIDTH=%d,BANDWIDTH=%d,CODECS="%s",RESOLUTION=%dx%d,URI="%s"\r\n' % (
+        iframe_playlist_lines.append('#EXT-X-I-FRAME-STREAM-INF:AVERAGE-BANDWIDTH={:.0f},BANDWIDTH={:.0f},CODECS="{}",RESOLUTION={:.0f}x{:.0f},URI="{}"\n'.format(
                                      iframe_average_segment_bitrate,
                                      iframe_max_bitrate,
                                      video_track.codec,
@@ -833,18 +937,19 @@
                                      video_track.height,
                                      iframes_playlist_path))
 
-    master_playlist_file.write('\r\n# I-Frame Playlists\r\n')
+    master_playlist_file.write('\n# I-Frame Playlists\n')
     master_playlist_file.write(''.join(iframe_playlist_lines))
 
     # IMSC1 subtitles
-    if len(all_subtitles_tracks):
-        master_playlist_file.write('\r\n# Subtitles (IMSC1)\r\n')
+    if all_subtitles_tracks:
+        master_playlist_file.write('\n# Subtitles (IMSC1)\n')
+        select_as_default = True
         for subtitles_track in all_subtitles_tracks:
             if subtitles_track.codec != 'stpp':
                 # only accept IMSC1 tracks
                 continue
-            language = subtitles_track.language.decode('utf-8')
-            language_name = LanguageNames.get(language, language).decode('utf-8')
+            language = subtitles_track.language
+            language_name = LanguageNames.get(language, language)
 
             if options.on_demand or not options.split:
                 media_subdir        = ''
@@ -857,20 +962,34 @@
                 media_playlist_name = options.hls_media_playlist_name
                 media_playlist_path = media_subdir+'/'+media_playlist_name
 
-            master_playlist_file.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="imsc1",NAME="{0:s}",DEFAULT=NO,AUTOSELECT=YES,LANGUAGE="{1:s}",URI="{2:s}"\r\n'
-                                       .format(language_name, language, media_playlist_path))
+            master_playlist_file.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitles",NAME="{}",DEFAULT={},AUTOSELECT=YES,LANGUAGE="{}",URI="{}"\n'.format(
+                                       language_name,
+                                       'YES' if select_as_default else 'NO',
+                                       language,
+                                       media_playlist_path))
+            select_as_default = False
 
     # WebVTT subtitles
-    if len(subtitles_files):
-        master_playlist_file.write('\r\n# Subtitles (WebVTT)\r\n')
+    if subtitles_files:
+        master_playlist_file.write('\n# Subtitles (WebVTT)\n')
+        presentation_duration = math.ceil(max([track.total_duration for track in all_video_tracks + all_audio_tracks]))
+        select_as_default = True
         for subtitles_file in subtitles_files:
-            master_playlist_file.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="{0:s}",DEFAULT=NO,AUTOSELECT=YES,FORCED=YES,LANGUAGE="{0:s}",URI="subtitles/{0:s}/{1:s}"\r\n'
-                                       .format(subtitles_file.language,subtitles_file.media_name))
+            media_subdir = 'subtitles/{}'.format(subtitles_file.language)
+            media_playlist_name = options.hls_media_playlist_name
+            master_playlist_file.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitles",NAME="{}",DEFAULT={},AUTOSELECT=YES,LANGUAGE="{}",URI="{}/{}"\n'.format(
+                                       language_name,
+                                       'YES' if select_as_default else 'NO',
+                                       subtitles_file.language,
+                                       media_subdir,
+                                       media_playlist_name))
+            select_as_default = False
+            OutputHlsWebvttPlaylist(options, media_subdir, media_playlist_name, subtitles_file.media_name, presentation_duration)
 
 #############################################
 def OutputSmooth(options, audio_tracks, video_tracks):
     # compute the total duration (we take the duration of the video)
-    if len(video_tracks):
+    if video_tracks:
         presentation_duration = video_tracks[0].total_duration
     else:
         presentation_duration = audio_tracks[0].total_duration
@@ -900,7 +1019,7 @@
 
         if audio_track.codec == 'ec-3':
             # Dolby Digital Plus
-            (channels, codec_private_data) = ComputeDolbyDigitalSmoothStreamingInfo(audio_track)
+            (channels, codec_private_data) = ComputeDolbyDigitalPlusSmoothStreamingInfo(audio_track)
             audio_tag = '65534'
             fourcc = 'EC-3'
             channels = str(channels)
@@ -930,7 +1049,7 @@
             xml.SubElement(stream_index, "c", d=str(duration))
 
     # process all the video tracks
-    if len(video_tracks):
+    if video_tracks:
         max_width  = max([track.width  for track in video_tracks])
         max_height = max([track.height for track in video_tracks])
         video_url_pattern="QualityLevels({bitrate})/Fragments(video={start time})"
@@ -961,25 +1080,21 @@
         for duration in video_tracks[0].segment_scaled_durations:
             xml.SubElement(stream_index, "c", d=str(duration))
 
-    if options.playready_header:
-        key_info = None
-        if options.encryption_key:
-            if len(video_tracks):
-                key_info = video_tracks[0].key_info
-                if not key_info and len(audio_tracks):
-                    key_info = audio_tracks[0].key_info
-
-        if key_info:
-            kid = key_info['kid']
-            key = key_info['key']
-        else:
-            if len(video_tracks):
-                kid = video_tracks[0].kid
-            else:
-                kid = audio_tracks[0].kid
-            key = None
-        header_bin = ComputePlayReadyHeader(options.playready_header, kid, key)
-        header_b64 = header_bin.encode('base64').replace('\n', '')
+    if options.playready:
+        if video_tracks:
+            key_info = video_tracks[0].key_info
+            if not key_info and len(audio_tracks):
+                key_info = audio_tracks[0].key_info
+
+        if not key_info:
+            return
+        kid = key_info.get('kid')
+        key = key_info.get('key')
+        header_bin = ComputePlayReadyHeader(options.playready_version,
+                                            options.playready_header,
+                                            options.encryption_cenc_scheme,
+                                            [(kid, key)])
+        header_b64 = Base64Encode(header_bin)
         protection = xml.SubElement(client_manifest, 'Protection')
         protection_header = xml.SubElement(protection,
                                            'ProtectionHeader',
@@ -988,7 +1103,7 @@
 
     # save the Smooth Client Manifest
     if options.smooth_client_manifest_filename != '':
-        open(path.join(options.output_dir, options.smooth_client_manifest_filename), "wb").write(parseString(xml.tostring(client_manifest)).toprettyxml("  "))
+        open(path.join(options.output_dir, options.smooth_client_manifest_filename), 'w').write(parseString(xml.tostring(client_manifest)).toprettyxml('  '))
 
     # create the Server Manifest file
     server_manifest = xml.Element('smil', xmlns=SMIL_NAMESPACE)
@@ -1041,7 +1156,7 @@
 
     # save the Manifest
     if options.smooth_server_manifest_filename != '':
-        open(path.join(options.output_dir, options.smooth_server_manifest_filename), "wb").write(parseString(xml.tostring(server_manifest)).toprettyxml("  "))
+        open(path.join(options.output_dir, options.smooth_server_manifest_filename), 'w').write(parseString(xml.tostring(server_manifest)).toprettyxml('  '))
 
 #############################################
 def OutputHippo(options, audio_tracks, video_tracks):
@@ -1073,7 +1188,7 @@
 
     # save the Manifest
     if options.hippo_server_manifest_filename != '':
-        open(path.join(options.output_dir, options.hippo_server_manifest_filename), "wb").write(server_manifest)
+        open(path.join(options.output_dir, options.hippo_server_manifest_filename), 'w').write(server_manifest)
 
 #############################################
 def SelectTracks(options, media_sources):
@@ -1081,9 +1196,7 @@
     file_list_index = 1
     mp4_files = {}
     mp4_media_names = []
-    for media_source in media_sources:
-        if media_source.format != 'mp4': continue
-
+    for media_source in [x for x in media_sources if x.format == 'mp4']:
         media_file = media_source.filename
 
         # check if we have already parsed this file
@@ -1092,12 +1205,12 @@
             continue
 
         # parse the file
-        if not os.path.exists(media_file):
+        if not path.exists(media_file):
             PrintErrorAndExit('ERROR: media file ' + media_file + ' does not exist')
 
         # get the file info
-        print 'Parsing media file', str(file_list_index)+':', GetMappedFileName(media_file)
-        mp4_file = Mp4File(Options, media_source)
+        print('Parsing media file', str(file_list_index)+':', GetMappedFileName(media_file))
+        mp4_file = Mp4File(options, media_source)
 
         # set some metadata properties for this file
         mp4_file.file_list_index = file_list_index
@@ -1113,7 +1226,7 @@
 
         if not options.split:
             if mp4_file.media_name in mp4_media_names:
-                PrintErrorAndExit('ERROR: output media name %s is not unique, consider using --rename-media'%mp4_file.media_name)
+                PrintErrorAndExit('ERROR: output media name {} is not unique, consider using --rename-media'.format(mp4_file.media_name))
 
         # check the file
         if mp4_file.info['movie']['fragments'] != True:
@@ -1124,7 +1237,6 @@
         mp4_files[media_file] = mp4_file
         mp4_media_names.append(mp4_file.media_name)
 
-
     # select tracks
     audio_adaptation_sets     = {}
     video_adaptation_sets     = {}
@@ -1158,7 +1270,7 @@
                 PrintErrorAndExit('ERROR: no ' + track_type + ' found for media file '+media_source.name)
 
         if not tracks:
-            tracks = media_source.mp4_file.tracks.values()
+            tracks = list(media_source.mp4_file.tracks.values())
 
         # pre-process the track metadata
         for track in tracks:
@@ -1185,7 +1297,7 @@
 
             # only keep this track if there isn't already a track with the same codec at the same bitrate (within 10%)
             with_same_bandwidth = [t for t in adaptation_set if abs(float(t.bandwidth-track.bandwidth)/float(t.bandwidth)) < 0.1]
-            if len(with_same_bandwidth):
+            if with_same_bandwidth:
                 continue
 
             adaptation_set.append(track)
@@ -1206,7 +1318,7 @@
                 adaptation_set = subtitles_adaptation_sets.get(adaptation_set_name, [])
                 subtitles_adaptation_sets[adaptation_set_name] = adaptation_set
 
-                if len([et for et in adaptation_set if et.language == track.language]):
+                if [et for et in adaptation_set if et.language == track.language]:
                     continue # only accept one track for each language
 
                 adaptation_set.append(track)
@@ -1219,51 +1331,188 @@
     return [SubtitlesFile(options, media_source) for media_source in media_sources if media_source.format in ['ttml', 'webvtt']]
 
 #############################################
+def KeySpecToKeyInfo(options, key_spec):
+    key_info = {'filter': ['audio', 'video']}
+    if key_spec.startswith('audio:') or key_spec.startswith('video:'):
+        separator = key_spec.find(':')
+        key_info['filter'] = [key_spec[:separator]]
+        key_spec = key_spec[separator+1:]
+    iv_hex = None
+    if key_spec.startswith('@'):
+        kid_hex, key_hex = GetEncryptionKey(options, key_spec[1:])
+    else:
+        if ':' not in key_spec:
+            raise Exception('Invalid argument syntax for --encryption-key option')
+        parts = key_spec.split(':', 2)
+        kid_hex = parts[0]
+        key_hex = parts[1]
+        if len(parts) > 2:
+            iv_hex = parts[2]
+        if len(kid_hex) != 32:
+            raise Exception('Invalid argument format for --encryption-key option')
+
+        if key_hex.startswith('#'):
+            if len(key_hex) != 41:
+                raise Exception('Invalid argument format for --encryption-key option')
+            key_seed_bin = Base64Decode(key_hex[1:])
+            kid_bin = bytes.fromhex(kid_hex)
+            key_hex = DerivePlayReadyKey(key_seed_bin, kid_bin).hex()
+            if options.verbose:
+                print('PlayReady Derived Key =', key_hex)
+        else:
+            if len(key_hex) != 32:
+                raise Exception('Invalid argument format for --encryption-key option')
+
+    key_info['key'] = key_hex
+    key_info['kid'] = kid_hex
+    key_info['iv']  = iv_hex or 'random'
+    if options.hls and not iv_hex:
+        # for HLS, we need to know the IV
+        import random
+        sys_random = random.SystemRandom()
+        random_iv = sys_random.getrandbits(128)
+        key_info['iv'] = '%016x' % random_iv
+
+    return key_info
+
+#############################################
 def ResolveEncryptionKeys(options):
-    options.key_infos = []
     for key_spec in options.encryption_key.split(','):
-        key_info = {'filter': ['audio', 'video']}
-        if key_spec.startswith('audio:') or key_spec.startswith('video:'):
-            separator = key_spec.find(':')
-            key_info['filter'] = [key_spec[:separator]]
-            key_spec = key_spec[separator+1:]
-        iv_hex = None
-        if key_spec.startswith('@'):
-            kid_hex, key_hex = GetEncryptionKey(options, key_spec[1:])
+        options.key_infos.append(KeySpecToKeyInfo(options, key_spec))
+
+#############################################
+# Compute a list of all unique KIDs and associated keys for a list of tracks
+#############################################
+def GetKeySet(tracks):
+    key_sets = {}
+    for track in [x for x in tracks if 'kid' in x.key_info]:
+        key_sets[track.key_info['kid']] = (track.key_info['kid'], track.key_info.get('key'))
+    return list(key_sets.values())
+
+#############################################
+def PrepareSources(options, media_sources):
+    for media_source in [x for x in media_sources if x.format == 'mp4']:
+        key_infos = options.key_infos[:] # make a copy of the shared key infos
+
+        # check if there's a key override for this media source,
+        # if we find one, that will take precendence over the global
+        # key infos
+        key_spec = media_source.spec.get('+key')
+        if key_spec:
+            key_infos.append(KeySpecToKeyInfo(options, key_spec))
+
+        # select which KID/KEY to use for each track
+        for track in media_source.mp4_info['tracks']:
+            for key_info in key_infos:
+                if track['type'].lower() in key_info['filter']:
+                    media_source.key_infos[track['id']] = key_info
+
+#############################################
+def EncryptSources(options, media_sources):
+    # check if there's anything to encrypt
+    if not options.encryption_key:
+        found_key_spec = False
+        for media_source in media_sources:
+            if media_source.spec.get('+key'):
+                found_key_spec
+                break
+        if not found_key_spec:
+            # nothing to encrypt
+            return
+
+    encrypted_files = {}
+    for media_source in [x for x in media_sources if x.format == 'mp4']:
+        media_file = media_source.filename
+
+        # check if we have already encrypted this file
+        if media_file in encrypted_files:
+            media_source.filename = encrypted_files[media_file].name
+            continue
+
+        if not media_source.mp4_info['movie']['fragments']:
+            PrintErrorAndExit('ERROR: file ' + media_file + ' is not fragmented (use mp4fragment to fragment it)')
+
+        if not len(media_source.mp4_info['tracks']):
+            raise Exception('No track found in input file(s)')
+
+        # skip now if we're only outputing the MPD
+        if options.no_media:
+            continue
+
+        # don't process any further if we won't have key material for this media source
+        if not media_source.key_infos:
+            continue
+
+        # pick a default key
+        default_kid = options.key_infos[0]['kid']
+
+        print('Encrypting track IDs ' + str(sorted(media_source.key_infos.keys()) ) +' in ' + GetMappedFileName(media_file))
+        encrypted_file = tempfile.NamedTemporaryFile(dir=options.output_dir, delete=False)
+        encrypted_files[media_file] = encrypted_file
+        TempFiles.append(encrypted_file.name)
+        encrypted_file.close() # necessary on Windows
+        MapFileName(encrypted_file.name, path.basename(encrypted_file.name) + ' = Encrypted[' + GetMappedFileName(media_file) + ']')
+        args = ['--method', MpegCencSchemeMap[options.encryption_cenc_scheme]]
+
+        if options.encryption_args:
+            args += options.encryption_args.split()
         else:
-            if ':' not in key_spec:
-                raise Exception('Invalid argument syntax for --encryption-key option')
-            parts = key_spec.split(':', 2)
-            kid_hex = parts[0]
-            key_hex = parts[1]
-            if len(parts) > 2:
-                iv_hex = parts[2]
-            if len(kid_hex) != 32:
-                raise Exception('Invalid argument format for --encryption-key option')
+            if options.smooth or options.playready:
+                args += ['--global-option', 'mpeg-cenc.piff-compatible:true']
 
-            if key_hex.startswith('#'):
-                if len(key_hex) != 41:
-                    raise Exception('Invalid argument format for --encryption-key option')
-                key_seed_bin = key_hex[1:].decode('base64')
-                kid_bin = kid_hex.decode('hex')
-                key_hex = DerivePlayReadyKey(key_seed_bin, kid_bin).encode('hex')
-                if options.verbose:
-                    print 'PlayReady Derived Key =', key_hex
-            else:
-                if len(key_hex) != 32:
-                    raise Exception('Invalid argument format for --encryption-key option')
+        key_set = {}
+        for track_id in sorted(media_source.key_infos.keys()):
+            key_info = media_source.key_infos[track_id]
+            key_set[key_info['kid']] = key_info['key']
+            args += ['--key', str(track_id)+':'+key_info['key']+':'+key_info['iv'], '--property', str(track_id)+':KID:'+key_info['kid']]
+
+        # EME Common Encryption / Clearkey
+        if options.eme_signaling == 'pssh-v0':
+            args += ['--pssh', EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID+':']
+        elif options.eme_signaling == 'pssh-v1':
+            args += ['--pssh-v1', EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID+':']
+
+        # Marlin
+        if options.marlin_add_pssh:
+            marlin_pssh = ComputeMarlinPssh(options)
+            pssh_file = tempfile.NamedTemporaryFile(dir=options.output_dir, delete=False)
+            pssh_file.write(marlin_pssh)
+            TempFiles.append(pssh_file.name)
+            pssh_file.close() # necessary on Windows
+            args += ['--pssh', MARLIN_PSSH_SYSTEM_ID+':'+pssh_file.name]
+
+        # PlayReady
+        if options.playready_add_pssh:
+            playready_header = ComputePlayReadyHeader(options.playready_version,
+                                                      options.playready_header,
+                                                      options.encryption_cenc_scheme,
+                                                      list(key_set.items()))
+            pssh_file = tempfile.NamedTemporaryFile(dir=options.output_dir, delete=False)
+            pssh_file.write(playready_header)
+            TempFiles.append(pssh_file.name)
+            pssh_file.close() # necessary on Windows
+            args += ['--pssh', PLAYREADY_PSSH_SYSTEM_ID+':'+pssh_file.name]
 
-        key_info['key'] = key_hex
-        key_info['kid'] = kid_hex
-        key_info['iv']  = iv_hex or 'random'
-        if options.hls and not iv_hex:
-            # for HLS, we need to know the IV
-            import random
-            sys_random = random.SystemRandom()
-            random_iv = sys_random.getrandbits(128)
-            key_info['iv'] = '%016x' % random_iv
+        # Widevine
+        if options.widevine_header:
+            widevine_header = ComputeWidevineHeader(options.widevine_header, options.encryption_cenc_scheme, default_kid)
+            pssh_file = tempfile.NamedTemporaryFile(dir=options.output_dir, delete=False)
+            pssh_file.write(widevine_header)
+            TempFiles.append(pssh_file.name)
+            pssh_file.close() # necessary on Windows
+            args += ['--pssh', WIDEVINE_PSSH_SYSTEM_ID+':'+pssh_file.name]
+
+        # Primetime
+        if options.primetime_metadata:
+            primetime_metadata = ComputePrimetimeMetaData(options.primetime_metadata, default_kid)
+            pssh_file = tempfile.NamedTemporaryFile(dir=options.output_dir, delete=False)
+            pssh_file.write(primetime_metadata)
+            TempFiles.append(pssh_file.name)
+            pssh_file.close() # necessary on Windows
+            args += ['--pssh', PRIMETIME_PSSH_SYSTEM_ID+':'+pssh_file.name]
 
-        options.key_infos.append(key_info)
+        Mp4Encrypt(options, media_file, encrypted_file.name, *args)
+        media_source.filename = encrypted_file.name
 
 #############################################
 FileNameMap = {}
@@ -1293,6 +1542,8 @@
         default_exec_dir = path.join(SCRIPT_PATH, 'bin')
     if not path.exists(default_exec_dir):
         default_exec_dir = path.join(SCRIPT_PATH, '..', 'bin')
+    if not path.exists(default_exec_dir):
+        default_exec_dir = '-'
 
     # parse options
     parser = OptionParser(usage="%prog [options] <media-file> [<media-file> ...]",
@@ -1372,12 +1623,16 @@
                       help="Pass additional command line arguments to mp4encrypt (separated by spaces)")
     parser.add_option('', "--eme-signaling", dest="eme_signaling", metavar='<eme-signaling-type>', choices=['pssh-v0', 'pssh-v1'],
                       help="Add EME-compliant signaling in the MPD and PSSH boxes (valid options are 'pssh-v0' and 'pssh-v1')")
+    parser.add_option('', "--merge-keys", dest="merge_keys", action="store_true", default=False,
+                      help="Merge all keys in a single set used for all <ContentProtection> elements")
     parser.add_option('', "--marlin", dest="marlin", action="store_true", default=False,
                       help="Add Marlin signaling to the MPD (requires an encrypted input, or the --encryption-key option)")
     parser.add_option('', "--marlin-add-pssh", dest="marlin_add_pssh", action="store_true", default=False,
                       help="Add an (optional) Marlin 'pssh' box in the init segment(s)")
     parser.add_option('', "--playready", dest="playready", action="store_true", default=False,
                       help="Add PlayReady signaling to the MPD (requires an encrypted input, or the --encryption-key option)")
+    parser.add_option('', "--playready-version", dest="playready_version", choices=("4.0", "4.1", "4.2", "4.3"), default="4.0",
+                      help="PlayReady version to use (4.0, 4.1, 4.2, 4.3), defaults to 4.0")
     parser.add_option('', "--playready-header", dest="playready_header", metavar='<playready-header>', default=None,
                       help="Add a PlayReady PRO element in the MPD and a PlayReady PSSH box in the init segments. The use of this option implies the --playready option. " +
                            "The <playready-header> argument can be either: " +
@@ -1404,10 +1659,14 @@
                            "(2) the character '#' followed by the Primetime Metadata encoded in Base64")
     parser.add_option('', "--fairplay-key-uri", dest="fairplay_key_uri",
                       help="Specify the key URI to use for FairPlay Streaming key delivery (only valid with --hls option)")
+    parser.add_option('', "--clearkey", dest="clearkey", action="store_true",
+                      help="Add Clear Key signaling to the MPD (requires an encrypted input, or the --encryption-key option))")
+    parser.add_option('', "--clearkey-license-uri", dest="clearkey_license_uri",
+                      help="Specify the license/key URI to use for Clear Key (only valid with --clearkey option)")
     parser.add_option('', "--exec-dir", metavar="<exec_dir>", dest="exec_dir", default=default_exec_dir,
-                      help="Directory where the Bento4 executables are located")
+                      help="Directory where the Bento4 executables are located (use '-' to look for executable in the current PATH)")
     (options, args) = parser.parse_args()
-    if len(args) == 0:
+    if not args:
         parser.print_help()
         sys.exit(1)
     global Options
@@ -1415,6 +1674,7 @@
 
     # set some synthetic (not from command line) options
     options.on_demand = False
+    options.key_infos = []
 
     # check the consistency of the options
     if options.smooth:
@@ -1429,8 +1689,9 @@
         if options.use_segment_list:
             raise Exception('ERROR: --hippo and --use-segment-list are mutually exclusive')
 
-    if not path.exists(options.exec_dir):
-        PrintErrorAndExit('Executable directory does not exist ('+Options.exec_dir+'), use --exec-dir')
+    if options.exec_dir != "-":
+        if not path.exists(options.exec_dir):
+            PrintErrorAndExit('Executable directory does not exist ('+Options.exec_dir+'), use --exec-dir')
 
     if options.max_playout_rate_strategy:
         if not options.max_playout_rate_strategy.startswith('lowest:'):
@@ -1479,12 +1740,13 @@
     if options.smooth:
         if ISOFF_LIVE_PROFILE not in options.profiles:
             raise Exception('--smooth requires the live profile')
+
     if options.hippo:
         if ISOFF_LIVE_PROFILE not in options.profiles:
             raise Exception('--hippo requires the live profile')
 
     if options.verbose:
-        print 'Profiles:', ','.join(options.profiles)
+        print('Profiles:', ','.join(options.profiles))
 
     if options.playready_header or options.playready_add_pssh:
         options.playready = True
@@ -1497,8 +1759,6 @@
 
     if options.widevine_header:
         options.widevine = True
-        if options.hls and options.widevine_header.startswith('#'):
-            raise Exception('with --hls, only the <name>:<value> pair syntax is supported for the --widevine-header option')
 
     if options.primetime_metadata:
         options.primetime = True
@@ -1507,21 +1767,14 @@
         if not options.hls:
             sys.stderr.write('WARNING: --fairplay-key-uri is only valid with --hls, ignoring\n')
 
+    if options.clearkey_license_uri:
+        if not options.clearkey:
+            sys.stderr.write('WARNING: --clearkey-license-uri is only valid with --clearkey, ignoring\n')
+
     if options.hls:
         if options.encryption_key and options.encryption_cenc_scheme != 'cbcs':
             raise Exception('--hls requires --encryption-cenc-scheme=cbcs')
 
-    # compute the KID(s) and encryption key(s) if needed
-    if options.encryption_key:
-        ResolveEncryptionKeys(options)
-        if options.verbose:
-            for key_info in options.key_infos:
-                if key_info['key']:
-                    message = 'KID='+key_info['kid']+', KEY='+key_info['key']+', IV='+key_info['iv']
-                else:
-                    message = '[NOT ENCRYPTED]'
-                print 'Key Info for '+'/'.join(key_info['filter'])+': '+message
-
     # process language map options
     if options.language_map:
         mappings = options.language_map.split(',')
@@ -1542,22 +1795,22 @@
         except:
             raise Exception('Invalid syntax for --attributes option')
 
-    # parse media sources syntax
-    media_sources = [MediaSource(source) for source in args]
-
     # create the output directory
     severity = 'ERROR'
     if options.no_media: severity = 'WARNING'
     if options.force_output: severity = None
     MakeNewDir(dir=options.output_dir, exit_if_exists = not (options.no_media or options.force_output), severity=severity)
 
+    # parse media sources syntax
+    media_sources = [MediaSource(options, source) for source in args]
+
     # for on-demand, we need to first extract tracks into individual media files
     if options.on_demand:
         (audio_sets, video_sets, subtitles_sets, mp4_files) = SelectTracks(options, media_sources)
-        media_sources = filter(lambda x: x.format == "webvtt", media_sources) #Keep subtitles
-        for track in sum(audio_sets.values()+video_sets.values(), []):
-            print 'Extracting track', track.id, 'from', GetMappedFileName(track.parent.media_source.filename)
-            track_file = tempfile.NamedTemporaryFile(dir = options.output_dir, delete=False)
+        media_sources = [x for x in media_sources if x.format == "webvtt"] # Keep subtitles
+        for track in sum(list(audio_sets.values()) + list(video_sets.values()), []):
+            print('Extracting track', track.id, 'from', GetMappedFileName(track.parent.media_source.filename))
+            track_file = tempfile.NamedTemporaryFile(dir=options.output_dir, delete=False)
             TempFiles.append(track_file.name)
             track_file.close() # necessary on Windows
             MapFileName(track_file.name, path.basename(track_file.name) + ' = Extracted[track '+str(track.id) + ' from '+GetMappedFileName(track.parent.media_source.filename)+']')
@@ -1570,138 +1823,53 @@
                         copy_udta = True,
                         quiet = True)
 
-            media_source = MediaSource(track_file.name)
+            media_source = MediaSource(options, track_file.name)
             media_source.spec = track.parent.media_source.spec
             media_sources.append(media_source)
 
-    # encrypt the input files if needed
+    # compute the KID(s) and encryption key(s)
     if options.encryption_key:
-        encrypted_files = {}
-        for media_source in media_sources:
-            if media_source.format != 'mp4': continue
-
-            media_file = media_source.filename
-
-            # check if we have already encrypted this file
-            if media_file in encrypted_files:
-                media_source.filename = encrypted_files[media_file].name
-                continue
-
-            # get the mp4 file info
-            json_info = Mp4Info(Options, media_file, format='json', fast=True)
-            info = json.loads(json_info, strict=False)
-
-            if not info['movie']['fragments']:
-                PrintErrorAndExit('ERROR: file '+media_file+' is not fragmented (use mp4fragment to fragment it)')
-
-            if 'tracks' not in info:
-                raise Exception('No track found in input file(s)')
-
-            # select which KID/KEY to use for each track
-            default_kid = options.key_infos[0]['kid']
-            default_key = options.key_infos[0]['key']
-            media_source.track_key_infos = {}
-            for track in info['tracks']:
-                for key_info in options.key_infos:
-                    if track['type'].lower() in key_info['filter']:
-                        media_source.track_key_infos[track['id']] = key_info
-
-            # skip now if we're only outputing the MPD
-            if options.no_media:
-                continue
-
-            # don't process any further if we won't have key material for this media source
-            if len(media_source.track_key_infos) == 0:
-                continue
-
-            print 'Encrypting track IDs '+str(sorted(media_source.track_key_infos.keys()))+' in '+ GetMappedFileName(media_file)
-            encrypted_file = tempfile.NamedTemporaryFile(dir = options.output_dir, delete=False)
-            encrypted_files[media_file] = encrypted_file
-            TempFiles.append(encrypted_file.name)
-            encrypted_file.close() # necessary on Windows
-            MapFileName(encrypted_file.name, path.basename(encrypted_file.name) + ' = Encrypted[' + GetMappedFileName(media_file) + ']')
-            args = ['--method', MpegCencSchemeMap[options.encryption_cenc_scheme]]
-
-            if options.encryption_args:
-                args += options.encryption_args.split()
-            else:
-                if options.smooth or options.playready:
-                    args += ['--global-option', 'mpeg-cenc.piff-compatible:true']
-
-            for track_id in sorted(media_source.track_key_infos.keys()):
-                key_info = media_source.track_key_infos[track_id]
-                args += ['--key', str(track_id)+':'+key_info['key']+':'+key_info['iv'], '--property', str(track_id)+':KID:'+key_info['kid']]
-
-            # EME Common Encryption / Clearkey
-            if options.eme_signaling == 'pssh-v0':
-                args += ['--pssh', EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID+':']
-            elif options.eme_signaling == 'pssh-v1':
-                args += ['--pssh-v1', EME_COMMON_ENCRYPTION_PSSH_SYSTEM_ID+':']
-
-            # Marlin
-            if options.marlin_add_pssh:
-                marlin_pssh = ComputeMarlinPssh(options)
-                pssh_file = tempfile.NamedTemporaryFile(dir = options.output_dir, delete=False)
-                pssh_file.write(marlin_pssh)
-                TempFiles.append(pssh_file.name)
-                pssh_file.close() # necessary on Windows
-                args += ['--pssh', MARLIN_PSSH_SYSTEM_ID+':'+pssh_file.name]
-
-            # PlayReady
-            if options.playready_add_pssh:
-                playready_header = ComputePlayReadyHeader(options.playready_header, default_kid, default_key)
-                pssh_file = tempfile.NamedTemporaryFile(dir = options.output_dir, delete=False)
-                pssh_file.write(playready_header)
-                TempFiles.append(pssh_file.name)
-                pssh_file.close() # necessary on Windows
-                args += ['--pssh', PLAYREADY_PSSH_SYSTEM_ID+':'+pssh_file.name]
-
-            # Widevine
-            if options.widevine_header:
-                widevine_header = ComputeWidevineHeader(options.widevine_header, default_kid)
-                pssh_file = tempfile.NamedTemporaryFile(dir = options.output_dir, delete=False)
-                pssh_file.write(widevine_header)
-                TempFiles.append(pssh_file.name)
-                pssh_file.close() # necessary on Windows
-                args += ['--pssh', WIDEVINE_PSSH_SYSTEM_ID+':'+pssh_file.name]
-
-            # Primetime
-            if options.primetime_metadata:
-                primetime_metadata = ComputePrimetimeMetaData(options.primetime_metadata, default_kid)
-                pssh_file = tempfile.NamedTemporaryFile(dir = options.output_dir, delete=False)
-                pssh_file.write(primetime_metadata)
-                TempFiles.append(pssh_file.name)
-                pssh_file.close() # necessary on Windows
-                args += ['--pssh', PRIMETIME_PSSH_SYSTEM_ID+':'+pssh_file.name]
+        ResolveEncryptionKeys(options)
+    PrepareSources(options, media_sources)
 
-            Mp4Encrypt(options, media_file, encrypted_file.name, *args)
-            media_source.filename = encrypted_file.name
+    # encrypt the input files if needed
+    EncryptSources(options, media_sources)
 
     # parse the media sources and select the audio and video tracks
     (audio_sets, video_sets, subtitles_sets, mp4_files) = SelectTracks(options, media_sources)
     subtitles_files = SelectSubtitlesFiles(options, media_sources)
 
     # store lists of all tracks by type
-    audio_tracks     = sum(audio_sets.values(),     [])
-    video_tracks     = sum(video_sets.values(),     [])
-    subtitles_tracks = sum(subtitles_sets.values(), [])
+    audio_tracks     = sum(list(audio_sets.values()),     [])
+    video_tracks     = sum(list(video_sets.values()),     [])
+    subtitles_tracks = sum(list(subtitles_sets.values()), [])
 
     # check that we have at least one audio and one video
-    if len(audio_tracks) == 0 and len(video_tracks) == 0 and len(subtitles_tracks) == 0:
+    if not audio_tracks and not video_tracks and not subtitles_tracks:
         PrintErrorAndExit('ERROR: no track selected')
 
-    if Options.verbose:
-        print 'Audio:',     audio_sets
-        print 'Video:',     video_sets
-        print 'Subtitles:', subtitles_sets
-
     # assign key info to tracks
-    if options.encryption_key:
-        for track in audio_tracks+video_tracks+subtitles_tracks:
-            track.key_info = track.parent.media_source.track_key_infos.get(track.id)
+    for track in audio_tracks + video_tracks + subtitles_tracks:
+        track.key_info = track.parent.media_source.key_infos.get(track.id, track.key_info)
+
+    if Options.verbose:
+        print('Audio:',     audio_sets)
+        print('Video:',     video_sets)
+        print('Subtitles:', subtitles_sets)
+
+        for track in audio_tracks + video_tracks + subtitles_tracks:
+            message = 'Key info for ' + str(track) + ': '
+            if track.key_info.get('key'):
+                message += '[KID={}, KEY={}]'.format(track.key_info['kid'], track.key_info['key'])
+            else:
+                if track.key_info.get('kid'):
+                    message += '[PRE-ENCRYPTED KID={}]'.format(track.key_info['kid'])
+                else:
+                    message += '[NOT ENCRYPTED]'
+            print(message)
 
     # check that segments are consistent between tracks of the same adaptation set
-    for tracks in video_sets.values():
+    for tracks in list(video_sets.values()):
         prev_track = None
         for track in tracks:
             if prev_track:
@@ -1713,7 +1881,7 @@
             prev_track = track
 
     # check that the video segments match for all video tracks in the same adaptation set
-    for tracks in video_sets.values():
+    for tracks in list(video_sets.values()):
         if len(tracks) > 1:
             anchor = tracks[0]
             for track in tracks[1:]:
@@ -1736,18 +1904,18 @@
                     break
 
     # round the audio segment durations to be equal to the video segment durations
-    if len(video_tracks):
+    if video_tracks:
         for audio_track in audio_tracks:
             ratio = audio_track.average_segment_duration/video_tracks[0].average_segment_duration
             if abs(ratio-1.0) < 0.05:
                 # within 5%, make it equal
                 if options.verbose:
-                    print 'INFO: adjusting segment duration for audio track '+str(audio_track)+' to '+str(video_tracks[0].average_segment_duration)+' to match the video'
+                    print('INFO: adjusting segment duration for audio track '+str(audio_track)+' to '+str(video_tracks[0].average_segment_duration)+' to match the video')
                 audio_track.average_segment_duration = video_tracks[0].average_segment_duration
 
     # compute the representation id and init segment name for each track
     for adaptation_sets in [audio_sets, video_sets, subtitles_sets]:
-        for adaptation_set_name, tracks in adaptation_sets.items():
+        for adaptation_set_name, tracks in list(adaptation_sets.items()):
             for track in tracks:
                 if options.split:
                     track.representation_id = '/'.join(adaptation_set_name)
@@ -1778,7 +1946,7 @@
 
     # compute some values if not set
     if options.min_buffer_time == 0.0:
-        if len(video_tracks):
+        if video_tracks:
             options.min_buffer_time = video_tracks[0].average_segment_duration
         else:
             options.min_buffer_time = audio_tracks[0].average_segment_duration
@@ -1786,7 +1954,14 @@
     # print info about the tracks
     if options.verbose:
         for track in audio_tracks+video_tracks+subtitles_tracks:
-            print ('%s track: ' + str(track) + ' - language=%s, max bitrate=%d, avg bitrate=%d, req bandwidth=%d, codec=%s') % (track.type, track.language, track.max_segment_bitrate, track.average_segment_bitrate, track.bandwidth, track.codec)
+            print(('{} track: {} - language={}, max bitrate={:.0f}, avg bitrate={:.0f}, req bandwidth={:.0f}, codec={}').format(
+                  track.type,
+                  str(track),
+                  track.language,
+                  track.max_segment_bitrate,
+                  track.average_segment_bitrate,
+                  track.bandwidth,
+                  track.codec))
 
     # deal with the max playout strategy if set
     if options.max_playout_rate_strategy:
@@ -1804,7 +1979,7 @@
     if not options.no_media:
         if options.split:
             for adaptation_sets in [audio_sets, video_sets, subtitles_sets]:
-                for adaptation_set_name, tracks in adaptation_sets.items():
+                for adaptation_set_name, tracks in list(adaptation_sets.items()):
                     base_dir = options.output_dir
                     for subdir in adaptation_set_name:
                         base_dir = path.join(base_dir, subdir)
@@ -1814,7 +1989,7 @@
                         if len(tracks) > 1:
                             out_dir = path.join(out_dir, str(track.order_index))
                             MakeNewDir(out_dir)
-                        print 'Splitting media file ('+adaptation_set_name[0]+')', GetMappedFileName(track.parent.media_source.filename)
+                        print('Splitting media file ('+adaptation_set_name[0]+')', GetMappedFileName(track.parent.media_source.filename))
                         Mp4Split(options,
                                  track.parent.media_source.filename,
                                  track_id               = str(track.id),
@@ -1823,37 +1998,9 @@
                                  init_segment           = path.join(out_dir, track.init_segment_name),
                                  media_segment          = path.join(out_dir, SEGMENT_PATTERN))
 
-            # if len(video_tracks):
-            #     MakeNewDir(path.join(options.output_dir, 'video'))
-            # for video_track in video_tracks:
-            #     out_dir = path.join(options.output_dir, 'video', str(video_track.order_index))
-            #     MakeNewDir(out_dir)
-            #     print 'Splitting media file (video)', GetMappedFileName(video_track.parent.media_source.filename)
-            #     Mp4Split(Options,
-            #              video_track.parent.media_source.filename,
-            #              track_id               = str(video_track.id),
-            #              pattern_parameters     = 'N',
-            #              start_number           = '1',
-            #              init_segment           = path.join(out_dir, video_track.init_segment_name),
-            #              media_segment          = path.join(out_dir, SEGMENT_PATTERN))
-            #
-            # for adaptation_set_name, tracks in subtitles_sets.items():
-            #     out_dir = options.output_dir
-            #     for subdir in adaptation_set_name:
-            #         out_dir = path.join(out_dir, subdir)
-            #         MakeNewDir(out_dir)
-            #     for subtitles_track in tracks:
-            #         print 'Splitting media file (subtitles)', GetMappedFileName(subtitles_track.parent.media_source.filename)
-            #         Mp4Split(Options,
-            #                  subtitles_track.parent.media_source.filename,
-            #                  track_id               = str(subtitles_track.id),
-            #                  pattern_parameters     = 'N',
-            #                  start_number           = '1',
-            #                  init_segment           = path.join(out_dir, subtitles_track.init_segment_name),
-            #                  media_segment          = path.join(out_dir, SEGMENT_PATTERN))
         else:
-            for mp4_file in mp4_files.values():
-                print 'Processing and Copying media file', GetMappedFileName(mp4_file.media_source.filename)
+            for mp4_file in list(mp4_files.values()):
+                print('Processing and Copying media file', GetMappedFileName(mp4_file.media_source.filename))
                 media_filename = path.join(options.output_dir, mp4_file.media_name)
                 if not options.force_output and path.exists(media_filename):
                     PrintErrorAndExit('ERROR: file ' + media_filename + ' already exists')
@@ -1867,10 +2014,10 @@
                              init_only    = True,
                              init_segment = path.join(options.output_dir, track.init_segment_name))
 
-        if len(subtitles_files):
+        if subtitles_files:
             MakeNewDir(path.join(options.output_dir, 'subtitles'))
             for subtitles_file in subtitles_files:
-                print 'Processing and Copying subtitles file', GetMappedFileName(subtitles_file.media_source.filename)
+                print('Processing and Copying subtitles file', GetMappedFileName(subtitles_file.media_source.filename))
                 out_dir = path.join(options.output_dir, 'subtitles', subtitles_file.language)
                 MakeNewDir(out_dir)
                 media_filename = path.join(out_dir, subtitles_file.media_name)
@@ -1892,19 +2039,19 @@
         OutputHippo(options, audio_tracks, video_tracks)
 
 ###########################
-if sys.version_info[0] != 2:
-    sys.stderr.write("ERROR: This tool must be run with Python 2.x\n")
+if sys.version_info[0] != 3 or sys.version_info[1] < 5:
+    sys.stderr.write("ERROR: This tool must be run with Python 3.5 or above\n")
     sys.stderr.write("You are running Python version: "+sys.version+"\n")
     exit(1)
 
 if __name__ == '__main__':
     try:
         main()
-    except Exception, err:
+    except Exception as err:
         if Options and Options.debug:
             raise
         else:
-            PrintErrorAndExit('ERROR: %s\n' % str(err))
+            PrintErrorAndExit('ERROR: {}\n'.format(str(err)))
     finally:
         for f in TempFiles:
             os.unlink(f)

bento4-1.5.1r629.tar.gz/Source/Python/utils/mp4-hls.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/mp4-hls.py Changed

@@ -1,7 +1,7 @@
-#!/usr/bin/env python
+#! /usr/bin/env python3
 
 __author__    = 'Gilles Boccon-Gibod (bok@bok.net)'
-__copyright__ = 'Copyright 2011-2015 Axiomatic Systems, LLC.'
+__copyright__ = 'Copyright 2011-2020 Axiomatic Systems, LLC.'
 
 ###
 # NOTE: this script needs Bento4 command line binaries to run
@@ -17,26 +17,35 @@
 import shutil
 import platform
 import sys
-from mp4utils import *
-from subtitles import *
+import os.path as path
+import json
+from subtitles import SubtitlesFile
+from mp4utils import Base64Encode,\
+                     Mp4File,\
+                     Mp42Hls,\
+                     MediaSource,\
+                     LanguageNames,\
+                     LanguageCodeMap,\
+                     PrintErrorAndExit,\
+                     MakeNewDir
 
 # setup main options
-VERSION = "1.1.0"
-SDK_REVISION = '629'
+VERSION = "1.2.0"
+SDK_REVISION = '634'
 SCRIPT_PATH = path.abspath(path.dirname(__file__))
 sys.path += [SCRIPT_PATH]
 
 #############################################
 def CreateSubtitlesPlaylist(playlist_filename, webvtt_filename, duration):
-    playlist = open(playlist_filename, 'wb+')
-    playlist.write('#EXTM3U\r\n')
-    playlist.write('#EXT-X-TARGETDURATION:%d\r\n' % (duration))
-    playlist.write('#EXT-X-VERSION:3\r\n')
-    playlist.write('#EXT-X-MEDIA-SEQUENCE:0\r\n')
-    playlist.write('#EXT-X-PLAYLIST-TYPE:VOD\r\n')
-    playlist.write('#EXTINF:%d,\r\n' % (duration))
-    playlist.write(webvtt_filename+'\r\n')
-    playlist.write('#EXT-X-ENDLIST\r\n')
+    playlist = open(playlist_filename, 'w', newline='\r\n')
+    playlist.write('#EXTM3U\n')
+    playlist.write('#EXT-X-TARGETDURATION:%d\n' % (duration))
+    playlist.write('#EXT-X-VERSION:3\n')
+    playlist.write('#EXT-X-MEDIA-SEQUENCE:0\n')
+    playlist.write('#EXT-X-PLAYLIST-TYPE:VOD\n')
+    playlist.write('#EXTINF:%d,\n' % (duration))
+    playlist.write(webvtt_filename+'\n')
+    playlist.write('#EXT-X-ENDLIST\n')
 
 
 #############################################
@@ -64,8 +73,13 @@
 
 #############################################
 def ComputeWidevineKeyLine(params):
-    json_param = '{ "provider": "%(provider)s", "content_id": "%(content_id)s", "key_ids": ["%(kid)s"] }' % params
-    key_line   = 'URI="data:text/plain;base64,'+json_param.encode('base64').replace('\n','')+'",KEYFORMAT="com.widevine",KEYFORMATVERSIONS="1"'
+    if type(params) == str:
+        # already in base64 form
+        base64_header = params
+    else:
+        # base64-encode a JSON object for the parameters
+        base64_header = Base64Encode(('{ "provider": "%(provider)s", "content_id": "%(content_id)s", "key_ids": ["%(kid)s"] }' % params).encode('ascii'))
+    key_line   = 'URI="data:text/plain;base64,' + base64_header + '",KEYFORMAT="com.widevine",KEYFORMATVERSIONS="1"'
 
     return key_line
 
@@ -89,11 +103,11 @@
             continue
 
         # parse the file
-        if not os.path.exists(media_file):
+        if not path.exists(media_file):
             PrintErrorAndExit('ERROR: media file ' + media_file + ' does not exist')
 
         # get the file info
-        print 'Parsing media file', media_file
+        print('Parsing media file', media_file)
         mp4_file = Mp4File(Options, media_source)
         media_source.mp4_file = mp4_file
 
@@ -126,7 +140,7 @@
                 PrintErrorAndExit('ERROR: no ' + track_type + ' found for media file '+media_source.name)
 
         if not tracks:
-            for track in media_source.mp4_file.tracks.values():
+            for track in list(media_source.mp4_file.tracks.values()):
                 language = LanguageCodeMap.get(track.language, track.language)
                 if track_language and track_language != language and track_language != track.language:
                     continue
@@ -157,7 +171,7 @@
             if remap_language:
                 track.language = remap_language
             language_name = LanguageNames.get(track.language, track.language)
-            track.language_name = media_source.spec.get('+language_name', language_name).decode('utf-8')
+            track.language_name = media_source.spec.get('+language_name', language_name)
 
         # process audio tracks
         for track in [t for t in media_source.tracks if t.type == 'audio']:
@@ -173,7 +187,7 @@
 #############################################
 def ProcessSource(options, media_info, out_dir):
     if options.verbose:
-        print 'Processing', media_info['source'].filename
+        print('Processing', media_info['source'].filename)
 
     file_extension = media_info.get('file_extension', 'ts')
 
@@ -232,14 +246,14 @@
     json_info = Mp42Hls(options,
                         media_info['source'].filename,
                         **kwargs)
+    if options.verbose:
+        print(json_info.decode('utf-8'))
 
     media_info['info'] = json.loads(json_info, strict=False)
-    if options.verbose:
-        print json_info
 
     # output the encryption key if needed
     if options.output_encryption_key:
-        open(path.join(out_dir, 'key.bin'), 'wb+').write(options.encryption_key.decode('hex')[:16])
+        open(path.join(out_dir, 'key.bin'), 'wb').write(bytes.fromhex(options.encryption_key)[:16])
 
 #############################################
 def OutputHls(options, media_sources):
@@ -270,7 +284,7 @@
         audio_tracks = {}
 
     # we only need alternate audio tracks if there are more than one or if the audio and video are not muxed
-    if video_has_muxed_audio and not audio_only and len(audio_tracks) == 1 and len(audio_tracks.values()[0]) == 1:
+    if video_has_muxed_audio and not audio_only and len(audio_tracks) == 1 and len(list(audio_tracks.values())[0]) == 1:
         audio_tracks = {}
 
     # process main media sources
@@ -338,13 +352,13 @@
             ProcessSource(options, audio_track.media_info, out_dir)
 
     # start the master playlist
-    master_playlist = open(path.join(options.output_dir, options.master_playlist_name), "wb+")
-    master_playlist.write("#EXTM3U\r\n")
-    master_playlist.write('# Created with Bento4 mp4-hls.py version '+VERSION+'r'+SDK_REVISION+'\r\n')
+    master_playlist = open(path.join(options.output_dir, options.master_playlist_name), 'w', newline='\r\n')
+    master_playlist.write('#EXTM3U\n')
+    master_playlist.write('# Created with Bento4 mp4-hls.py version '+VERSION+'r'+SDK_REVISION+'\n')
 
     if options.hls_version >= 4:
-        master_playlist.write('\r\n')
-        master_playlist.write('#EXT-X-VERSION:'+str(options.hls_version)+'\r\n')
+        master_playlist.write('\n')
+        master_playlist.write('#EXT-X-VERSION:'+str(options.hls_version)+'\n')
 
     # optional session key
     if options.signal_session_key:
@@ -353,13 +367,13 @@
             ext_x_session_key_line += ',KEYFORMAT="'+options.encryption_key_format+'"'
         if options.encryption_key_format_versions:
             ext_x_session_key_line += ',KEYFORMATVERSIONS="'+options.encryption_key_format_versions+'"'
-        master_playlist.write(ext_x_session_key_line+'\r\n')
+        master_playlist.write(ext_x_session_key_line+'\n')
 
     # process subtitles sources
     subtitles_files = [SubtitlesFile(options, media_source) for media_source in media_sources if media_source.format in ['ttml', 'webvtt']]
     if len(subtitles_files):
-        master_playlist.write('\r\n')
-        master_playlist.write('# Subtitles\r\n')
+        master_playlist.write('\n')
+        master_playlist.write('# Subtitles\n')
         MakeNewDir(path.join(options.output_dir, 'subtitles'))
         for subtitles_file in subtitles_files:
             out_dir = path.join(options.output_dir, 'subtitles', subtitles_file.language)
@@ -370,13 +384,13 @@
             playlist_filename = path.join(out_dir, 'subtitles.m3u8')
             CreateSubtitlesPlaylist(playlist_filename, subtitles_file.media_name, total_duration)
 
-            master_playlist.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitles",NAME="%s",LANGUAGE="%s",URI="%s"\r\n' % (subtitles_file.language_name, subtitles_file.language, relative_url))
+            master_playlist.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitles",NAME="%s",LANGUAGE="%s",URI="%s"\n' % (subtitles_file.language_name, subtitles_file.language, relative_url))
 
     # process audio sources
     audio_groups = []
     if len(audio_tracks):
-        master_playlist.write('\r\n')
-        master_playlist.write('# Audio\r\n')
+        master_playlist.write('\n')
+        master_playlist.write('# Audio\n')
         for group_id in audio_tracks:
             group = audio_tracks[group_id]
             group_name = 'audio_'+group_id
@@ -395,12 +409,12 @@
                 if default:
                     extra_info += 'DEFAULT=YES,'
                     default = False
-                master_playlist.write(('#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="%s",NAME="%s",LANGUAGE="%s",%sURI="%s"\r\n' % (
+                master_playlist.write(('#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="%s",NAME="%s",LANGUAGE="%s",%sURI="%s"\n' % (
                                       group_name,
                                       audio_track.media_info['language_name'],
                                       audio_track.media_info['language'],
                                       extra_info,
-                                      options.base_url+audio_track.media_info['dir']+'/'+options.media_playlist_name)).encode('utf-8'))
+                                      options.base_url+audio_track.media_info['dir']+'/'+options.media_playlist_name)))
             audio_groups.append({
                 'name':                group_name,
                 'codec':               group_codec,
@@ -409,8 +423,8 @@
             })
 
         if options.debug:
-            print 'Audio Groups:'
-            print audio_groups
+            print('Audio Groups:')
+            print(audio_groups)
 
     else:
         audio_groups = [{
@@ -421,8 +435,8 @@
         }]
 
     # media playlists
-    master_playlist.write('\r\n')
-    master_playlist.write('# Media Playlists\r\n')
+    master_playlist.write('\n')
+    master_playlist.write('# Media Playlists\n')
     for media in main_media:
         media_info = media['info']
 
@@ -444,23 +458,23 @@
                                 int(media_info['stats']['max_segment_bitrate'])+group_info['max_segment_bitrate'],
                                 ','.join(codecs))
             if 'video' in media_info:
-                ext_x_stream_inf += ',FRAME-RATE='+str(media_info['stats']['frame_rate'])+',RESOLUTION='+str(int(media_info['video']['width']))+'x'+str(int(media_info['video']['height']))
+                ext_x_stream_inf += ',RESOLUTION='+str(int(media_info['video']['width']))+'x'+str(int(media_info['video']['height']))
 
             # audio info
             if group_name:
                 ext_x_stream_inf += ',AUDIO="'+group_name+'"'
 
             # subtitles info
-            if len(subtitles_files):
+            if subtitles_files:
                 ext_x_stream_inf += ',SUBTITLES="subtitles"'
 
-            master_playlist.write(ext_x_stream_inf+'\r\n')
-            master_playlist.write(options.base_url+media['dir']+'/'+options.media_playlist_name+'\r\n')
+            master_playlist.write(ext_x_stream_inf+'\n')
+            master_playlist.write(options.base_url+media['dir']+'/'+options.media_playlist_name+'\n')
 
     # write the I-FRAME playlist info
     if not audio_only and options.hls_version >= 4:
-        master_playlist.write('\r\n')
-        master_playlist.write('# I-Frame Playlists\r\n')
+        master_playlist.write('\n')
+        master_playlist.write('# I-Frame Playlists\n')
         for media in main_media:
             media_info = media['info']
             if not 'video' in media_info: continue
@@ -471,7 +485,7 @@
                                         int(media_info['video']['width']),
                                         int(media_info['video']['height']),
                                         options.base_url+media['dir']+'/'+options.iframe_playlist_name)
-            master_playlist.write(ext_x_i_frame_stream_inf+'\r\n')
+            master_playlist.write(ext_x_i_frame_stream_inf+'\n')
 
 #############################################
 Options = None
@@ -492,6 +506,8 @@
         default_exec_dir = path.join(SCRIPT_PATH, 'bin')
     if not path.exists(default_exec_dir):
         default_exec_dir = path.join(SCRIPT_PATH, '..', 'bin')
+    if not path.exists(default_exec_dir):
+        default_exec_dir = '-'
 
     # parse options
     parser = OptionParser(usage="%prog [options] <media-file> [<media-file> ...]",
@@ -532,8 +548,16 @@
                       help="Encryption key format versions.")
     parser.add_option('', '--signal-session-key', dest='signal_session_key', action='store_true', default=False,
                       help="Signal an #EXT-X-SESSION-KEY tag in the master playlist")
-    parser.add_option('', '--fairplay', dest="fairplay", metavar="<fairplay-parameters>", help="Enable Fairplay Key Delivery. The <fairplay-parameters> argument is one or more <name>:<value> pair(s) (separated by '#' if more than one). Names include 'uri' [string] (required)")
-    parser.add_option('', '--widevine', dest="widevine", metavar="<widevine-parameters>", help="Enable Widevine Key Delivery. The <widevine-parameters> argument is one or more <name>:<value> pair(s) (separated by '#' if more than one). Names include 'provider' [string] (required), 'content_id' [byte array in hex] (optional), 'kid' [16-byte array in hex] (required)")
+    parser.add_option('', '--fairplay', dest="fairplay", metavar="<fairplay-parameters>",
+                      help="Enable Fairplay Key Delivery. " +
+                           "The <fairplay-parameters> argument is one or more <name>:<value> pair(s) (separated by '#' if more than one). " +
+                           "Names include 'uri' [string] (required)")
+    parser.add_option('', '--widevine', dest="widevine", metavar="<widevine-parameters>",
+                      help="Enable Widevine Key Delivery. " +
+                           "The <widevine-header> argument can be either: " +
+                           "(1) the character '#' followed by a Widevine header encoded in Base64, or " +
+                           "(2) one or more <name>:<value> pair(s) (separated by '#' if more than one) specifying fields of a Widevine header " +
+                           "(field names include 'provider' [string] (required), 'content_id' [byte array in hex] (optional), 'kid' [16-byte array in hex] (required))")
     parser.add_option('', '--output-encryption-key', dest="output_encryption_key", action="store_true", default=False,
                       help="Output the encryption key to a file (default: don't output the key). This option is only valid when the encryption key format is 'identity'")
     parser.add_option('', "--exec-dir", metavar="<exec_dir>", dest="exec_dir", default=default_exec_dir,
@@ -550,8 +574,10 @@
     # set some mandatory options that utils rely upon
     options.min_buffer_time = 0.0
 
-    if not path.exists(Options.exec_dir):
-        PrintErrorAndExit('Executable directory does not exist ('+Options.exec_dir+'), use --exec-dir')
+    if options.exec_dir != "-":
+        if not path.exists(Options.exec_dir):
+            print(Options.exec_dir)
+            PrintErrorAndExit('Executable directory does not exist ('+Options.exec_dir+'), use --exec-dir')
 
     # check options
     if options.output_encryption_key:
@@ -605,20 +631,24 @@
                 sys.exit(1)
         else:
             options.encryption_mode = 'SAMPLE-AES'
-        options.widevine = SplitArgs(options.widevine)
-        if 'kid' not in options.widevine:
-            sys.stderr.write('ERROR: --widevine option requires a "kid" parameter\n')
-            sys.exit(1)
-        if len(options.widevine['kid']) != 32:
-            sys.stderr.write('ERROR: --widevine option "kid" must be 32 hex characters\n')
-            sys.exit(1)
-        if 'provider' not in options.widevine:
-            sys.stderr.write('ERROR: --widevine option requires a "provider" parameter\n')
-            sys.exit(1)
-        if 'content_id' in options.widevine:
-            options.widevine['content_id'] = options.widevine['content_id'].decode('hex')
+
+        if options.widevine.startswith('#'):
+            options.widevine = options.widevine[1:]
         else:
-            options.widevine['content_id'] = '*'
+            options.widevine = SplitArgs(options.widevine)
+            if 'kid' not in options.widevine:
+                sys.stderr.write('ERROR: --widevine option requires a "kid" parameter\n')
+                sys.exit(1)
+            if len(options.widevine['kid']) != 32:
+                sys.stderr.write('ERROR: --widevine option "kid" must be 32 hex characters\n')
+                sys.exit(1)
+            if 'provider' not in options.widevine:
+                sys.stderr.write('ERROR: --widevine option requires a "provider" parameter\n')
+                sys.exit(1)
+            if 'content_id' in options.widevine:
+                options.widevine['content_id'] = bytes.fromhex(options.widevine['content_id'])
+            else:
+                options.widevine['content_id'] = '*'
 
     # defaults
     if options.encryption_key and not options.encryption_mode:
@@ -628,7 +658,7 @@
         options.hls_version = 5
 
     # parse media sources syntax
-    media_sources = [MediaSource(source) for source in args]
+    media_sources = [MediaSource(options, source) for source in args]
     for media_source in media_sources:
         media_source.has_audio  = False
         media_source.has_video  = False
@@ -642,15 +672,15 @@
     OutputHls(options, media_sources)
 
 ###########################
-if sys.version_info[0] != 2:
-    sys.stderr.write("ERROR: This tool must be run with Python 2.x\n")
+if sys.version_info[0] != 3:
+    sys.stderr.write("ERROR: This tool must be run with Python 3.x\n")
     sys.stderr.write("You are running Python version: "+sys.version+"\n")
     exit(1)
 
 if __name__ == '__main__':
     try:
         main()
-    except Exception, err:
+    except Exception as err:
         if Options and Options.debug:
             raise
         else:

bento4-1.5.1r629.tar.gz/Source/Python/utils/mp4utils.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/mp4utils.py Changed

@@ -1,8 +1,8 @@
-#!/usr/bin/env python
 import collections
+from functools import reduce
 
 __author__    = 'Gilles Boccon-Gibod (bok@bok.net)'
-__copyright__ = 'Copyright 2011-2015 Axiomatic Systems, LLC.'
+__copyright__ = 'Copyright 2011-2020 Axiomatic Systems, LLC.'
 
 import sys
 import os
@@ -15,6 +15,7 @@
 import hashlib
 import fractions
 import xml.sax.saxutils as saxutils
+import base64
 
 LanguageCodeMap = {
     'aar': 'aa', 'abk': 'ab', 'afr': 'af', 'aka': 'ak', 'alb': 'sq', 'amh': 'am', 'ara': 'ar', 'arg': 'an',
@@ -46,188 +47,188 @@
 }
 
 LanguageNames = {
-    "aa": 'Qafara',
-    "ab": '\xd0\x90\xd2\xa7\xd1\x81\xd1\x83\xd0\xb0',
-    "ae": 'Avesta',
-    "af": 'Afrikaans',
-    "ak": 'Akana',
-    "am": '\xe1\x8a\xa0\xe1\x88\x9b\xe1\x88\xad\xe1\x8a\x9b',
-    "an": 'Aragon\xc3\xa9s',
-    "ar": '\xd8\xa7\xd9\x84\xd8\xb9\xd8\xb1\xd8\xa8\xd9\x8a\xd8\xa9',
-    "as": '\xe0\xa6\x85\xe0\xa6\xb8\xe0\xa6\xae\xe0\xa7\x80\xe0\xa6\xaf\xe0\xa6\xbc\xe0\xa6\xbe',
-    "av": '\xd0\xb0\xd0\xb2\xd0\xb0\xd1\x80 \xd0\xbc\xd0\xb0\xd1\x86\xd3\x80; \xd0\xbc\xd0\xb0\xd0\xb3\xd3\x80\xd0\xb0\xd1\x80\xd1\x83\xd0\xbb \xd0\xbc\xd0\xb0\xd1\x86\xd3\x80',
-    "ay": 'Aymar Aru',
-    "az": 'Az\xc9\x99rbaycanca',
-    "ba": '\xd0\xb1\xd0\xb0\xd1\x88\xd2\xa1\xd0\xbe\xd1\x80\xd1\x82 \xd1\x82\xd0\xb5\xd0\xbb\xd0\xb5',
-    "be": '\xd0\x91\xd0\xb5\xd0\xbb\xd0\xb0\xd1\x80\xd1\x83\xd1\x81\xd0\xba\xd0\xb0\xd1\x8f \xd0\xbc\xd0\xbe\xd0\xb2\xd0\xb0',
-    "bg": '\xd0\xb1\xd1\x8a\xd0\xbb\xd0\xb3\xd0\xb0\xd1\x80\xd1\x81\xd0\xba\xd0\xb8 \xd0\xb5\xd0\xb7\xd0\xb8\xd0\xba',
-    "bh": '\xe0\xa4\xad\xe0\xa5\x8b\xe0\xa4\x9c\xe0\xa4\xaa\xe0\xa5\x81\xe0\xa4\xb0\xe0\xa5\x80',
-    "bi": 'Bislama',
-    "bm": 'Bamanankan',
-    "bn": '\xe0\xa6\xac\xe0\xa6\xbe\xe0\xa6\x82\xe0\xa6\xb2\xe0\xa6\xbe',
-    "bo": '\xe0\xbd\x96\xe0\xbd\xbc\xe0\xbd\x91\xe0\xbc\x8b\xe0\xbd\xa1\xe0\xbd\xb2\xe0\xbd\x82',
-    "br": 'Brezhoneg',
-    "bs": 'Bosanski',
-    "ca": 'Catal\xc3\xa0',
-    "ce": '\xd0\xbd\xd0\xbe\xd1\x85\xd1\x87\xd0\xb8\xd0\xb9\xd0\xbd \xd0\xbc\xd0\xbe\xd1\x82\xd1\x82',
-    "ch": 'Chamoru',
-    "co": 'Corsu',
-    "cr": '\xe1\x93\x80\xe1\x90\xa6\xe1\x90\x83\xe1\x94\xad\xe1\x90\x8d\xe1\x90\x8f\xe1\x90\xa3',
-    "cs": '\xc4\x8de\xc5\xa1tina',
-    "cu": '\xd1\xa9\xd0\xb7\xd1\x8b\xd0\xba\xd1\x8a \xd1\x81\xd0\xbb\xd0\xbe\xd0\xb2\xd1\xa3\xd0\xbd\xd1\x8c\xd1\x81\xd0\xba\xd1\x8a',
-    "cv": '\xd1\x87\xd3\x91\xd0\xb2\xd0\xb0\xd1\x88 \xd1\x87\xd3\x97\xd0\xbb\xd1\x85\xd0\xb8',
-    "cy": 'Cymraeg',
-    "da": 'Dansk',
-    "de": 'Deutsch',
-    "dz": '\xe0\xbd\xa2\xe0\xbe\xab\xe0\xbd\xbc\xe0\xbd\x84\xe0\xbc\x8b\xe0\xbd\x81',
-    "ee": '\xc6\x90\xca\x8b\xc9\x9bgb\xc9\x9b',
-    "el": '\xce\x95\xce\xbb\xce\xbb\xce\xb7\xce\xbd\xce\xb9\xce\xba\xce\xac',
-    "en": 'English',
-    "eo": 'Esperanto',
-    "es": 'Espa\xc3\xb1ol',
-    "et": 'Eesti Keel',
-    "eu": 'Euskara',
-    "fa": '\xd9\x81\xd8\xa7\xd8\xb1\xd8\xb3\xdb\x8c',
-    "ff": 'Fulfulde',
-    "fi": 'Suomi',
-    "fj": 'Vosa Vakaviti',
-    "fo": 'F\xc3\xb8royskt',
-    "fr": 'Fran\xc3\xa7ais',
-    "fy": 'Frysk',
-    "ga": 'Gaeilge',
-    "gd": 'G\xc3\xa0idhlig',
-    "gl": 'Galego',
-    "gn": "Ava\xc3\xb1e'\xe1\xba\xbd",
-    "gu": '\xe0\xaa\x97\xe0\xab\x81\xe0\xaa\x9c\xe0\xaa\xb0\xe0\xaa\xbe\xe0\xaa\xa4\xe0\xab\x80',
-    "gv": 'Gaelg; Manninagh',
-    "ha": 'Hausanc\xc4\xab; \xd9\x87\xd9\x8e\xd9\x88\xd9\x8f\xd8\xb3\xd9\x8e',
-    "he": '\xd7\xa2\xd6\xb4\xd7\x91\xd6\xb0\xd7\xa8\xd6\xb4\xd7\x99\xd7\xaa; \xd7\xa2\xd7\x91\xd7\xa8\xd7\x99\xd7\xaa',
-    "hi": '\xe0\xa4\xb9\xe0\xa4\xbf\xe0\xa4\xa8\xe0\xa5\x8d\xe0\xa4\xa6\xe0\xa5\x80',
-    "ho": 'Hiri Motu',
-    "hr": 'Hrvatski',
-    "ht": 'Krey\xc3\xb2l ayisyen',
-    "hu": 'Magyar',
-    "hy": '\xd5\x80\xd5\xa1\xd5\xb5\xd5\xa5\xd6\x80\xd5\xa5\xd5\xb6 \xd5\xac\xd5\xa5\xd5\xa6\xd5\xb8\xd6\x82',
-    "hz": 'Otjiherero',
-    "ia": 'Interlingua',
-    "id": 'Bahasa Indonesia',
-    "ie": 'Interlingue',
-    "ig": 'Igbo',
-    "ii": '\xea\x86\x87\xea\x89\x99',
-    "ik": 'I\xc3\xb1upiaq; I\xc3\xb1upiatun',
-    "io": 'Ido',
-    "is": '\xc3\xadslenska',
-    "it": 'Italiano',
-    "iu": '\xe1\x90\x83\xe1\x93\x84\xe1\x92\x83\xe1\x91\x8e\xe1\x91\x90\xe1\x91\xa6',
-    "ja": '\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e',
-    "ka": '\xe1\x83\xa5\xe1\x83\x90\xe1\x83\xa0\xe1\x83\x97\xe1\x83\xa3\xe1\x83\x9a\xe1\x83\x98 \xe1\x83\x94\xe1\x83\x9c\xe1\x83\x90 (kartuli ena)',
-    "kg": 'Kikongo',
-    "ki": 'G\xc4\xa9k\xc5\xa9y\xc5\xa9',
-    "kj": 'Kuanyama',
-    "kk": '\xd2\x9a\xd0\xb0\xd0\xb7\xd0\xb0\xd2\x9b \xd1\x82\xd1\x96\xd0\xbb\xd1\x96',
-    "kl": 'Kalaallisut',
-    "km": '\xe1\x9e\x97\xe1\x9e\xb6\xe1\x9e\x9f\xe1\x9e\xb6\xe1\x9e\x81\xe1\x9f\x92\xe1\x9e\x98\xe1\x9f\x82\xe1\x9e\x9a',
-    "kn": '\xe0\xb2\x95\xe0\xb2\xa8\xe0\xb3\x8d\xe0\xb2\xa8\xe0\xb2\xa1',
-    "ko": '\xed\x95\x9c\xea\xb5\xad\xec\x96\xb4 (\xe9\x9f\x93\xe5\x9c\x8b\xe8\xaa\x9e); \xec\xa1\xb0\xec\x84\xa0\xeb\xa7\x90 (\xe6\x9c\x9d\xe9\xae\xae\xe8\xaa\x9e)',
-    "kr": 'Kanuri',
-    "ks": '\xe0\xa4\x95\xe0\xa5\x89\xe0\xa4\xb6\xe0\xa5\x81\xe0\xa4\xb0; \xda\xa9\xd9\xb2\xd8\xb4\xd9\x8f\xd8\xb1',
-    "ku": 'Kurd\xc3\xae; \xd9\x83\xd9\x88\xd8\xb1\xd8\xaf\xd9\x8a',
-    "kv": '\xd0\xba\xd0\xbe\xd0\xbc\xd0\xb8 \xd0\xba\xd1\x8b\xd0\xb2',
-    "kw": 'Kernewek',
-    "ky": '\xd0\xba\xd1\x8b\xd1\x80\xd0\xb3\xd1\x8b\xd0\xb7 \xd1\x82\xd0\xb8\xd0\xbb\xd0\xb8',
-    "la": 'latine; lingua Latina',
-    "lb": 'L\xc3\xabtzebuergesch',
-    "lg": 'Luganda',
-    "li": 'Limburgs',
-    "ln": 'Lingala',
-    "lo": '\xe0\xba\x9e\xe0\xba\xb2\xe0\xba\xaa\xe0\xba\xb2\xe0\xba\xa5\xe0\xba\xb2\xe0\xba\xa7',
-    "lt": 'Lietuvi\xc5\xb3 Kalba',
-    "lv": 'Latvie\xc5\xa1u Valoda',
-    "mg": 'Malagasy fiteny',
-    "mh": 'Kajin M\xcc\xa7aje\xc4\xbc',
-    "mi": 'Te Reo M\xc4\x81ori',
-    "mk": '\xd0\xbc\xd0\xb0\xd0\xba\xd0\xb5\xd0\xb4\xd0\xbe\xd0\xbd\xd1\x81\xd0\xba\xd0\xb8 \xd1\x98\xd0\xb0\xd0\xb7\xd0\xb8\xd0\xba',
-    "ml": '\xe0\xb4\xae\xe0\xb4\xb2\xe0\xb4\xaf\xe0\xb4\xbe\xe0\xb4\xb3\xe0\xb4\x82',
-    "mn": '\xd0\xbc\xd0\xbe\xd0\xbd\xd0\xb3\xd0\xbe\xd0\xbb \xd1\x85\xd1\x8d\xd0\xbb',
-    "mr": '\xe0\xa4\xae\xe0\xa4\xb0\xe0\xa4\xbe\xe0\xa4\xa0\xe0\xa5\x80',
-    "ms": 'Bahasa Melayu; \xd8\xa8\xd9\x87\xd8\xa7\xd8\xb3 \xd9\x85\xd9\x84\xd8\xa7\xd9\x8a\xd9\x88',
-    "mt": 'Malti',
-    "my": '\xe1\x80\x99\xe1\x80\xbc\xe1\x80\x94\xe1\x80\xba\xe1\x80\x99\xe1\x80\xac\xe1\x80\x85\xe1\x80\xac',
-    "na": 'Ekakair\xc5\xa9 Naoero',
-    "nb": 'Bokm\xc3\xa5l',
-    "nd": 'isiNdebele',
-    "ne": '\xe0\xa4\xa8\xe0\xa5\x87\xe0\xa4\xaa\xe0\xa4\xbe\xe0\xa4\xb2\xe0\xa5\x80',
-    "ng": 'Owambo',
-    "nl": 'Nederlands',
-    "nn": 'Nynorsk',
-    "no": 'Norsk',
-    "nr": 'isiNdebele',
-    "nv": 'Din\xc3\xa9 bizaad; Din\xc3\xa9k\xca\xbceh\xc7\xb0\xc3\xad',
-    "ny": 'chiChe\xc5\xb5a; chinyanja',
-    "oc": 'Occitan',
-    "oj": '\xe1\x90\x8a\xe1\x93\x82\xe1\x94\x91\xe1\x93\x87\xe1\x90\xaf\xe1\x92\xa7\xe1\x90\x8f\xe1\x90\xa3 (Anishinaabemowin)',
-    "om": 'Afaan Oromoo',
-    "or": '\xe0\xac\x93\xe0\xac\xa1\xe0\xac\xbc\xe0\xac\xbf\xe0\xac\x86',
-    "os": '\xd0\xb8\xd1\x80\xd0\xbe\xd0\xbd \xd3\x95\xd0\xb2\xd0\xb7\xd0\xb0\xd0\xb3',
-    "pa": '\xe0\xa8\xaa\xe0\xa9\xb0\xe0\xa8\x9c\xe0\xa8\xbe\xe0\xa8\xac\xe0\xa9\x80; \xd9\xbe\xd9\x86\xd8\xac\xd8\xa7\xd8\xa8\xdb\x8c',
-    "pi": '\xe0\xa4\xaa\xe0\xa4\xbe\xe0\xa4\xb2\xe0\xa4\xbf',
-    "pl": 'Polski',
-    "ps": '\xd9\xbe\xda\x9a\xd8\xaa\xd9\x88',
-    "pt": 'Portugu\xc3\xaas',
-    "qu": 'Runa Simi; Kichwa',
-    "rm": 'Rumantsch Grischun',
-    "rn": 'Rundi',
-    "ro": 'Rom\xc3\xa2n\xc4\x83',
-    "ru": '\xd0\xa0\xd1\x83\xd1\x81\xd1\x81\xd0\xba\xd0\xb8\xd0\xb9',
-    "rw": 'Ikinyarwanda',
-    "sa": '\xe0\xa4\xb8\xe0\xa4\x82\xe0\xa4\xb8\xe0\xa5\x8d\xe0\xa4\x95\xe0\xa5\x83\xe0\xa4\xa4\xe0\xa4\xae\xe0\xa5\x8d',
-    "sc": 'Sardu',
-    "sd": '\xd8\xb3\xd9\x86\xda\x8c\xd9\x8a\xd8\x8c \xd8\xb3\xd9\x86\xd8\xaf\xda\xbe\xdb\x8c; \xe0\xa4\xb8\xe0\xa4\xbf\xe0\xa4\xa8\xe0\xa5\x8d\xe0\xa4\xa7\xe0\xa5\x80',
-    "se": 's\xc3\xa1mi; s\xc3\xa1megiella',
-    "sg": 'y\xc3\xa2ng\xc3\xa2 t\xc3\xae s\xc3\xa4ng\xc3\xb6',
-    "si": '\xe0\xb7\x83\xe0\xb7\x92\xe0\xb6\x82\xe0\xb7\x84\xe0\xb6\xbd',
-    "sk": 'Sloven\xc4\x8dina',
-    "sl": 'Sloven\xc5\xa1\xc4\x8dina',
+    "aa": "Qafara",
+    "ab": "Аҧсуа",
+    "ae": "Avesta",
+    "af": "Afrikaans",
+    "ak": "Akana",
+    "am": "አማርኛ",
+    "an": "Aragonés",
+    "ar": "العربية",
+    "as": "অসমীয়া",
+    "av": "авар мацӀ; магӀарул мацӀ",
+    "ay": "Aymar Aru",
+    "az": "Azərbaycanca",
+    "ba": "башҡорт теле",
+    "be": "Беларуская мова",
+    "bg": "български език",
+    "bh": "भोजपुरी",
+    "bi": "Bislama",
+    "bm": "Bamanankan",
+    "bn": "বাংলা",
+    "bo": "བོད་ཡིག",
+    "br": "Brezhoneg",
+    "bs": "Bosanski",
+    "ca": "Català",
+    "ce": "нохчийн мотт",
+    "ch": "Chamoru",
+    "co": "Corsu",
+    "cr": "ᓀᐦᐃᔭᐍᐏᐣ",
+    "cs": "čeština",
+    "cu": "ѩзыкъ словѣньскъ",
+    "cv": "чӑваш чӗлхи",
+    "cy": "Cymraeg",
+    "da": "Dansk",
+    "de": "Deutsch",
+    "dz": "རྫོང་ཁ",
+    "ee": "Ɛʋɛgbɛ",
+    "el": "Ελληνικά",
+    "en": "English",
+    "eo": "Esperanto",
+    "es": "Español",
+    "et": "Eesti Keel",
+    "eu": "Euskara",
+    "fa": "فارسی",
+    "ff": "Fulfulde",
+    "fi": "Suomi",
+    "fj": "Vosa Vakaviti",
+    "fo": "Føroyskt",
+    "fr": "Français",
+    "fy": "Frysk",
+    "ga": "Gaeilge",
+    "gd": "Gàidhlig",
+    "gl": "Galego",
+    "gn": "Avañe'ẽ",
+    "gu": "ગુજરાતી",
+    "gv": "Gaelg; Manninagh",
+    "ha": "Hausancī; هَوُسَ",
+    "he": "עִבְרִית; עברית",
+    "hi": "हिन्दी",
+    "ho": "Hiri Motu",
+    "hr": "Hrvatski",
+    "ht": "Kreyòl ayisyen",
+    "hu": "Magyar",
+    "hy": "Հայերեն լեզու",
+    "hz": "Otjiherero",
+    "ia": "Interlingua",
+    "id": "Bahasa Indonesia",
+    "ie": "Interlingue",
+    "ig": "Igbo",
+    "ii": "ꆇꉙ",
+    "ik": "Iñupiaq; Iñupiatun",
+    "io": "Ido",
+    "is": "íslenska",
+    "it": "Italiano",
+    "iu": "ᐃᓄᒃᑎᑐᑦ",
+    "ja": "日本語",
+    "ka": "ქართული ენა (kartuli ena)",
+    "kg": "Kikongo",
+    "ki": "Gĩkũyũ",
+    "kj": "Kuanyama",
+    "kk": "Қазақ тілі",
+    "kl": "Kalaallisut",
+    "km": "ភាសាខ្មែរ",
+    "kn": "ಕನ್ನಡ",
+    "ko": "한국어 (韓國語); 조선말 (朝鮮語)",
+    "kr": "Kanuri",
+    "ks": "कॉशुर; کٲشُر",
+    "ku": "Kurdî; كوردي",
+    "kv": "коми кыв",
+    "kw": "Kernewek",
+    "ky": "кыргыз тили",
+    "la": "latine; lingua Latina",
+    "lb": "Lëtzebuergesch",
+    "lg": "Luganda",
+    "li": "Limburgs",
+    "ln": "Lingala",
+    "lo": "ພາສາລາວ",
+    "lt": "Lietuvių Kalba",
+    "lv": "Latviešu Valoda",
+    "mg": "Malagasy fiteny",
+    "mh": "Kajin M̧ajeļ",
+    "mi": "Te Reo Māori",
+    "mk": "македонски јазик",
+    "ml": "മലയാളം",
+    "mn": "монгол хэл",
+    "mr": "मराठी",
+    "ms": "Bahasa Melayu; بهاس ملايو",
+    "mt": "Malti",
+    "my": "မြန်မာစာ",
+    "na": "Ekakairũ Naoero",
+    "nb": "Bokmål",
+    "nd": "isiNdebele",
+    "ne": "नेपाली",
+    "ng": "Owambo",
+    "nl": "Nederlands",
+    "nn": "Nynorsk",
+    "no": "Norsk",
+    "nr": "isiNdebele",
+    "nv": "Diné bizaad; Dinékʼehǰí",
+    "ny": "chiCheŵa; chinyanja",
+    "oc": "Occitan",
+    "oj": "ᐊᓂᔑᓇᐯᒧᐏᐣ (Anishinaabemowin)",
+    "om": "Afaan Oromoo",
+    "or": "ଓଡ଼ିଆ",
+    "os": "ирон ӕвзаг",
+    "pa": "ਪੰਜਾਬੀ; پنجابی",
+    "pi": "पालि",
+    "pl": "Polski",
+    "ps": "پښتو",
+    "pt": "Português",
+    "qu": "Runa Simi; Kichwa",
+    "rm": "Rumantsch Grischun",
+    "rn": "Rundi",
+    "ro": "Română",
+    "ru": "Русский",
+    "rw": "Ikinyarwanda",
+    "sa": "संस्कृतम्",
+    "sc": "Sardu",
+    "sd": "سنڌي، سندھی; सिन्धी",
+    "se": "sámi; sámegiella",
+    "sg": "yângâ tî sängö",
+    "si": "සිංහල",
+    "sk": "Slovenčina",
+    "sl": "Slovenščina",
     "sm": "Gagana fa'a Samoa",
-    "sn": 'chiShona',
-    "so": 'Soomaaliga; af Soomaali',
-    "sq": 'Shqip',
-    "sr": '\xd1\x81\xd1\x80\xd0\xbf\xd1\x81\xd0\xba\xd0\xb8 \xd1\x98\xd0\xb5\xd0\xb7\xd0\xb8\xd0\xba; srpski jezik',
-    "ss": 'siSwati',
-    "st": 'Sesotho',
-    "su": 'Basa Sunda',
-    "sv": 'Svenska',
-    "sw": 'Kiswahili',
-    "ta": '\xe0\xae\xa4\xe0\xae\xae\xe0\xae\xbf\xe0\xae\xb4\xe0\xaf\x8d',
-    "te": '\xe0\xb0\xa4\xe0\xb1\x86\xe0\xb0\xb2\xe0\xb1\x81\xe0\xb0\x97\xe0\xb1\x81',
-    "tg": '\xd1\x82\xd0\xbe\xd2\xb7\xd0\xb8\xd0\xba\xd3\xa3; \xd8\xaa\xd8\xa7\xd8\xac\xdb\x8c\xda\xa9\xdb\x8c',
-    "th": '\xe0\xb8\xa0\xe0\xb8\xb2\xe0\xb8\xa9\xe0\xb8\xb2\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2',
-    "ti": '\xe1\x89\xb5\xe1\x8c\x8d\xe1\x88\xad\xe1\x8a\x9b',
-    "tk": '\xd0\xa2\xd2\xaf\xd1\x80\xd0\xba\xd0\xbc\xd0\xb5\xd0\xbd',
-    "tl": 'Wikang Tagalog; \xe1\x9c\x8f\xe1\x9c\x92\xe1\x9c\x83\xe1\x9c\x85\xe1\x9c\x94 \xe1\x9c\x86\xe1\x9c\x84\xe1\x9c\x8e\xe1\x9c\x93\xe1\x9c\x84\xe1\x9c\x94',
-    "tn": 'Setswana',
-    "to": 'Faka-Tonga',
-    "tr": 'T\xc3\xbcrk\xc3\xa7e',
-    "ts": 'Xitsonga',
-    "tt": '\xd1\x82\xd0\xb0\xd1\x82\xd0\xb0\xd1\x80\xd1\x87\xd0\xb0; tatar\xc3\xa7a; \xd8\xaa\xd8\xa7\xd8\xaa\xd8\xa7\xd8\xb1\xda\x86\xd8\xa7',
-    "tw": 'Twi',
-    "ty": 'te reo Tahiti; te reo M\xc4\x81\xca\xbcohi',
-    "ug": 'Uy\xc6\xa3urq\xc9\x99; Uy\xc4\x9fur\xc3\xa7e; \xd8\xa6\xdb\x87\xd9\x8a\xd8\xba\xdb\x87\xd8\xb1\xda\x86',
-    "uk": '\xd1\x83\xd0\xba\xd1\x80\xd0\xb0\xd1\x97\xd0\xbd\xd1\x81\xd1\x8c\xd0\xba\xd0\xb0 \xd0\xbc\xd0\xbe\xd0\xb2\xd0\xb0',
-    "ur": '\xd8\xa7\xd8\xb1\xd8\xaf\xd9\x88',
-    "uz": "O'zbek; \xd0\x8e\xd0\xb7\xd0\xb1\xd0\xb5\xd0\xba; \xd8\xa3\xdb\x87\xd8\xb2\xd8\xa8\xdb\x90\xd9\x83",
-    "ve": 'Tshiven\xe1\xb8\x93a',
-    "vi": 'Ti\xe1\xba\xbfng Vi\xe1\xbb\x87t',
-    "vo": 'Volap\xc3\xbck',
-    "wa": 'Walon',
-    "wo": 'Wolof',
-    "xh": 'isiXhosa',
-    "yi": '\xd7\x99\xd7\x99\xd6\xb4\xd7\x93\xd7\x99\xd7\xa9',
-    "yo": 'Yor\xc3\xb9b\xc3\xa1',
-    "za": 'Sa\xc9\xaf cue\xc5\x8b\xc6\x85; Saw cuengh',
-    "zh": '\xe6\xbc\xa2\xe8\xaa\x9e; \xe6\xb1\x89\xe8\xaf\xad; \xe4\xb8\xad\xe6\x96\x87',
-    "zu": 'isiZulu',
-    "und": 'Unknown'
+    "sn": "chiShona",
+    "so": "Soomaaliga; af Soomaali",
+    "sq": "Shqip",
+    "sr": "српски језик; srpski jezik",
+    "ss": "siSwati",
+    "st": "Sesotho",
+    "su": "Basa Sunda",
+    "sv": "Svenska",
+    "sw": "Kiswahili",
+    "ta": "தமிழ்",
+    "te": "తెలుగు",
+    "tg": "тоҷикӣ; تاجیکی",
+    "th": "ภาษาไทย",
+    "ti": "ትግርኛ",
+    "tk": "Түркмен",
+    "tl": "Wikang Tagalog; ᜏᜒᜃᜅ᜔ ᜆᜄᜎᜓᜄ᜔",
+    "tn": "Setswana",
+    "to": "Faka-Tonga",
+    "tr": "Türkçe",
+    "ts": "Xitsonga",
+    "tt": "татарча; tatarça; تاتارچا",
+    "tw": "Twi",
+    "ty": "te reo Tahiti; te reo Māʼohi",
+    "ug": "Uyƣurqə; Uyğurçe; ئۇيغۇرچ",
+    "uk": "українська мова",
+    "ur": "اردو",
+    "uz": "O'zbek; Ўзбек; أۇزبېك",
+    "ve": "Tshivenḓa",
+    "vi": "Tiếng Việt",
+    "vo": "Volapük",
+    "wa": "Walon",
+    "wo": "Wolof",
+    "xh": "isiXhosa",
+    "yi": "ייִדיש",
+    "yo": "Yorùbá",
+    "za": "Saɯ cueŋƅ; Saw cuengh",
+    "zh": "漢語; 汉语; 中文",
+    "zu": "isiZulu",
+    "und": "Unknown"
 }
 
 def PrintErrorAndExit(message):
@@ -248,8 +249,14 @@
         xsd += ('%.3fS' % (s))
     return xsd
 
+def Base64Encode(x):
+    return base64.b64encode(x).decode('ascii')
+
+def Base64Decode(x):
+    return base64.b64decode(x)
+
 def Bento4Command(options, name, *args, **kwargs):
-    executable = path.join(options.exec_dir, name)
+    executable = path.join(options.exec_dir, name) if options.exec_dir != '-' else name
     cmd = [executable]
     for kwarg in kwargs:
         arg = kwarg.replace('_', '-')
@@ -266,13 +273,13 @@
 
     cmd += args
     if options.debug:
-        print 'COMMAND: ', " ".join(cmd), cmd
+        print('COMMAND: ', " ".join(cmd), cmd)
     try:
         try:
             return check_output(cmd)
         except OSError as e:
             if options.debug:
-                print 'executable ' + executable + ' not found in exec_dir, trying with PATH'
+                print('executable ' + executable + ' not found in exec_dir, trying with PATH')
             cmd[0] = path.basename(cmd[0])
             return check_output(cmd)
     except CalledProcessError as e:
@@ -302,7 +309,7 @@
 def Mp42Hls(options, input_filename, *args, **kwargs):
     return Bento4Command(options, 'mp42hls', input_filename, *args, **kwargs)
 
-def Mp4IframIndex(options, input_filename, *args, **kwargs):
+def Mp4IframeIndex(options, input_filename, *args, **kwargs):
     return Bento4Command(options, 'mp4iframeindex', input_filename, *args, **kwargs)
 
 class Mp4Atom:
@@ -322,7 +329,7 @@
     while True:
         try:
             size = struct.unpack('>I', file.read(4))[0]
-            type = file.read(4)
+            type = file.read(4).decode('ascii')
             if type == until:
                 break
             if size == 1:
@@ -346,18 +353,17 @@
 def FindChild(top, path):
     for entry in path:
         children = FilterChildren(top, entry)
-        if len(children) == 0: return None
+        if not children: return None
         top = children[0]
     return top
 
 class Mp4Track:
     def __init__(self, parent, info):
-        self.parent = parent
-        self.info   = info
+        self.parent                   = parent
+        self.info                     = info
         self.default_sample_duration  = 0
         self.timescale                = 0
         self.moofs                    = []
-        self.kid                      = None
         self.sample_counts            = []
         self.segment_sizes            = []
         self.segment_durations        = []
@@ -373,6 +379,7 @@
         self.bandwidth                = 0
         self.language                 = ''
         self.order_index              = 0
+        self.key_info                 = {}
         self.id = info['id']
         if info['type'] == 'Audio':
             self.type = 'audio'
@@ -471,11 +478,14 @@
         moov = FilterChildren(self.parent.tree, 'moov')[0]
         traks = FilterChildren(moov, 'trak')
         for trak in traks:
-            tenc = FindChild(trak, ('mdia', 'minf', 'stbl', 'stsd', 'encv', 'sinf', 'schi', 'tenc'))
-            if tenc is None:
-                tenc = FindChild(trak, ('mdia', 'minf', 'stbl', 'stsd', 'enca', 'sinf', 'schi', 'tenc'))
-            if tenc and 'default_KID' in tenc:
-                self.kid = tenc['default_KID'].strip('[]').replace(' ', '')
+            tkhd = FindChild(trak, ['tkhd'])
+            if tkhd['id'] == self.id:
+                tenc = FindChild(trak, ('mdia', 'minf', 'stbl', 'stsd', 'encv', 'sinf', 'schi', 'tenc'))
+                if tenc is None:
+                    tenc = FindChild(trak, ('mdia', 'minf', 'stbl', 'stsd', 'enca', 'sinf', 'schi', 'tenc'))
+                if tenc and 'default_KID' in tenc:
+                    self.key_info['kid'] = tenc['default_KID'].strip('[]').replace(' ', '')
+                break
 
     def __repr__(self):
         return 'File '+str(self.parent.file_list_index)+'#'+str(self.id)
@@ -483,15 +493,16 @@
 class Mp4File:
     def __init__(self, options, media_source):
         self.media_source    = media_source
+        self.info            = media_source.mp4_info
         self.tracks          = {}
         self.file_list_index = 0 # used to keep a sequence number just amongst all sources
 
         filename = media_source.filename
         if options.debug:
-            print 'Processing MP4 file', filename
+            print('Processing MP4 file', filename)
 
         # by default, the media name is the basename of the source file
-        self.media_name = os.path.basename(filename)
+        self.media_name = path.basename(filename)
 
         # walk the atom structure
         self.atoms = WalkAtoms(filename)
@@ -502,26 +513,21 @@
             elif atom.type == 'moof':
                 self.segments.append([atom])
             else:
-                if len(self.segments):
+                if self.segments:
                     self.segments[-1].append(atom)
         #print self.segments
         if options.debug:
-            print '  found', len(self.segments), 'segments'
-
-        # get the mp4 file info
-        json_info = Mp4Info(options, filename, format='json', fast=True)
-        self.info = json.loads(json_info, strict=False, object_pairs_hook=collections.OrderedDict)
+            print('  found', len(self.segments), 'segments')
 
         for track in self.info['tracks']:
             self.tracks[track['id']] = Mp4Track(self, track)
 
         # get a complete file dump
         json_dump = Mp4Dump(options, filename, format='json', verbosity='1')
-        #print json_dump
         self.tree = json.loads(json_dump, strict=False, object_pairs_hook=collections.OrderedDict)
 
         # look for KIDs
-        for track in self.tracks.itervalues():
+        for track in self.tracks.values():
             track.compute_kid()
 
         # compute default sample durations and timescales
@@ -562,7 +568,7 @@
                 default_sample_duration = tfhd.get('default sample duration', track.default_sample_duration)
                 for trun in FilterChildren(trafs[0], 'trun'):
                     track.sample_counts.append(trun['sample count'])
-                    for (name, value) in trun.items():
+                    for (name, value) in list(trun.items()):
                         if name[0] in '0123456789':
                             sample_duration = -1
                             fields = value.split(',')
@@ -604,7 +610,7 @@
                     continue
                 track = self.tracks[track_id]
                 moof_pointers = []
-                for (name, value) in tfra.items():
+                for (name, value) in list(tfra.items()):
                     if name.startswith('['):
                         attributes = value.split(',')
                         attribute_dict = {}
@@ -634,15 +640,15 @@
 
         # print debug info if requested
         if options.debug:
-            for track in self.tracks.itervalues():
-                print 'Track ID                     =', track.id
-                print '    Segment Count            =', len(track.segment_durations)
-                print '    Type                     =', track.type
-                print '    Sample Count             =', track.total_sample_count
-                print '    Average segment bitrate  =', track.average_segment_bitrate
-                print '    Max segment bitrate      =', track.max_segment_bitrate
-                print '    Required bandwidth       =', int(track.bandwidth)
-                print '    Average segment duration =', track.average_segment_duration
+            for track in self.tracks.values():
+                print('Track ID                     =', track.id)
+                print('    Segment Count            =', len(track.segment_durations))
+                print('    Type                     =', track.type)
+                print('    Sample Count             =', track.total_sample_count)
+                print('    Average segment bitrate  =', track.average_segment_bitrate)
+                print('    Max segment bitrate      =', track.max_segment_bitrate)
+                print('    Required bandwidth       =', int(track.bandwidth))
+                print('    Average segment duration =', track.average_segment_duration)
 
     def find_track_by_id(self, track_id_to_find):
         for track_id in self.tracks:
@@ -652,12 +658,13 @@
         return None
 
     def find_tracks_by_type(self, track_type_to_find):
-        return [track for track in self.tracks.values() if track_type_to_find == '' or track_type_to_find == track.type]
+        return [track for track in list(self.tracks.values()) if track_type_to_find == '' or track_type_to_find == track.type]
 
 class MediaSource:
-    def __init__(self, name):
+    def __init__(self, options, name):
         self.name = name
-        self.track_key_infos = {}
+        self.mp4_info = None
+        self.key_infos = {} # key infos indexed by track ID
         if name.startswith('[') and ']' in name:
             try:
                 params = name[1:name.find(']')]
@@ -681,6 +688,11 @@
         else:
             self.format = 'mp4'
 
+        # if the file is an mp4 file, get the mp4 info now
+        if self.format == 'mp4':
+            json_info = Mp4Info(options, self.filename, format='json', fast=True)
+            self.mp4_info = json.loads(json_info, strict=False)
+
         # keep a record of our original filename in case it gets changed later
         self.original_filename = self.filename
 
@@ -703,7 +715,7 @@
     return int(bandwidth)
 
 def MakeNewDir(dir, exit_if_exists=False, severity=None):
-    if os.path.exists(dir):
+    if path.exists(dir):
         if severity:
             sys.stderr.write(severity+': ')
             sys.stderr.write('directory "'+dir+'" already exists\n')
@@ -714,19 +726,19 @@
 
 def MakePsshBox(system_id, payload):
     pssh_size = 12+16+4+len(payload)
-    return struct.pack('>I', pssh_size)+'pssh'+struct.pack('>I',0)+system_id+struct.pack('>I', len(payload))+payload
+    return struct.pack('>I', pssh_size)+b'pssh'+struct.pack('>I',0)+system_id+struct.pack('>I', len(payload))+payload
 
 def MakePsshBoxV1(system_id, kids, payload):
-    pssh_size = 12+16++4+(16*len(kids))+4+len(payload)
-    pssh = struct.pack('>I', pssh_size)+'pssh'+struct.pack('>I',0x01000000)+system_id+struct.pack('>I', len(kids))
+    pssh_size = 12+16+4+(16*len(kids))+4+len(payload)
+    pssh = struct.pack('>I', pssh_size)+b'pssh'+struct.pack('>I',0x01000000)+system_id+struct.pack('>I', len(kids))
     for kid in kids:
-        pssh += kid.decode('hex')
+        pssh += bytes.fromhex(kid)
     pssh += struct.pack('>I', len(payload))+payload
     return pssh
 
 def GetEncryptionKey(options, spec):
     if options.debug:
-        print 'Resolving KID and Key from spec:', spec
+        print('Resolving KID and Key from spec:', spec)
     if spec.startswith('skm:'):
         import skm
         return skm.ResolveKey(options, spec[4:])
@@ -846,7 +858,7 @@
     7: ['L', 'C', 'R', 'Ls', 'Rs']
 }
 
-def GetDolbyDigitalChannels(track):
+def GetDolbyDigitalPlusChannels(track):
     sample_desc = track.info['sample_descriptions'][0]
     if 'dolby_digital_info' not in sample_desc:
         return (track.channels, [])
@@ -867,7 +879,7 @@
             channel_count += 1
     return (channel_count, channels)
 
-def ComputeDolbyDigitalAudioChannelConfig(track):
+def ComputeDolbyDigitalPlusAudioChannelConfig(track):
     flags = {
         'L':       1<<15,
         'C':       1<<14,
@@ -886,8 +898,8 @@
         'LFE2':    1<<1,
         'LFE':     1<<0
     }
-    (channel_count, channels) = GetDolbyDigitalChannels(track)
-    if len(channels) == 0:
+    (channel_count, channels) = GetDolbyDigitalPlusChannels(track)
+    if not channels:
         return str(channel_count)
     config = 0
     for channel in channels:
@@ -906,7 +918,7 @@
 
     return '000000'
 
-def ComputeDolbyDigitalAudioChannelMask(track):
+def ComputeDolbyDigitalPlusAudioChannelMask(track):
     masks = {
         'L':       0x1,             # SPEAKER_FRONT_LEFT
         'R':       0x2,             # SPEAKER_FRONT_RIGHT
@@ -923,8 +935,8 @@
         'Vhl/Vhr': 0x1000 | 0x4000, # SPEAKER_TOP_FRONT_LEFT/SPEAKER_TOP_FRONT_RIGHT
         'Vhc':     0x2000,          # SPEAKER_TOP_FRONT_CENTER
     }
-    (channel_count, channels) = GetDolbyDigitalChannels(track)
-    if len(channels) == 0:
+    (channel_count, channels) = GetDolbyDigitalPlusChannels(track)
+    if not channels:
         return (channel_count, 3)
     channel_mask = 0
     for channel in channels:
@@ -938,8 +950,8 @@
                 channel_mask |= masks[channel2]
     return (channel_count, channel_mask)
 
-def ComputeDolbyDigitalSmoothStreamingInfo(track):
-    (channel_count, channel_mask) = ComputeDolbyDigitalAudioChannelMask(track)
+def ComputeDolbyDigitalPlusSmoothStreamingInfo(track):
+    (channel_count, channel_mask) = ComputeDolbyDigitalPlusAudioChannelMask(track)
     info = "0006" # 1536 in little-endian
     mask_hex_be = "{0:0{1}x}".format(channel_mask, 4)
     info += mask_hex_be[2:4]+mask_hex_be[0:2]+'0000'
@@ -949,7 +961,7 @@
 
 def ComputeMarlinPssh(options):
     # create a dummy (empty) Marlin PSSH
-    return struct.pack('>I4sI4sII', 24, 'marl', 16, 'mkid', 0, 0)
+    return struct.pack('>I4sI4sII', 24, b'marl', 16, b'mkid', 0, 0)
 
 def DerivePlayReadyKey(seed, kid, swap=True):
     if len(seed) < 30:
@@ -958,31 +970,29 @@
         raise Exception('kid must be 16 bytes')
 
     if swap:
-        kid = kid[3]+kid[2]+kid[1]+kid[0]+kid[5]+kid[4]+kid[7]+kid[6]+kid[8:]
+        kid = kid[3:4]+kid[2:3]+kid[1:2]+kid[0:1]+kid[5:6]+kid[4:5]+kid[7:8]+kid[6:7]+kid[8:]
 
     seed = seed[:30]
 
     sha = hashlib.sha256()
     sha.update(seed)
     sha.update(kid)
-    sha_A = [ord(x) for x in sha.digest()]
+    sha_A = sha.digest()
 
     sha = hashlib.sha256()
     sha.update(seed)
     sha.update(kid)
     sha.update(seed)
-    sha_B = [ord(x) for x in sha.digest()]
+    sha_B = sha.digest()
 
     sha = hashlib.sha256()
     sha.update(seed)
     sha.update(kid)
     sha.update(seed)
     sha.update(kid)
-    sha_C = [ord(x) for x in sha.digest()]
+    sha_C = sha.digest()
 
-    content_key = ""
-    for i in range(16):
-        content_key += chr(sha_A[i] ^ sha_A[i+16] ^ sha_B[i] ^ sha_B[i+16] ^ sha_C[i] ^ sha_C[i+16])
+    content_key = bytes([sha_A[i] ^ sha_A[i+16] ^ sha_B[i] ^ sha_B[i+16] ^ sha_C[i] ^ sha_C[i+16] for i in range(16)])
 
     return content_key
 
@@ -990,65 +1000,127 @@
     import aes
     return aes.rijndael(key).encrypt(kid)[:8]
 
-def WrapPlayreadyHeaderXml(header_xml):
+def WrapPlayReadyHeaderXml(header_xml):
     # encode the XML header into UTF-16 little-endian
     header_utf16_le = header_xml.encode('utf-16-le')
     rm_record = struct.pack('<HH', 1, len(header_utf16_le))+header_utf16_le
     return struct.pack('<IH', len(rm_record)+6, 1)+rm_record
 
-def ComputePlayReadyHeader(header_spec, kid_hex, key_hex):
+def ComputePlayReadyKeyInfo(key_spec):
+    (kid_hex, key_hex) = key_spec
+    kid = bytes.fromhex(kid_hex)
+    kid = kid[3:4]+kid[2:3]+kid[1:2]+kid[0:1]+kid[5:6]+kid[4:5]+kid[7:8]+kid[6:7]+kid[8:]
+
+    xml_key_checksum = None
+    if key_hex:
+        xml_key_checksum = Base64Encode(ComputePlayReadyChecksum(kid, bytes.fromhex(key_hex)))
+
+    return (Base64Encode(kid), xml_key_checksum)
+
+def ComputePlayReadyXmlKid(key_spec, algid):
+    (xml_kid, xml_key_checksum) = ComputePlayReadyKeyInfo(key_spec)
+
+    # optional checkum
+    xml_key_checksum_attribute = ''
+    if xml_key_checksum:
+        xml_key_checksum_attribute = 'CHECKSUM="' + xml_key_checksum + '" '
+
+    # KID
+    return '<KID ALGID="%s" %sVALUE="%s"></KID>' % (algid, xml_key_checksum_attribute, xml_kid)
+
+def ComputePlayReadyHeader(version, header_spec, encryption_scheme, key_specs):
+    # map the encryption scheme and an algorithm ID
+    scheme_to_id_map = {
+        'cenc': 'AESCTR',
+        'cens': 'AESCTR',
+        'cbc1': 'AESCBC',
+        'cbcs': 'AESCBC'
+    }
+    if encryption_scheme not in scheme_to_id_map:
+        raise Exception('Encryption scheme not supported by PlayReady')
+    algid = scheme_to_id_map[encryption_scheme]
+
+    # check that the algorithm is supported
+    if algid == 'AESCBC' and version < "4.3":
+        raise Exception('AESCBC requires PlayReady 4.3 or higher')
+
     # construct the base64 header
     if header_spec is None:
         header_spec = ''
     if header_spec.startswith('#'):
         header_b64 = header_spec[1:]
-        header = header_b64.decode('base64')
-        if len(header) == 0:
+        header = Base64Decode(header_b64)
+        if not header:
             raise Exception('invalid base64 encoding')
         return header
-    elif header_spec.startswith('@') or os.path.exists(header_spec):
+    elif header_spec.startswith('@') or path.exists(header_spec):
         # check that the file exists
         if header_spec.startswith('@'):
             header_spec = header_spec[1:]
-            if not os.path.exists(header_spec):
+            if not path.exists(header_spec):
                 raise Exception('header data file does not exist')
 
         # read the header from the file
         header = open(header_spec, 'rb').read()
         header_xml = None
-        if (ord(header[0]) == 0xff and ord(header[1]) == 0xfe) or (ord(header[0]) == 0xfe and ord(header[1]) == 0xff):
+        if (header[0] == 0xff and header[1] == 0xfe) or (header[0] == 0xfe and header[1] == 0xff):
             # this is UTF-16 XML
             header_xml = header.decode('utf-16')
-        elif header[0] == '<' and ord(header[1]) != 0x00:
+        elif header[0] == '<' and header[1] != 0x00:
             # this is ASCII or UTF-8 XML
             header_xml = header.decode('utf-8')
-        elif header[0] == '<' and ord(header[1]) == 0x00:
+        elif header[0] == '<' and header[1] == 0x00:
             # this UTF-16LE XML without charset header
             header_xml = header.decode('utf-16-le')
         if header_xml is not None:
-            header = WrapPlayreadyHeaderXml(header_xml)
+            header = WrapPlayReadyHeaderXml(header_xml)
         return header
     else:
         try:
             pairs = header_spec.split('#')
             fields = {}
             for pair in pairs:
-                if len(pair) == 0: continue
+                if not pair: continue
                 name, value = pair.split(':', 1)
                 fields[name] = value
         except:
             raise Exception('invalid syntax for argument')
 
-        header_xml = '<WRMHEADER xmlns="http://schemas.microsoft.com/DRM/2007/03/PlayReadyHeader" version="4.0.0.0"><DATA><PROTECTINFO><KEYLEN>16</KEYLEN><ALGID>AESCTR</ALGID></PROTECTINFO>'
+        xml_protectinfo = ''
+        xml_extras      = ''
+        if version == "4.0":
+            # 4.0 version only
+            if len(key_specs) != 1:
+                raise Exception("PlayReady 4.0 only supports 1 key")
+
+            (xml_kid, xml_key_checksum) = ComputePlayReadyKeyInfo(key_specs[0])
+            xml_protectinfo = '<KEYLEN>16</KEYLEN><ALGID>AESCTR</ALGID>'
+            xml_extras = '<KID>' + xml_kid +'</KID>'
+            if xml_key_checksum:
+                xml_extras += '<CHECKSUM>' + xml_key_checksum + '</CHECKSUM>'
+        else:
+            # 4.1 and above
+            if version == "4.1":
+                # 4.1 only
+                if len(key_specs) != 1:
+                    raise Exception("PlayReady 4.1 only supports 1 key")
+
+                # single KID
+                xml_protectinfo += ComputePlayReadyXmlKid(key_specs[0], algid)
+            else:
+                # 4.2 and above
 
-        kid = kid_hex.decode('hex')
-        kid = kid[3]+kid[2]+kid[1]+kid[0]+kid[5]+kid[4]+kid[7]+kid[6]+kid[8:]
-        header_xml += '<KID>'+kid.encode('base64').replace('\n', '')+'</KID>'
-        if key_hex:
-            header_xml += '<CHECKSUM>'+ComputePlayReadyChecksum(kid, key_hex.decode('hex')).encode('base64').replace('\n', '')+'</CHECKSUM>'
+                # list of KIDS
+                xml_protectinfo += '<KIDS>'
+                for key_spec in key_specs:
+                    xml_protectinfo += ComputePlayReadyXmlKid(key_spec, algid)
+                xml_protectinfo += '</KIDS>'
 
+        header_xml = '<WRMHEADER xmlns="http://schemas.microsoft.com/DRM/2007/03/PlayReadyHeader" version="%s.0.0"><DATA>' % version
+        header_xml += '<PROTECTINFO>' + xml_protectinfo + '</PROTECTINFO>'
+        header_xml += xml_extras
         if 'CUSTOMATTRIBUTES' in fields:
-            header_xml += '<CUSTOMATTRIBUTES>'+fields['CUSTOMATTRIBUTES'].decode('base64').replace('\n', '')+'</CUSTOMATTRIBUTES>'
+            header_xml += '<CUSTOMATTRIBUTES>'+Base64Decode(fields['CUSTOMATTRIBUTES']).decode('utf-8').replace('\n', '')+'</CUSTOMATTRIBUTES>'
         if 'LA_URL' in fields:
             header_xml += '<LA_URL>'+saxutils.escape(fields['LA_URL'])+'</LA_URL>'
         if 'LUI_URL' in fields:
@@ -1057,7 +1129,7 @@
             header_xml += '<DS_ID>'+saxutils.escape(fields['DS_ID'])+'</DS_ID>'
 
         header_xml += '</DATA></WRMHEADER>'
-        return WrapPlayreadyHeaderXml(header_xml)
+        return WrapPlayReadyHeaderXml(header_xml)
 
 def ComputePrimetimeMetaData(metadata_spec, kid_hex):
     # construct the base64 header
@@ -1065,12 +1137,12 @@
         metadata_spec = ''
     if metadata_spec.startswith('#'):
         metadata_b64 = metadata_spec[1:]
-        metadata = metadata_b64.decode('base64')
-        if len(metadata) == 0:
+        metadata = Base64Decode(metadata_b64)
+        if not metadata:
             raise Exception('invalid base64 encoding')
     elif metadata_spec.startswith('@'):
         metadata_filename = metadata_spec[1:]
-        if not os.path.exists(metadata_filename):
+        if not path.exists(metadata_filename):
             raise Exception('data file does not exist')
 
         # read the header from the file
@@ -1078,11 +1150,11 @@
 
     amet_size = 12+4+16
     amet_flags = 0
-    if len(metadata):
+    if metadata:
         amet_flags |= 2
         amet_size += 4+len(metadata)
-    amet_box = struct.pack('>I4sII', amet_size, 'amet', amet_flags, 1)+kid_hex.decode("hex")
-    if len(metadata):
+    amet_box = struct.pack('>I4sII', amet_size, 'amet', amet_flags, 1) + bytes.fromhex(kid_hex)
+    if metadata:
         amet_box += struct.pack('>I', len(metadata))+metadata
 
     return amet_box
@@ -1091,34 +1163,33 @@
     parts = [value % 128]
     value >>= 7
     while value:
-        parts.append(value%128)
+        parts.append(value % 128)
         value >>= 7
-    varint = ''
-    for i in range(len(parts)-1):
+    for i in range(len(parts) - 1):
         parts[i] |= (1<<7)
-    varint = ''
-    for x in parts:
-        varint += chr(x)
-    return varint
+    return bytes(parts)
 
 def WidevineMakeHeader(fields):
-    buffer = ''
+    buffer = b''
     for (field_num, field_val) in fields:
-        if type(field_val) == int and field_val < 256:
+        if type(field_val) == int:
             wire_type = 0 # varint
             wire_val = WidevineVarInt(field_val)
         elif type(field_val) == str:
             wire_type = 2
-            wire_val = WidevineVarInt(len(field_val))+field_val
-        buffer += chr(field_num<<3 | wire_type) + wire_val
+            wire_val = WidevineVarInt(len(field_val)) + field_val.encode('ascii')
+        elif type(field_val) == bytes:
+            wire_type = 2
+            wire_val = WidevineVarInt(len(field_val)) + field_val
+        buffer += bytes([(field_num << 3) | wire_type]) + wire_val
     return buffer
 
-def ComputeWidevineHeader(header_spec, kid_hex):
+def ComputeWidevineHeader(header_spec, encryption_scheme, kid_hex):
     # construct the base64 header
     if header_spec.startswith('#'):
         header_b64 = header_spec[1:]
-        header = header_b64.decode('base64')
-        if len(header) == 0:
+        header = Base64Decode(header_b64)
+        if not header:
             raise Exception('invalid base64 encoding')
         return header
     else:
@@ -1131,11 +1202,54 @@
         except:
             raise Exception('invalid syntax for argument')
 
-        protobuf_fields = [(1, 1), (2, kid_hex.decode('hex'))]
+        protobuf_fields = [(1, 1), (2, bytes.fromhex(kid_hex))]
         if 'provider' in fields:
             protobuf_fields.append((3, fields['provider']))
         if 'content_id' in fields:
-            protobuf_fields.append((4, fields['content_id'].decode('hex')))
+            protobuf_fields.append((4, bytes.fromhex(fields['content_id'])))
         if 'policy' in fields:
             protobuf_fields.append((6, fields['policy']))
+
+        if encryption_scheme != 'cenc':
+            four_cc = struct.unpack('>I', encryption_scheme.encode('ascii'))[0]
+            protobuf_fields.append((9, four_cc))
+
         return WidevineMakeHeader(protobuf_fields)
+
+#############################################
+# Module Exports
+#############################################
+__all__ = [
+    'LanguageCodeMap',
+    'LanguageNames',
+    'PrintErrorAndExit',
+    'XmlDuration',
+    'Base64Encode',
+    'Base64Decode',
+    'Bento4Command',
+    'Mp4Info',
+    'Mp4Dump',
+    'Mp4Split',
+    'Mp4Fragment',
+    'Mp4Encrypt',
+    'Mp42Hls',
+    'Mp4IframeIndex',
+    'WalkAtoms',
+    'Mp4Track',
+    'Mp4File',
+    'MediaSource',
+    'ComputeBandwidth',
+    'MakeNewDir',
+    'MakePsshBox',
+    'MakePsshBoxV1',
+    'GetEncryptionKey',
+    'GetDolbyDigitalPlusChannels',
+    'ComputeDolbyDigitalPlusAudioChannelConfig',
+    'ComputeDolbyAc4AudioChannelConfig',
+    'ComputeDolbyDigitalPlusSmoothStreamingInfo',
+    'ComputeMarlinPssh',
+    'DerivePlayReadyKey',
+    'ComputePlayReadyHeader',
+    'ComputePrimetimeMetaData',
+    'ComputeWidevineHeader'
+]

bento4-1.5.1r629.tar.gz/Source/Python/utils/pr-derive-key.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/pr-derive-key.py Changed

@@ -1,28 +1,28 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import sys
-from mp4utils import DerivePlayReadyKey
+from mp4utils import DerivePlayReadyKey, Base64Decode
 
-###########################    
+###########################
 if __name__ == '__main__':
     if len(sys.argv) != 3 and len(sys.argv) != 4:
         sys.stderr.write('ERROR: invalid arguments\n')
         sys.stderr.write('Usage: pr-derive-key.py [--no-swap] <seed-base64> <kid-hex>\n')
         sys.exit(1)
-        
+
     swap = True
     if (len(sys.argv) == 4):
         if sys.argv[1] == '--no-swap':
             swap = False
         else:
             raise Exception('unknown command line option "'+sys.argv[2]+'"')
-    
+
     (seed_base64, kid_hex) = sys.argv[-2:]
     kid_hex = kid_hex.replace(' ', '')
     kid_hex = kid_hex.replace('-', '')
-    
-    seed_bin = seed_base64.decode('base64')
-    kid_bin = kid_hex.decode('hex')
-            
+
+    seed_bin = Base64Decode(seed_base64)
+    kid_bin = bytes.fromhex(kid_hex)
+
     dkey = DerivePlayReadyKey(seed_bin, kid_bin, swap)
-    print dkey.encode('hex')
\ No newline at end of file
+    print(dkey.hex())

bento4-1.5.1r629.tar.gz/Source/Python/utils/skm.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/skm.py Changed

@@ -2,17 +2,17 @@
 import os
 import hashlib
 import json
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
-KEKID_CONSTANT_1 = "KEKID_1"
+KEKID_CONSTANT_1 = b"KEKID_1"
 
 def WrapKey(key, kek):
     if len(key) > 16:
         # assume hex
-        key = key.decode('hex')
+        key = bytes.fromhex(key)
     if len(kek) > 16:
         # assume hex
-        kek = kek.decode('hex')
+        kek = bytes.fromhex(kek)
 
     if (len(key)% 8) or (len(kek) % 8):
         raise Exception('key and kek must be a multiple of 64 bits')
@@ -23,7 +23,7 @@
     # Inputs:      Plaintext, n 64-bit values {P1, P2, ..., Pn}, and
     # Key, K (the KEK).
     # Outputs:     Ciphertext, (n+1) 64-bit values {C0, C1, ..., Cn}.
-    n = len(key) // 8;
+    n = len(key) // 8
     if n < 1:
         raise Exception('key too short')
 
@@ -32,7 +32,7 @@
     #    Set A = IV, an initial value (see 2.2.3)
     #      For i = 1 to n
     #      R[i] = P[i]
-    A = 'A6A6A6A6A6A6A6A6'.decode('hex');
+    A = bytes.fromhex('A6A6A6A6A6A6A6A6')
     R = [key[i*8:(i+1)*8] for i in range(n)]
 
     # 2) Calculate intermediate values.
@@ -45,7 +45,7 @@
     for j in range(6):
         for i in range(n):
             B = cipher.encrypt(A+R[i])
-            A = B[0:7]+chr(ord(B[7]) ^ ((n*j)+i+1))
+            A = B[0:7] + bytes([B[7] ^ ((n*j)+i+1)])
             R[i] = B[8:16]
 
     # 3) Output the results.
@@ -53,15 +53,15 @@
     #    Set C[0] = A
     #    For i = 1 to n
     #      C[i] = R[i]
-    return ''.join([A]+R)
+    return b''.join([A]+R)
 
 def UnwrapKey(key, kek):
     if len(key) > 32:
         # assume hex
-        key = key.decode('hex')
+        key = bytes.fromhex(key)
     if len(kek) > 16:
         # assume hex
-        kek = kek.decode('hex')
+        kek = bytes.fromhex(kek)
 
     if (len(key)% 8) or (len(kek) % 8):
         raise Exception('key and kek must be a multiple of 64 bits')
@@ -72,9 +72,9 @@
     # Inputs:  Ciphertext, (n+1) 64-bit values {C0, C1, ..., Cn}, and
     # Key, K (the KEK).
     # Outputs: Plaintext, n 64-bit values {P0, P1, K, Pn}.
-    n = len(key) // 8 - 1;
+    n = len(key) // 8 - 1
     if n < 1:
-        raise Exception('wrapped key too short');
+        raise Exception('wrapped key too short')
 
     # 1) Initialize variables.
     #
@@ -93,7 +93,7 @@
     #       R[i] = LSB(64, B)
     for j in range(5, -1, -1):
         for i in range(n-1, -1, -1):
-            B = decipher.decrypt(A[0:7] + chr(ord(A[7])^((n*j)+i+1))+R[i])
+            B = decipher.decrypt(A[0:7] + bytes([A[7]^((n*j)+i+1)])) + R[i:i+1]
             A = B[0:8]
             R[i] = B[8:16]
 
@@ -106,17 +106,17 @@
     #    Else
     #      Return an error
     for i in range(8):
-        if ord(A[i]) != 0xA6:
+        if A[i] != 0xA6:
             raise Exception('invalid/corrupted wrapped key or wrong kek')
-    return ''.join(R)
+    return b''.join(R)
 
 def ComputeKekId(kek):
     if len(kek) > 16:
-        kek = kek.decode('hex')
+        kek = bytes.fromhex(kek)
     sha1 = hashlib.sha1()
     sha1.update(KEKID_CONSTANT_1)
     sha1.update(kek)
-    return '#1.'+sha1.digest()[0:16].encode('hex')
+    return '#1.'+sha1.digest()[0:16].hex()
 
 def ResolveKey(options, spec):
     if '#' in spec:
@@ -142,7 +142,7 @@
         raise Exception('"Requests" python module not installed. Please install it (use "pip install requests" or "easy_install requests" in a command shell, or consult the "Requests" documentation at http://docs.python-requests.org/en/latest/)')
 
     if options.debug:
-        print 'Key Object Input:', key_object
+        print('Key Object Input:', key_object)
 
     if skm_mode == 'get':
         if 'kid' not in spec_params:
@@ -150,7 +150,7 @@
         kid = spec_params['kid']
         if '?' in base_url:
             (base_url_path, base_url_query) = tuple(base_url.split('?', 1))
-            base_url_query = '?'+urllib.unquote(base_url_query).decode('utf8')
+            base_url_query = '?'+urllib.parse.unquote(base_url_query).decode('utf8')
         else:
             base_url_path = base_url
             base_url_query = ''
@@ -159,21 +159,21 @@
         base_url = base_url_path+'/'+kid+base_url_query
 
         if options.debug:
-            print 'Request:', base_url
+            print('Request:', base_url)
 
         response = requests.get(base_url)
     elif skm_mode == 'auto':
         if skm_kek:
             # generate a key locally and wrap it
             key = os.urandom(16)
-            key_object['ek'] = WrapKey(key, skm_kek).encode('hex')
+            key_object['ek'] = WrapKey(key, skm_kek).hex()
             if 'kekId' not in key_object:
                 key_object['kekId'] = ComputeKekId(skm_kek)
             if options.verbose:
-                print 'Generating key locally'
+                print('Generating key locally')
 
         if options.debug:
-            print 'Request:', base_url, json.dumps(key_object)
+            print('Request:', base_url, json.dumps(key_object))
 
         response = requests.post(base_url, headers={'content-type': 'application/json'}, data=json.dumps(key_object))
     else:
@@ -183,20 +183,20 @@
         raise Exception('HTTP error while getting key: '+str(response.status_code)+', '+response.text)
 
     if options.debug:
-        print 'Response:', response.text
+        print('Response:', response.text)
     response_json = json.loads(response.text)
     kid = response_json['kid']
     if skm_kek and ('ek' in response_json):
         received_key = UnwrapKey(response_json['ek'], skm_kek)
         if options.verbose:
             if key and (key != received_key):
-                print 'Locally generated key was ignored because a key with the same KID already existed on the server'
+                print('Locally generated key was ignored because a key with the same KID already existed on the server')
         key = received_key
 
     if not key:
         key = response_json['k']
     else:
-        key = key.encode('hex')
+        key = key.hex()
 
     return (kid, key)

bento4-1.5.1r629.tar.gz/Source/Python/utils/subtitles.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/subtitles.py Changed

@@ -1,9 +1,8 @@
-#!/usr/bin/env python
 __author__    = 'Gilles Boccon-Gibod (bok@bok.net)'
-__copyright__ = 'Copyright 2011-2016 Axiomatic Systems, LLC.'
+__copyright__ = 'Copyright 2011-2020 Axiomatic Systems, LLC.'
 
 import xml.etree.ElementTree as ET
-import os.path
+import os.path as path
 from mp4utils import LanguageCodeMap, LanguageNames
 
 TTML_XML_NAMESPACE = 'http://www.w3.org/ns/ttml'
@@ -15,11 +14,11 @@
         self.format          = None
 
         filename = media_source.filename
-        self.media_name = os.path.basename(filename)
+        self.media_name = path.basename(filename)
         if options.debug:
-            print 'Processing Subtitles file', filename
+            print('Processing Subtitles file', filename)
 
-        self.size = os.path.getsize(filename)
+        self.size = path.getsize(filename)
 
         self.language = media_source.spec.get('+language')
         self.language_name = 'Unknown'
@@ -49,7 +48,7 @@
 
         if xml_root.tag != '{'+TTML_XML_NAMESPACE+'}tt':
             if options.debug:
-                print 'ERROR: no root level <tt> element found'
+                print('ERROR: no root level <tt> element found')
 
         # get the language
         language = xml_root.get('{'+XML_NAMESPACE+'}lang')
@@ -62,3 +61,8 @@
     def parse_webvtt(self, options):
         self.format    = 'webvtt'
         self.mime_type = 'text/vtt'
+
+#############################################
+# Module Exports
+#############################################
+__all__ = ['SubtitlesFile']

bento4-1.5.1r629.tar.gz/Source/Python/utils/wv-request.py -> bento4-1.6.0r634.tar.gz/Source/Python/utils/wv-request.py Changed

@@ -1,9 +1,10 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import sys
 import json
 import aes
 import hashlib
+import base64
 from optparse import OptionParser
 
 WV_DEFAULT_SERVER_URL  = 'https://license.uat.widevine.com/cenc/getcontentkey'
@@ -16,9 +17,8 @@
 except:
 	raise Exception('"Requests" python module not installed. Please install it (use "pip install requests" or "easy_install requests" in a command shell, or consult the "Requests" documentation at http://docs.python-requests.org/en/latest/)')
 
-def base64_encode(str):
-	return str.encode('base64').replace('\n', '')
-
+def base64_encode(x):
+    return base64.b64encode(x).decode('ascii')
 
 ### Main
 parser = OptionParser(usage="%prog [options]",
@@ -44,12 +44,12 @@
 
 (options, args) = parser.parse_args()
 if not options.content_id:
-    print 'ERROR: missing --content-id option'
+    print('ERROR: missing --content-id option')
     parser.print_help()
     sys.exit(1)
 
 rq_payload = {
-	'content_id': base64_encode(options.content_id.decode('hex')),
+	'content_id': base64_encode(bytes.fromhex(options.content_id)),
 	'drm_types':  ['WIDEVINE'],
 	'policy':      options.policy
 }
@@ -61,41 +61,41 @@
 
 rq_payload_json = json.dumps(rq_payload)
 if options.debug:
-	print 'Request Payload', rq_payload_json
+	print('Request Payload', rq_payload_json)
 
 sha1_hasher = hashlib.sha1()
-sha1_hasher.update(rq_payload_json)
-rq_payload_signature = aes.cbc_encrypt(sha1_hasher.digest(), options.aes_signing_key.decode('hex'), options.aes_signing_iv.decode('hex'))
+sha1_hasher.update(rq_payload_json.encode('ascii'))
+rq_payload_signature = aes.cbc_encrypt(sha1_hasher.digest(), bytes.fromhex(options.aes_signing_key), bytes.fromhex(options.aes_signing_iv))
 
 post_body = {
-	"request":base64_encode(rq_payload_json),
-	"signature":base64_encode(rq_payload_signature),
-	"signer": options.provider
+	"request":   base64_encode(rq_payload_json.encode('ascii')),
+	"signature": base64_encode(rq_payload_signature),
+	"signer":    options.provider
 }
 
 if options.debug:
-	print 'POST Body:'
-	print post_body
+	print('POST Body:')
+	print(post_body)
 
 post_url = options.server_url+'/'+options.provider
 http_response = requests.post(post_url, data=json.dumps(post_body))
 
 if options.debug:
-	print 'Response:', http_response.text
+	print('Response:', http_response.text)
 
 parsed_response = json.loads(http_response.text)
-parsed_payload = json.loads(parsed_response['response'].decode('base64'))
+parsed_payload = json.loads(base64.b64decode(parsed_response['response']))
 
 if options.debug:
-	print 'JSON Payload:'
-	print json.dumps(parsed_payload, indent=4)
+	print('JSON Payload:')
+	print(json.dumps(parsed_payload, indent=4))
 
 if parsed_payload['status'] == 'OK':
 	for track in parsed_payload['tracks']:
-		print 'Track:'
-		print '  Type =', track['type']
-		print '  Key  =', track['key'].decode('base64').encode('hex')
-		print '  KID  =', track['key_id'].decode('base64').encode('hex')
-		print '  PSSH =', track['pssh'][0]['data'], '['+track['pssh'][0]['data'].decode('base64').encode('hex')+']'
+		print('Track:')
+		print('  Type =', track['type'])
+		print('  Key  =', base64.b64decode(track['key']).hex())
+		print('  KID  =', base64.b64decode(track['key_id']).hex())
+		print('  PSSH =', track['pssh'][0]['data'], '[' + base64.b64decode(track['pssh'][0]['data']).hex()+']')
 else:
-	print 'ERROR:', parsed_payload['status']
+	print('ERROR:', parsed_payload['status'])

bento4-1.5.1r629.tar.gz/Source/Python/wrappers/mp4dash -> bento4-1.6.0r634.tar.gz/Source/Python/wrappers/mp4dash Changed

bento4-1.5.1r629.tar.gz/Source/Python/wrappers/mp4dash.bat -> bento4-1.6.0r634.tar.gz/Source/Python/wrappers/mp4dash.bat Changed

bento4-1.5.1r629.tar.gz/Source/Python/wrappers/mp4dashclone -> bento4-1.6.0r634.tar.gz/Source/Python/wrappers/mp4dashclone Changed

bento4-1.5.1r629.tar.gz/Source/Python/wrappers/mp4dashclone.bat -> bento4-1.6.0r634.tar.gz/Source/Python/wrappers/mp4dashclone.bat Changed

bento4-1.5.1r629.tar.gz/Source/Python/wrappers/mp4hls -> bento4-1.6.0r634.tar.gz/Source/Python/wrappers/mp4hls Changed

bento4-1.5.1r629.tar.gz/Source/Python/wrappers/mp4hls.bat -> bento4-1.6.0r634.tar.gz/Source/Python/wrappers/mp4hls.bat Changed

bento4-1.5.1r629.tar.gz/Test/Data/README.txt -> bento4-1.6.0r634.tar.gz/Test/Data/README.txt Changed

bento4-1.6.0r634.tar.gz/Test/Data/audio-aac-001.mp4 Added

bento4-1.6.0r634.tar.gz/Test/Data/audio-aac-002.mp4 Added

bento4-1.6.0r634.tar.gz/Test/Data/audio-aac-003.mp4 Added

bento4-1.6.0r634.tar.gz/Test/Data/video-h264-001.mp4 Changed

bento4-1.6.0r634.tar.gz/Test/Data/video-h264-002.mp4 Added

bento4-1.6.0r634.tar.gz/Test/Pytest Added

bento4-1.6.0r634.tar.gz/Test/Pytest/test_aes.py Added

@@ -0,0 +1,27 @@
+import aes
+
+def test_ecb_encrypt():
+    msg = bytes.fromhex("00112233445566778899aabbccddeeff")
+    key = bytes.fromhex("000102030405060708090a0b0c0d0e0f")
+    encrypted = aes.rijndael(key).encrypt(msg).hex()
+    assert encrypted == "69c4e0d86a7b0430d8cdb78070b4c55a"
+
+def test_ecb_decrypt():
+    msg = bytes.fromhex("69c4e0d86a7b0430d8cdb78070b4c55a")
+    key = bytes.fromhex("000102030405060708090a0b0c0d0e0f")
+    decrypted = aes.rijndael(key).decrypt(msg).hex()
+    assert decrypted == "00112233445566778899aabbccddeeff"
+
+def test_cbc_encrypt():
+    msg = bytes.fromhex("00112233445566778899aabbccddee")
+    key = bytes.fromhex("000102030405060708090a0b0c0d0e0f")
+    iv  = bytes.fromhex("00112233445566778899aabbccddeeff")
+    encrypted = aes.cbc_encrypt(msg, key, iv).hex()
+    assert encrypted == "62cc02dafc6482edf9f2adca6abbb3d2"
+
+def test_cbc_decrypt():
+    msg = bytes.fromhex("62cc02dafc6482edf9f2adca6abbb3d2")
+    key = bytes.fromhex("000102030405060708090a0b0c0d0e0f")
+    iv  = bytes.fromhex("00112233445566778899aabbccddeeff")
+    decrypted = aes.cbc_decrypt(msg, key, iv).hex()
+    assert decrypted == "00112233445566778899aabbccddee"

bento4-1.6.0r634.tar.gz/Test/Pytest/test_mp4dash.py Added

@@ -0,0 +1,120 @@
+from unittest.mock import patch
+import sys
+import os
+import importlib
+mp4dash = importlib.import_module("mp4-dash")
+
+BENTO4_HOME = os.environ['BENTO4_HOME']
+TEST_OUTPUT_ROOT = os.path.join(BENTO4_HOME, "Test/Output/mp4dash")
+VIDEO_H264_001_MP4 = os.path.join(BENTO4_HOME, "Test/Data/video-h264-001.mp4")
+VIDEO_H264_002_MP4 = os.path.join(BENTO4_HOME, "Test/Data/video-h264-002.mp4")
+AUDIO_AAC_001_MP4 = os.path.join(BENTO4_HOME, "Test/Data/audio-aac-001.mp4")
+AUDIO_AAC_002_MP4 = os.path.join(BENTO4_HOME, "Test/Data/audio-aac-002.mp4")
+AUDIO_AAC_003_MP4 = os.path.join(BENTO4_HOME, "Test/Data/audio-aac-003.mp4")
+
+def run_mp4dash(extra_args, subdir, input_files):
+    args = ["mp4dash"] + extra_args + ["-f", "-o", os.path.join(TEST_OUTPUT_ROOT, subdir)] + input_files
+    with patch.object(sys, 'argv', args):
+        mp4dash.main()
+
+def test_mp4dash_001():
+    run_mp4dash([], "001", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_002():
+    run_mp4dash(["-v"], "002", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_003():
+    run_mp4dash(["-d"], "003", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_004():
+    run_mp4dash(["-d", "--hls"], "004", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_005():
+    run_mp4dash(["-d", "--profiles", "on-demand"], "005", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_006():
+    run_mp4dash(["-d", "--use-segment-list"], "006", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_007():
+    run_mp4dash(["-d", "--use-segment-list", "--no-split"], "007", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_008():
+    run_mp4dash(["-d", "--use-segment-timeline"], "008", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_009():
+    run_mp4dash(["-v", "--smooth"], "009", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_010():
+    run_mp4dash(["-v", "--hippo"], "010", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_011():
+    run_mp4dash([
+        "--hls",
+        "--encryption-key=000102030405060708090a0b0c0d0e0f:00112233445566778899aabbccddeeff:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
+        "--encryption-cenc-scheme=cbcs",
+        "--clearkey",
+        "--clearkey-license-uri=http://foo.com/bar.json",
+        "--eme-signaling=pssh-v1",
+        "--marlin",
+        "--marlin-add-pssh",
+        "--widevine",
+        "--widevine-header=provider:c1c2c3",
+        "--playready",
+        "--playready-version=4.3",
+        "--playready-header=LA_URL:http://foo.com/123",
+        "--primetime",
+        "--fairplay-key-uri=skd://foobar"],
+        "011",
+        [VIDEO_H264_002_MP4])
+
+def test_mp4dash_012():
+    run_mp4dash([
+        "--encryption-key=000102030405060708090a0b0c0d0e0f:00112233445566778899aabbccddeeff:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
+        "--playready",
+        "--playready-version=4.0"],
+        "012",
+        [VIDEO_H264_002_MP4])
+
+def test_mp4dash_013():
+    run_mp4dash([
+        "--encryption-key=000102030405060708090a0b0c0d0e0f:00112233445566778899aabbccddeeff:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
+        "--playready",
+        "--playready-version=4.1"],
+        "013",
+        [VIDEO_H264_002_MP4])
+
+def test_mp4dash_014():
+    run_mp4dash([
+        "--encryption-key=000102030405060708090a0b0c0d0e0f:00112233445566778899aabbccddeeff:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
+        "--playready",
+        "--playready-version=4.2"],
+        "014",
+        [VIDEO_H264_002_MP4])
+
+def test_mp4dash_015():
+    run_mp4dash(["-d", "--profiles", "on-demand", "--hls"], "015", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_016():
+    run_mp4dash(["-d", "--subtitles"], "016", [VIDEO_H264_002_MP4])
+
+def test_mp4dash_017():
+    run_mp4dash(["-d", "--hls"], "017", [AUDIO_AAC_002_MP4])
+
+def test_mp4dash_018():
+    run_mp4dash(["-d", "--hls"], "018", [VIDEO_H264_002_MP4, AUDIO_AAC_002_MP4, AUDIO_AAC_003_MP4])
+
+def test_mp4dash_019():
+    run_mp4dash([
+        "--encryption-key=000102030405060708090a0b0c0d0e0f:00112233445566778899aabbccddeeff:random",
+        "--encryption-cenc-scheme=cbcs",
+        "--hls"],
+        "019",
+        [VIDEO_H264_002_MP4])
+
+def test_mp4dash_020():
+    run_mp4dash([
+        "-v",
+        "--encryption-key=000102030405060708090a0b0c0d0e0f:#abcdabcdabcdabcdabcdabcdabcdabcdabcdabcd:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
+        "--playready"],
+        "020",
+        [VIDEO_H264_002_MP4])

bento4-1.6.0r634.tar.gz/tasks Added

bento4-1.6.0r634.tar.gz/tasks/__init__.py Added

bento4-1.6.0r634.tar.gz/tasks/build.py Added

@@ -0,0 +1,40 @@
+import sys
+import os
+import shutil
+from invoke import task
+
+def get_target_name():
+    platform_to_target_map = {
+        'linux':  'x86_64-unknown-linux',
+        'win32':  'x86_64-microsoft-win32',
+        'darwin': 'universal-apple-macosx'
+    }
+    return platform_to_target_map[sys.platform]
+
+@task(default = True, help = { 'clean': 'Clean before building'})
+def build(ctx, clean = False):
+    target = get_target_name()
+    target_dir = "cmakebuild/{}".format(target)
+    if clean:
+        shutil.rmtree(target_dir, ignore_errors=True)
+    try:
+        os.makedirs(target_dir)
+    except:
+        pass
+    with ctx.cd(target_dir):
+        generator = ''
+        if sys.platform == 'darwin':
+            generator = '-GXcode'
+        command = "cmake {} -DCMAKE_BUILD_TYPE=Release ../..".format(generator)
+        ctx.run(command)
+        ctx.run("cmake --build . --config Release")
+
+@task(post=[build])
+def rebuild(ctx, clean = False):
+    target = get_target_name()
+    target_dir = "cmakebuild/{}".format(target)
+    shutil.rmtree(target_dir, ignore_errors=True)
+
+@task(rebuild)
+def sdk(ctx):
+    ctx.run("python Scripts/SdkPackager.py")

bento4-1.6.0r634.tar.gz/tasks/docker.py Added

@@ -0,0 +1,49 @@
+import os
+import re
+from invoke import task
+
+def get_version():
+    script_dir  = os.path.abspath(os.path.dirname(__file__))
+    bento4_home = os.path.join(script_dir,'..')
+    with open(bento4_home + '/Source/C++/Core/Ap4Version.h') as f:
+        lines = f.readlines()
+        for line in lines:
+            m = re.match(r'.*AP4_VERSION_STRING *"([0-9]*)\.([0-9]*)\.([0-9]*).*"', line)
+            if m:
+                return m.group(1) + '.' + m.group(2) + '.' + m.group(3)
+    return '0.0.0'
+
+def get_sdk_revision():
+    cmd = 'git status --porcelain -b'
+    lines = os.popen(cmd).readlines()
+    if not lines[0].startswith('## master'):
+        print('WARNING: not on master branch')
+    if len(lines) > 1:
+        print('WARNING: git status not empty')
+        print(''.join(lines))
+
+    cmd = 'git tag --contains HEAD'
+    tags = os.popen(cmd).readlines()
+    if len(tags) != 1:
+        print('ERROR: expected exactly one tag for HEAD, found', len(tags), ':', tags)
+        return None
+    version = tags[0].strip()
+    sep = version.find('-')
+    if sep < 0:
+        print('ERROR: unrecognized version string format:', version)
+    return version[sep+1:]
+
+@task(default = True)
+def build(ctx):
+    command = "docker image build -t bento4:{version}-{revision} -t bento4:latest --build-arg BENTO4_VERSION={version}-{revision} -f Build/Docker/Dockerfile .".format(version=get_version(), revision=get_sdk_revision())
+    ctx.run(command)
+
+@task
+def build_for_dev(ctx):
+    command = "docker image build -t bento4-dev:latest -f Build/Docker/Dockerfile.dev ."
+    ctx.run(command)
+
+@task
+def shell(ctx):
+    command = "docker run --rm -it -v `pwd`:/home/bento4/project -w /home/bento4/project bento4-dev bash"
+    ctx.run(command, pty=True)

bento4-1.6.0r634.tar.gz/tasks/test.py Added