Packman Build Service PMBS

Changes of Revision 20

bento4.changes Changed

bento4.spec Changed

bento4-1.6.0r637.tar.gz/.gitignore -> bento4-1.6.0r638.tar.gz/.gitignore Changed

bento4-1.6.0r637.tar.gz/Build/Docker/Dockerfile -> bento4-1.6.0r638.tar.gz/Build/Docker/Dockerfile Changed

bento4-1.6.0r637.tar.gz/Build/Makefiles/Lib.mak -> bento4-1.6.0r638.tar.gz/Build/Makefiles/Lib.mak Changed

bento4-1.6.0r637.tar.gz/Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.pbxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/universal-apple-macosx/Bento4.xcodeproj/project.pbxproj Changed

@@ -80,10 +80,17 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		A8636048224CCDCC00BBDD6A /* Ap4Eac3Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8636046224CCDCC00BBDD6A /* Ap4Eac3Parser.cpp */; };
+		A8636049224CCDCC00BBDD6A /* Ap4Eac3Parser.h in Headers */ = {isa = PBXBuildFile; fileRef = A8636047224CCDCC00BBDD6A /* Ap4Eac3Parser.h */; };
+		A8DFF208222E4970006CBAE9 /* Ap4Ac4Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8DFF206222E496F006CBAE9 /* Ap4Ac4Utils.cpp */; };
+		A8DFF209222E4970006CBAE9 /* Ap4Ac4Utils.h in Headers */ = {isa = PBXBuildFile; fileRef = A8DFF207222E4970006CBAE9 /* Ap4Ac4Utils.h */; };
+		A8DFF20C222E49A7006CBAE9 /* Ap4Ac4Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8DFF20A222E49A7006CBAE9 /* Ap4Ac4Parser.cpp */; };
+		A8DFF20D222E49A7006CBAE9 /* Ap4Ac4Parser.h in Headers */ = {isa = PBXBuildFile; fileRef = A8DFF20B222E49A7006CBAE9 /* Ap4Ac4Parser.h */; };
 		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 */; };
+		C24DAFB822F4385F008473B4 /* Ap4Ac3Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C24DAFB722F4385F008473B4 /* Ap4Ac3Parser.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 */; };
@@ -364,6 +371,8 @@
 		CAA7E6E514ACD868008AA54E /* libBento4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAA7E6C914ACD763008AA54E /* libBento4.a */; };
 		CAA88EBB10A2069900178BE3 /* Ap4NeptuneAdapters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAA88EB910A2069900178BE3 /* Ap4NeptuneAdapters.cpp */; };
 		CAA88EBC10A2069900178BE3 /* Ap4NeptuneAdapters.h in Headers */ = {isa = PBXBuildFile; fileRef = CAA88EBA10A2069900178BE3 /* Ap4NeptuneAdapters.h */; };
+		CAAE667525F5F6F600198E64 /* Ap4Av1cAtom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAAE667325F5F6F600198E64 /* Ap4Av1cAtom.cpp */; };
+		CAAE667625F5F6F600198E64 /* Ap4Av1cAtom.h in Headers */ = {isa = PBXBuildFile; fileRef = CAAE667425F5F6F600198E64 /* Ap4Av1cAtom.h */; };
 		CAB3CB790FCB35EC007C4260 /* BufferedStreamTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAB3CB6C0FCB35A8007C4260 /* BufferedStreamTest.cpp */; };
 		CAB82A091859CD7000FC4944 /* Ap4Dec3Atom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAB82A071859CD7000FC4944 /* Ap4Dec3Atom.cpp */; };
 		CAB82A0A1859CD7000FC4944 /* Ap4Dec3Atom.h in Headers */ = {isa = PBXBuildFile; fileRef = CAB82A081859CD7000FC4944 /* Ap4Dec3Atom.h */; };
@@ -1033,10 +1042,18 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		A8636046224CCDCC00BBDD6A /* Ap4Eac3Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Eac3Parser.cpp; sourceTree = "<group>"; };
+		A8636047224CCDCC00BBDD6A /* Ap4Eac3Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4Eac3Parser.h; sourceTree = "<group>"; };
+		A8DFF206222E496F006CBAE9 /* Ap4Ac4Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Ac4Utils.cpp; sourceTree = "<group>"; };
+		A8DFF207222E4970006CBAE9 /* Ap4Ac4Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4Ac4Utils.h; sourceTree = "<group>"; };
+		A8DFF20A222E49A7006CBAE9 /* Ap4Ac4Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Ac4Parser.cpp; sourceTree = "<group>"; };
+		A8DFF20B222E49A7006CBAE9 /* Ap4Ac4Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4Ac4Parser.h; sourceTree = "<group>"; };
 		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>"; };
+		C24DAFB622F43840008473B4 /* Ap4Ac3Parser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Ap4Ac3Parser.h; sourceTree = "<group>"; };
+		C24DAFB722F4385F008473B4 /* Ap4Ac3Parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Ac3Parser.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; };
@@ -1313,6 +1330,8 @@
 		CAA88EA910A2064500178BE3 /* libBento4Neptune.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBento4Neptune.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		CAA88EB910A2069900178BE3 /* Ap4NeptuneAdapters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4NeptuneAdapters.cpp; sourceTree = "<group>"; };
 		CAA88EBA10A2069900178BE3 /* Ap4NeptuneAdapters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4NeptuneAdapters.h; sourceTree = "<group>"; };
+		CAAE667325F5F6F600198E64 /* Ap4Av1cAtom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Av1cAtom.cpp; sourceTree = "<group>"; };
+		CAAE667425F5F6F600198E64 /* Ap4Av1cAtom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ap4Av1cAtom.h; sourceTree = "<group>"; };
 		CAB3CB6C0FCB35A8007C4260 /* BufferedStreamTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BufferedStreamTest.cpp; sourceTree = "<group>"; };
 		CAB3CB710FCB35B8007C4260 /* BufferedStreamTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BufferedStreamTest; sourceTree = BUILT_PRODUCTS_DIR; };
 		CAB82A071859CD7000FC4944 /* Ap4Dec3Atom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ap4Dec3Atom.cpp; sourceTree = "<group>"; };
@@ -2051,6 +2070,8 @@
 		CA93660F0B437D030067D50B /* Core */ = {
 			isa = PBXGroup;
 			children = (
+				A8DFF206222E496F006CBAE9 /* Ap4Ac4Utils.cpp */,
+				A8DFF207222E4970006CBAE9 /* Ap4Ac4Utils.h */,
 				CA5A8F8B13541628007C6EFC /* Ap4.cpp */,
 				CA9366100B437D030067D50B /* Ap4.h */,
 				CAF0104515343D5D00CCD976 /* Ap4AinfAtom.cpp */,
@@ -2062,6 +2083,8 @@
 				CA9366150B437D030067D50B /* Ap4AtomFactory.h */,
 				CA9366160B437D030067D50B /* Ap4AtomSampleTable.cpp */,
 				CA9366170B437D030067D50B /* Ap4AtomSampleTable.h */,
+				CAAE667325F5F6F600198E64 /* Ap4Av1cAtom.cpp */,
+				CAAE667425F5F6F600198E64 /* Ap4Av1cAtom.h */,
 				F9B1F4F90B54AD91003F147E /* Ap4AvccAtom.cpp */,
 				F9B1F4FA0B54AD91003F147E /* Ap4AvccAtom.h */,
 				CAF0104715343D5D00CCD976 /* Ap4BlocAtom.cpp */,
@@ -2335,6 +2358,12 @@
 		CA9367F90B4383F00067D50B /* Codecs */ = {
 			isa = PBXGroup;
 			children = (
+				C24DAFB722F4385F008473B4 /* Ap4Ac3Parser.cpp */,
+				C24DAFB622F43840008473B4 /* Ap4Ac3Parser.h */,
+				A8636046224CCDCC00BBDD6A /* Ap4Eac3Parser.cpp */,
+				A8636047224CCDCC00BBDD6A /* Ap4Eac3Parser.h */,
+				A8DFF20A222E49A7006CBAE9 /* Ap4Ac4Parser.cpp */,
+				A8DFF20B222E49A7006CBAE9 /* Ap4Ac4Parser.h */,
 				CA9367FA0B4383F00067D50B /* Ap4AdtsParser.cpp */,
 				CA9367FB0B4383F00067D50B /* Ap4AdtsParser.h */,
 				CA3EDA960D7E14D3007AE943 /* Ap4AvcParser.cpp */,
@@ -2563,6 +2592,7 @@
 				CA9366F60B437D040067D50B /* Ap4Protection.h in Headers */,
 				CA9366F70B437D040067D50B /* Ap4Results.h in Headers */,
 				CA9366F90B437D040067D50B /* Ap4RtpAtom.h in Headers */,
+				A8DFF20D222E49A7006CBAE9 /* Ap4Ac4Parser.h in Headers */,
 				CA9366FB0B437D040067D50B /* Ap4RtpHint.h in Headers */,
 				CA9366FD0B437D040067D50B /* Ap4Sample.h in Headers */,
 				CA9366FF0B437D040067D50B /* Ap4SampleDescription.h in Headers */,
@@ -2579,6 +2609,7 @@
 				CA9367130B437D040067D50B /* Ap4StsdAtom.h in Headers */,
 				CA9367150B437D040067D50B /* Ap4StssAtom.h in Headers */,
 				CA9367170B437D040067D50B /* Ap4StszAtom.h in Headers */,
+				CAAE667625F5F6F600198E64 /* Ap4Av1cAtom.h in Headers */,
 				CA9367190B437D040067D50B /* Ap4SttsAtom.h in Headers */,
 				CA93671B0B437D040067D50B /* Ap4SyntheticSampleTable.h in Headers */,
 				CA93671D0B437D040067D50B /* Ap4TimsAtom.h in Headers */,
@@ -2609,6 +2640,7 @@
 				CAA55DAC20F1306400CBAA11 /* Ap4Dac4Atom.h in Headers */,
 				CAA033320DF7D4CC0086EC1C /* Ap4Command.h in Headers */,
 				CAA033690DF7E2FA0086EC1C /* Ap4Ipmp.h in Headers */,
+				A8636049224CCDCC00BBDD6A /* Ap4Eac3Parser.h in Headers */,
 				CAEDC8E90DFF5B1100F070A8 /* Ap4Expandable.h in Headers */,
 				CAEA9E9A0E17006D008C396D /* Ap4GrpiAtom.h in Headers */,
 				CA8B6A630F66D20900720A07 /* Ap4MfhdAtom.h in Headers */,
@@ -2629,6 +2661,7 @@
 				CA8E2B431092B71E0042A0AF /* Ap4Piff.h in Headers */,
 				CA91A81310A24D38008618FE /* Ap4TfraAtom.h in Headers */,
 				CA91A84D10A29A56008618FE /* Ap4MfroAtom.h in Headers */,
+				A8DFF209222E4970006CBAE9 /* Ap4Ac4Utils.h in Headers */,
 				CAA4FF2110B2CBB3009C8F5B /* Ap4Mp4AudioInfo.h in Headers */,
 				CA39215F13AC0B36006718F0 /* Ap4Stz2Atom.h in Headers */,
 				CA5733B813B27B7500953446 /* Ap4TfdtAtom.h in Headers */,
@@ -3779,6 +3812,7 @@
 				CA9366CB0B437D040067D50B /* Ap4FtypAtom.cpp in Sources */,
 				CA9366CD0B437D040067D50B /* Ap4HdlrAtom.cpp in Sources */,
 				CA9366CF0B437D040067D50B /* Ap4HintTrackReader.cpp in Sources */,
+				CAAE667525F5F6F600198E64 /* Ap4Av1cAtom.cpp in Sources */,
 				CA9366D10B437D040067D50B /* Ap4HmhdAtom.cpp in Sources */,
 				CA9366D30B437D040067D50B /* Ap4IkmsAtom.cpp in Sources */,
 				CA9366D60B437D040067D50B /* Ap4IproAtom.cpp in Sources */,
@@ -3786,6 +3820,7 @@
 				CA9366DA0B437D040067D50B /* Ap4IsltAtom.cpp in Sources */,
 				CA9366DC0B437D040067D50B /* Ap4IsmaCryp.cpp in Sources */,
 				CA9366DF0B437D040067D50B /* Ap4MdhdAtom.cpp in Sources */,
+				A8DFF20C222E49A7006CBAE9 /* Ap4Ac4Parser.cpp in Sources */,
 				CA9366E10B437D040067D50B /* Ap4MoovAtom.cpp in Sources */,
 				CA86EED119A95C68008A3B00 /* Ap4SegmentBuilder.cpp in Sources */,
 				CA9366E30B437D040067D50B /* Ap4Movie.cpp in Sources */,
@@ -3835,7 +3870,9 @@
 				CA9368000B4383F00067D50B /* Ap4BitStream.cpp in Sources */,
 				F9B1F4FB0B54AD91003F147E /* Ap4AvccAtom.cpp in Sources */,
 				CA504D5D0C5E8A8A0060E6FE /* Ap4ElstAtom.cpp in Sources */,
+				C24DAFB822F4385F008473B4 /* Ap4Ac3Parser.cpp in Sources */,
 				CAFE9C621D1B482700F9FF67 /* Ap4StdCFileByteStream.cpp in Sources */,
+				A8DFF208222E4970006CBAE9 /* Ap4Ac4Utils.cpp in Sources */,
 				CA1221CF0CA7192B000BEEF6 /* Ap4FileCopier.cpp in Sources */,
 				CA28981A0D87DA81006A758B /* Ap4UuidAtom.cpp in Sources */,
 				CA2898860D8979B0006A758B /* Ap4ObjectDescriptor.cpp in Sources */,
@@ -3870,6 +3907,7 @@
 				CAA4FF2010B2CBB3009C8F5B /* Ap4Mp4AudioInfo.cpp in Sources */,
 				CAC51D76129708CB00AE5CF9 /* Ap4PosixRandom.cpp in Sources */,
 				CA5A8F8C13541628007C6EFC /* Ap4.cpp in Sources */,
+				A8636048224CCDCC00BBDD6A /* Ap4Eac3Parser.cpp in Sources */,
 				CA39215E13AC0B36006718F0 /* Ap4Stz2Atom.cpp in Sources */,
 				CAF9811218DBE48F0001B999 /* Ap4NalParser.cpp in Sources */,
 				CA5733B713B27B7500953446 /* Ap4TfdtAtom.cpp in Sources */,

bento4-1.6.0r637.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj Changed

@@ -82,11 +82,15 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.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\Ap4Ac4Utils.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.cpp" />
@@ -211,12 +215,16 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.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\Ap4Ac4Utils.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.h" />

bento4-1.6.0r637.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj.filters -> bento4-1.6.0r638.tar.gz/Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj.filters Changed

@@ -390,6 +390,18 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -797,11 +809,23 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2015/Bento4/Bento4.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2015/Bento4/Bento4.vcxproj Changed

@@ -148,14 +148,20 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.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\Ap4Ac4Utils.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\Ap4VpccAtom.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" />
@@ -275,15 +281,21 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.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\Ap4Ac4Utils.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\Ap4VpccAtom.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" />

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2015/Bento4/Bento4.vcxproj.filters -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2015/Bento4/Bento4.vcxproj.filters Changed

@@ -390,6 +390,24 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4.h">
@@ -791,5 +809,23 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac4Atom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Aac2Mp4/Aac2Mp4.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Aac2Mp4/Aac2Mp4.vcxproj Changed

@@ -76,7 +76,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -103,6 +104,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>
@@ -120,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>
@@ -139,6 +142,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)aac2mp4.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/AvcTrackWriterTest/AvcTrackWriterTest.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/AvcTrackWriterTest/AvcTrackWriterTest.vcxproj Changed

@@ -79,7 +79,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -104,6 +105,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -119,6 +121,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -137,6 +140,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj Changed

@@ -73,7 +73,8 @@
       <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>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -101,6 +102,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+      <MinimalRebuild />
     </ClCompile>
     <Lib>
       <OutputFile>$(OutDir)Bento4.lib</OutputFile>
@@ -118,6 +120,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+      <MinimalRebuild />
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
@@ -138,6 +141,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <DisableSpecificWarnings>4345;4355</DisableSpecificWarnings>
+      <MinimalRebuild />
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
@@ -148,12 +152,17 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.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\Ap4Ac4Utils.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Av1cAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.cpp" />
@@ -277,13 +286,18 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VmhdAtom.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4AvcParser.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.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\Ap4Ac4Utils.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4AinfAtom.h" />
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Av1cAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4BlocAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4CommonEncryption.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Dac3Atom.h" />

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj.filters -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj.filters Changed

@@ -396,6 +396,21 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Av1cAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4.h">
@@ -803,5 +818,20 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4VpccAtom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Av1cAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac3Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Ac4Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4CDll/Bento4CDll.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Bento4CDll/Bento4CDll.vcxproj Changed

@@ -79,7 +79,8 @@
       <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>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -107,6 +108,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>
@@ -124,6 +126,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>
@@ -144,6 +147,7 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4099;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>Bento4CDll.def</ModuleDefinitionFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/CryptoTest/CryptoTest.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/CryptoTest/CryptoTest.vcxproj Changed

@@ -79,7 +79,8 @@
       <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>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -104,6 +105,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -120,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -141,6 +144,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FixAacSampleDescription/FixAacSampleDescription.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FixAacSampleDescription/FixAacSampleDescription.vcxproj Changed

@@ -79,7 +79,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\MetaData;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -104,6 +105,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -119,6 +121,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -137,6 +140,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FragmentBuilderTest/FragmentBuilderTest.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/FragmentBuilderTest/FragmentBuilderTest.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -107,6 +108,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -124,6 +126,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -143,6 +146,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Aac/Mp42Aac.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Aac/Mp42Aac.vcxproj Changed

@@ -94,6 +94,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -127,6 +128,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -159,6 +161,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -190,6 +193,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Hls/Mp42Hls.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Hls/Mp42Hls.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +149,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;..\..\..\..\Source\C++\Crypto</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Ts/Mp42Ts.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp42Ts/Mp42Ts.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +149,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Compact/Mp4Compact.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Compact/Mp4Compact.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +149,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4DcfPackager/Mp4DcfPackager.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4DcfPackager/Mp4DcfPackager.vcxproj Changed

@@ -79,7 +79,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -105,6 +106,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>
@@ -121,6 +123,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>
@@ -140,6 +143,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4dcfpackager.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Decrypt/Mp4Decrypt.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Decrypt/Mp4Decrypt.vcxproj Changed

@@ -76,7 +76,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -103,6 +104,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>
@@ -120,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>
@@ -139,6 +142,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4decrypt.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump/Mp4Dump.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Dump/Mp4Dump.vcxproj Changed

@@ -96,6 +96,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -129,6 +130,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -164,6 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -204,6 +207,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Edit/Mp4Edit.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Edit/Mp4Edit.vcxproj Changed

@@ -76,7 +76,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -103,6 +104,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4edit.exe</OutputFile>
@@ -120,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4edit.exe</OutputFile>
@@ -139,6 +142,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4edit.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Encrypt/Mp4Encrypt.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Encrypt/Mp4Encrypt.vcxproj Changed

@@ -76,7 +76,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -103,6 +104,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>
@@ -120,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>
@@ -139,6 +142,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4encrypt.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Extract/Mp4Extract.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Extract/Mp4Extract.vcxproj Changed

@@ -76,7 +76,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>
@@ -103,6 +104,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4extract.exe</OutputFile>
@@ -120,6 +122,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4extract.exe</OutputFile>
@@ -139,6 +142,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4extract.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Fragment/Mp4Fragment.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Fragment/Mp4Fragment.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +149,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Info/Mp4Info.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Info/Mp4Info.vcxproj Changed

@@ -95,6 +95,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -135,6 +136,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -174,6 +176,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -211,6 +214,7 @@
       <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <MinimalRebuild />
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Mux/Mp4Mux.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Mux/Mp4Mux.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +149,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4RtpHintInfo/Mp4RtpHintInfo.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4RtpHintInfo/Mp4RtpHintInfo.vcxproj Changed

@@ -76,7 +76,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -105,6 +106,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>
@@ -123,6 +125,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>
@@ -143,6 +146,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4rtphintinfo.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Split/Mp4Split.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Split/Mp4Split.vcxproj Changed

@@ -92,6 +92,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -108,6 +109,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -126,6 +128,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -146,6 +149,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Tag/Mp4Tag.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/Mp4Tag/Mp4Tag.vcxproj Changed

@@ -77,7 +77,8 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\Source\C++\Core;..\..\..\..\Source\C++\MetaData;..\..\..\..\Source\C++\Codecs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -106,6 +107,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4tag.exe</OutputFile>
@@ -129,6 +131,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4tag.exe</OutputFile>
@@ -154,6 +157,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)mp4tag.exe</OutputFile>

bento4-1.6.0r637.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/PassthroughWriterTest/PassthroughWriterTest.vcxproj -> bento4-1.6.0r638.tar.gz/Build/Targets/x86_64-microsoft-win32-vs2019/PassthroughWriterTest/PassthroughWriterTest.vcxproj Changed

bento4-1.6.0r637.tar.gz/Documents/MkDocs/mkdocs.yml -> bento4-1.6.0r638.tar.gz/Documents/MkDocs/mkdocs.yml Changed

@@ -1,19 +1,58 @@
 site_name: Bento4
 
-use_directory_urls: false
+use_directory_urls: true
 
 nav:
   - Home: index.md
+  - Documentation:
+    - Overview: documentation/index.md
+    - MPEG DASH: 
+      - Getting Started: developers/dash/index.md
+      - Encryption & DRM: developers/dash/encryption_and_drm.md
+      - Multi Bitrate Audio: developers/dash/multi_bitrate_audio.md
+      - Codecs: developers/dash/codecs.md
+      - Subtitles: developers/dash/subtitles.md
+      - Sample Content: developers/dash/sample_content.md
+    - HLS: developers/hls/index.md
+    - CMAF: developers/cmaf/index.md
+    - Tools:
+      - mp4info: documentation/mp4info.md
+      - mp4dump: documentation/mp4dump.md
+      - mp4edit: documentation/mp4edit.md
+      - mp4extract: documentation/mp4extract.md
+      - mp4encrypt: documentation/mp4encrypt.md
+      - mp4decrypt: documentation/mp4decrypt.md
+      - mp4dcfpackager: documentation/mp4dcfpackager.md
+      - mp4compact: documentation/mp4compact.md
+      - mp4fragment: documentation/mp4fragment.md
+      - mp4split: documentation/mp4split.md
+      - mp4tag: documentation/mp4tag.md
+      - mp4mux: documentation/mp4mux.md
+      - mp42aac: documentation/mp42aac.md
+      - mp42avc: documentation/mp42avc.md
+      - mp42hevc: documentation/mp42hevc.md
+      - mp42hls: documentation/mp42hls.md
+      - mp42ts: documentation/mp42ts.md
+      - mp4dash: documentation/mp4dash.md
+      - mp4dashclone: documentation/mp4dashclone.md
+      - mp4hls: documentation/mp4hls.md
+  - Developers: developers/index.md
+  - Downloads: downloads.md
+  - Support: support.md
+  - About: about.md
 
 copyright: © 2020 Axiomatic Systems, LLC. All rights reserved.
 
 theme:
   name: 'material'
   logo: 'images/bento4-small.jpg'
+  favicon: 'images/favicon.png'
   custom_dir: 'theme'
 
 docs_dir: 'src'
 
+edit_uri: ''
+
 # Repo info
 repo_name: axiomatic-systems/Bento4
 repo_url: https://github.com/axiomatic-systems/Bento4
@@ -24,6 +63,9 @@
   - attr_list
   - pymdownx.details
   - pymdownx.superfences
+  - pymdownx.emoji:
+      emoji_index: !!python/name:materialx.emoji.twemoji
+      emoji_generator: !!python/name:materialx.emoji.to_svg
   - codehilite:
       guess_lang: false
   - toc:

bento4-1.6.0r637.tar.gz/Documents/MkDocs/requirements.txt -> bento4-1.6.0r638.tar.gz/Documents/MkDocs/requirements.txt Changed

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/about.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/cmaf Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/cmaf/index.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash/codecs.md Added

@@ -0,0 +1,29 @@
+MPEG DASH & CODECS
+==================
+
+An MPEG DASH presentation includes one more media steams, each containing encoded media. The specifics of how the media is encoded is referred to as a "codec" (COder DECoder). The Bento4 tools support a large number of codecs, most of which are handled in the same way, but some may have codec-specific options.
+
+# Video Codecs
+
+The two most most common codecs you are likely to work with are H.264 (a.k.a AVC, or "Advanced Video Coding"), and H.265 (a.k.a HEVC, or "High Efficiency Video Coding"). A more recent addition to the codec landscape is the AV1 codec ("AOMedia Video 1"). In all cases, the input files for the `mp4dash` packager are in MP4 format, which includes codec metadata and media samples.
+
+## HDR
+
+Some video streams may include extensions that encode extra information that allow the video to be displayed with a higher dynamic range. This is often called HDR ("High Dynamic Range"). The most common extensions/formats are Dolby Vision and HDR10.
+
+### Dolby Vision
+
+### HDR10
+
+# Audio Codecs
+
+The most common audio codec for MP4 files is AAC ("Advanced Audio Coding"), including it different "modes": HE-AAC v1 and HE-AAC v2 ("High-Efficiency AAC"), and more recently xHE-AAC ("Extended High Efficiency AAC").
+
+## Multi Channel Audio
+Some codecs support encoding more than two channels. Multi-channel streams are often labled as X.Y, where X is the number of full-bandwidth audio channels, and Y is the number of low-frequency channels, like, for example "5.1".
+While AAC does have multi-channel support, it is much more common to see Dolby or DTS codecs used for multi-channel audio. This includes Dolby AC-3 (a.k.a "Dolby Digital"), Dolby E-AC-3 (a.k.a "Dolby Digital Plus"), Dolby AC-4 and Dolby Atmos.
+
+Because not all players/decoders support all codecs, it is usually recommended to always include at least one AAC audio stream in an MPEG DASH presentation, which all players should be able to handle.
+
+## Multi Bitrate Audio
+See the [Multi Bitrate Audio page](multi_bitrate_audio.md)
\ No newline at end of file

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash/encryption_and_drm.md Added

@@ -0,0 +1,80 @@
+MPEG DASH ENCRYPTION AND DRM
+============================
+
+# Encrypting The Media
+
+MPEG DASH supports a Common Encryption mode (CENC), which is implemented by Bento4. The simplest way to produce encrypted MPEG DASH streams is to instruct `mp4dash` to perform the encryption for you automatically, by using the `--encryption-key` option. This is the easiest option, as it will internally call the `mp4encrypt` tool with the right parameters. Encrypted MPEG DASH presentations should also include the proper signaling in the MPD to inform the player of what DRM(s) can be used to obtain the decryption keys for the streams. An MPD can contain DRM signaling for several DRMs (either just one or multiple entries if the same stream can reach players with different DRM technologies).
+
+## Marlin DRM
+
+When using Marlin DRM, you may request that the proper signaling be inserted in the MPD by using the `--marlin` option.
+
+!!! example
+    With a KID = `121a0fca0f1b475b8910297fa8e0a07e`, an encryption KEY = `a0a1a2a3a4a5a6a7a8a9aaabacadaeaf` you would package a multi-bitrate presentation, with input video files `source_400kbps.mp4` and `source_800kbps.mp4` using a command-line like:
+
+    ```
+    mp4dash --marlin --encryption-key=121a0fca0f1b475b8910297fa8e0a07e:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf source_400kbps.mp4 source_800kbps.mp4
+    ```
+
+## PlayReady DRM
+
+When using PlayReady DRM, the DRM signaling is in the form of a PlayReady Header Object (PRO). This header object includes fields like the license acquisition URL (LA_URL), the KID, and other fields. There are 2 places where the PRO can be conveyed:
+
+  * a PSSH box in the init segment(s)
+  * a `<ContentProtection>` element in the MPD
+
+With most PlayReady DASH clients, it is a requirement that at least the init segment PSSH box be present (when it is not, some players will not correctly detect that the media is encrypted). The Bento4 tools will automatically insert a PlayReady PSSH box in the init segments. If a PRO is found in the MPD, it takes priority over a PRO in an init segment PSSH box. Finally, PlayReady-enabled players often have an API that allows the playback application to override the License Acquisition URL field of the PRO, and/or the CustomData field. The PlayReady Header Object (PRO) can be provided in one of 3 ways, using the `--playready-header` command line option:
+
+  * Stored in a file that contains the binary representation of the PRO
+  * Directly as a command-line argument, encoded in Base64
+  * By specifying individual fields, like `LA_URL`, and letting the tool construct the binary representation of the PRO.
+
+See the [command line argument help page](../../documentation/mp4dash.md) for details. The most flexible option is to specify the PRO from individual fields.
+Typically, only the `LA_URL` field is required, and it is set to the License Acquistion URL for your PlayReady server (consult your DRM provider for details if you use an online DRM service provider).
+
+!!! warning "IMPORTANT NOTE"
+    some PlayReady players are not fully compliant with the specification, in that they do not support content encrypted with 16-byte IVs. This is a known implementation defect of clients like SilverLight-based players. In order to be compatible with those players, it is necessary to use a special encryption option that instructs the encrypter to use 8-byte IVs in stead of the default 16-byte IVs. This is done automatically by the Bento4 tool when any of the PlayReady command line options are specified. If you want to encrypt content this way even when not using PlayReady, this can be done using the `--global-option mpeg-cenc.piff-compatible:true` option of `mp4encrypt`, or by simply using the `mp4dash` command line option: `--encryption-args="--global-option mpeg-cenc.piff-compatible:true"`.
+
+!!! example
+    With a KID = `09e367028f33436ca5dd60ffe6671e70`, an encryption KEY = `b42ca3172ee4e69bf51848a59db9cd13` and a License Acquisition URL = `http://playready.directtaps.net/pr/svc/rightsmanager.asmx`, you would package a single video file `video-source.mp4` using a command line like:
+
+    ```
+    mp4dash --encryption-key=09e367028f33436ca5dd60ffe6671e70:b42ca3172ee4e69bf51848a59db9cd13 --playready-header=LA_URL:http://playready.directtaps.net/pr/svc/rightsmanager.asmx video-source.mp4
+    ```
+
+## Widevine DRM
+
+For Widevine, the `--widevine-header` option is used to specify the value of the Widevine DRM data. This can be directly the content of a PSSH box (obtained from a key server for example), expressed as a # sign followed by the hex-encoded PSSH payload data, or as a set of `name:value` pairs.
+
+!!! example
+    With a KID = `90351951686b5e1ba222439ecec1f12a`, an encryption KEY = `0a237b0752cbf1a827e2fecfb87479a2`, a Widevine Service Provider ID = `widevine_test`, and a content ID = `*` (2a in hexadecimal), you would package a single video file `video-source.mp4` using a command line like:
+    ```
+    mp4dash --widevine-header provider:widevine_test#content_id:2a --encryption-key 90351951686b5e1ba222439ecec1f12a:0a237b0752cbf1a827e2fecfb87479a2 video-source.mp4
+    ```
+    or with an externally-generated PSSH payload:
+    ```
+    mp4dash --widevine-header "#CAESEJA1GVFoa14boiJDns7B8SoaDXdpZGV2aW5lX3Rlc3QiASo=" --encryption-key 90351951686b5e1ba222439ecec1f12a:0a237b0752cbf1a827e2fecfb87479a2 video-source.mp4
+    ```
+
+## FairPlay DRM
+
+## Multiple DRMs at the same time
+
+You can produce a DASH output that is compatible with multiple DRMs at the same time. Simply combine the DRM-specific options documented above.
+
+!!! example  "Example: Marlin, PlayReady and Widevine"
+    ```
+    mp4dash --encryption-key=09e367028f33436ca5dd60ffe6671e70:b42ca3172ee4e69bf51848a59db9cd13 --marlin --playready-header=LA_URL:http://playready.directtaps.net/pr/svc/rightsmanager.asmx --widevine-header=provider:widevine_test#content_id:2a video-source.mp4
+    ```
+
+## Encrypting as a Separate Step
+
+If you need more precise control over encryption (for example only encryption certain tracks and not others, or use special options), you can encrypt the media before using `mp4dash`. This is done by calling `mp4encrypt` directly on the input files before calling `mp4dash`. The `mp4encrypt` command line tool will allow you to encrypt an MP4 video in MPEG DASH CENC mode.
+
+!!! example
+    ```
+    mp4encrypt --method MPEG-CENC --key 1:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf:0123456789abcdef --property 1:KID:121a0fca0f1b475b8910297fa8e0a07e --key 2:a0a1a2a3a4a5a6a7a8a9aaabacadaeaf:aaaaaaaabbbbbbbb --property 2:KID:121a0fca0f1b475b8910297fa8e0a07e hbb_578kbps.mp4 hbb_578kbps-cenc.mp4
+    ```
+
+!!! note
+    The source video needs to be a fragmented MP4 file. If your source is not fragmented, you can use `mp4fragment` to convert it to a fragmented file.
\ No newline at end of file

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash/index.md Added

@@ -0,0 +1,215 @@
+MPEG DASH Adaptive Streaming
+============================
+
+# Specifications
+
+MPEG DASH is MPEG’s standardized **D**ynamic **A**daptive **S**treaming over **H**TTP. It is specified in the following international standards:
+
+  * ISO/IEC 23009-1 specifies the overall DASH architecture and the XML syntax for the MPD (Media Presentation Document)
+  * ISO/IEC 23001-7 specifies the Common Encryption for MP4 fragments
+  * ISO/IEC 14496-12/AMD 3 specifies the extensions to 14496-12 that are necessary to support DASH with fragmented MP4 media
+
+# Quick introduction to MPEG DASH
+
+At a high level, an MPEG DASH presentation consists of an initial XML manfifest, called the **Media Presentation Document** (MPD for short), which describes media segments that form a complete presentation. Along with a number of attributes, the MPD allows the MPEG DASH player to compute the URL of each segment, and to download and render them.
+The `mp4dash` tool takes care of creating the DASH MPD document, as well as packaging the media segment in their proper form and output location, including pre- and post- processing if necessary (like encryption for DRM support).
+
+# Using the `mp4dash` packager tool
+
+`mp4dash` is the name of the Bento4 tool that can convert one or more input media files into a complete MPEG DASH presentation. 
+
+!!! tip "Using `mp4dash` for HLS as well"
+    Recent versions of the HLS specification support uusing MP4 fragments. Since those fragments are essentially the same as those used for MPEG DASH, the `mp4dash` tool can be used to output HLS presentations as well as DASH, from a single set of input files. Use the `--hls` option to enable that mode. See the [HLS](../hls/index.md) page for more details.
+
+Running this tool requires that you have python version 3.7 or above installed on your system (python 2.x is no longer supported). Please visit [www.python.org](https://www.python.org) if you need to install python.
+
+!!! note "Python on Windows"
+    On Windows, the launch scripts assume that python3 is launched with the command python, but on all other systems, the command python3 is used.
+
+If you are using the Bento4 precompiled SDK distribution, you will find it convenient to use the `mp4dash` command, located in the `bin/` directory, which will automatically run the `mp4-dash.py` python script for you. If you are running from a source distribution, you may need to invoke the python script (located under `Source/Python/utils`) directly, like this:
+
+```bash
+python3 <path-to-bento4-python-utils>/mp4-dash.py <arguments>
+```
+
+In the examples below, we assume that you are running from a standard precompiled distribution, thus we will simply use the `mp4dash` command.
+
+!!! tip "Running with self-compiled binaries"
+    The `mp4dash` tool needs to invoke the Bento4 command line binaries `mp4dump`, `mp4encrypt`, `mp4info`, and `mp4split`. If you are invoking the tool as distributed in the pre-compiled SDK, the binaries will automatically be found in the SDK package as installed. If you are running the tool from the Source SDK, with binaries that you compiled from the source, so you’ll need to use the `--exec-dir` option to specify the directory where your built binaries reside (platform dependent).
+
+If you just run the `mp4dash` tool with no arguments, it will print out the options that are supported.
+For a complete list of command line options for `mp4dash`, visit the [mp4dash](../../documentation/mp4dash.md) command line details page.
+
+## Preparing the input files
+
+To create DASH MP4 content, you need to start with fragmented MP4 files. The input files you will be working with may or may not already be in fragmented MP4 form. Ideally, your encoder will already produce MP4 files that way.
+The command line tool `mp4info` can tell you if an MP4 file is fragmented or not: here’s an example of what you would see in the `Movie:` part of the `mp4info` output for a non-fragmented MP4 file (the line `fragments: no`)
+
+```
+Movie:
+    duration:   147188 ms
+    time scale: 2997
+    fragments:  no
+
+Found 2 Tracks
+```
+
+If you have non-fragmented MP4 files, you can use the mp4fragment tool to fragment them.
+
+!!! example "`mp4fragment` example"
+    ```
+    mp4fragment video.mp4 video-fragmented.mp4
+    ```
+  
+### Dealing with ISMV and ISMA input files
+
+ISMV and ISMA files are basically fragmented MP4 files, and as such can be used as input to `mp4dash`. However, most legacy tools (encoder and packagers) that produce ISMV and ISMA files generate fragmented MP4 files that lack a `tfdt` timestamp box. While these files appear to be normal fragmented MP4 files, the lack of tfdt renders those media files unsuitable for playback with many DASH clients, including most HTML5 based clients.
+If you have such files, you can fix this problem by refragmenting your ISMV and ISMA files into compliant fragmented MP4 files, using the `mp4fragment` tool.
+
+!!! example "Example: re-fragmenting ISMV/ISMA files"
+    ```
+    mp4fragment video.ismv video.mp4
+    ```
+
+    This should print something like
+
+    ```
+    NOTICE: file is already fragmented, it will be re-fragmented 
+    found regular I-frame interval: 1 frames (at 25.000 frames per second)
+    ```
+
+    You can then use the re-fragmented files as input to mp4dash.
+
+!!! tip
+    You can tell whether your fragmented input file has a tfdt box or not by using mp4dump.
+    A file with tfdt will show entries like this:
+
+    ```
+    [moof] size=8+816
+    [mfhd] size=12+4
+        sequence number = 490
+    [traf] size=8+792
+        [tfhd] size=12+4, flags=20000
+        track ID = 2
+        [tfdt] size=12+8, version=1
+        base media decode time = 32281600
+        [trun] size=12+744, flags=301
+        sample count = 92
+        data offset = 832
+    ```
+    with a tfdt box as a child of the traf container box
+
+## Generating a DASH presentation
+
+Once you have fragmented MP4 files to work with as input, you can generate a DASH presentation, including an MPD and media files or media segments. For single-bitrate streaming, a single MP4 file is required. 
+The general usage for the `mp4dash` tool is: `mpdash <input files>`, which produces a DASH presentation in an output directory (`output` by default), including the MPD file that points to the media segments (`output/stream.mpd` by default).
+
+### Single Bitrate
+
+!!! example "Example: single MP4 input file"
+    ```
+    mp4dash video.mp4
+    ``` 
+
+### Multiple Bitrates
+
+While it is entirely possible to use MPEG DASH for simple, single-bitrate Audio/Video streams, multi-bitrate support is where MPEG DASH shines. The most common use case is to package multiple video streams, each encoded at a different bitrate, into a single presentation, where the player will adaptively switch between segments of the different streams depending on the network and playback conditions.
+When supplying multiple video streams as input (one video track per input file) to `mp4dash`, it is important that the files have been encoded in a way that is compatible for this use case. You will need a set of MP4 files that have been encoded with closed GOPs (Group Of Pictures) with equal durations. Also, the audio tracks in all the files should be encoded with the same parameters. Once you have your input files, you can use the `mp4dash` tool to automatically generate the DASH MPD and, optionally, split the MP4 file into individual file segments.
+
+!!! example "Example: multi-bitrate set of MP4 files"
+    ```
+    mp4dash video_1000.mp4 video_2000.mp4 video_3000.mp4
+    ```
+
+Codecs other than xHE-AAC aren't well suited for seamless dynamic bitrate switching, so when using traditional codecs like AAC or Dolby Digital, it is usually the case that a single audio stream (per codec) will be present as input. If more than one input includes an audio track (which may be expected with multi-bitrate packaging, where each of the input files may contain both an audio and video track), only one of the audio tracks will be retained, unless they differ by more than 10% in bitrate.
+For the xHE-AAC codec, however, seamless dynamic bitrate switching is possible. For more details on how to support that use case, read the [Multi Bitrate Audio page](multi_bitrate_audio.md).
+
+## Advanced usage
+
+### Input specifiers
+
+The name of input files may be preceded by an input qualifier, which can be used for stream selection as well as setting properties for the input. The general syntax for input qualifiers is: `[<selector-name>=<selector-value>,+<property-name>=<property-value>,...]`.
+
+#### Selectors
+
+By default, `mp4dash` will create an output that contains all the audio tracks found in its each input, as well as one video track from each input (it is assumed that each input file only has one video track, but multi-track input files may still be used, using a selector to select one of the tracks). It is possible to limit the selected tracks by using input stream selectors.
+The supported selectors are:
+
+  Selector   | Value                                     | Descripton
+  -----------|-------------------------------------------|--------------------------------------------------------
+  `type`     | `audio` or `video`                        | Select the `audio` or `video` track only from the input 
+  `track`    | `<track-id>` (integer)                    | Select track ID <track-id> only from the input
+  `language` | `<language-code>` (2 or 3 character code) | Only keep audio tracks with a specific language
+  
+#### Properties
+
+Setting stream properties via input specifiers allows invoking `mp4dash` with extra information about the input that may not be otherwise inferred, or should override some of the streams' properties. This can be used, for example, to override the language code for an audio track, or specify labels or group names.
+
+  Property            | Value                                     | Description
+  --------------------|-------------------------------------------|--------------------------
+  `language`          | `<language-code>` (2 or 3 character code) | Set/override the language code for an input
+  `language_name`     | `<language-name>` (string)                | Set the language name (i.e human-readable string for the language) for an input
+  `representation_id` | `<representation-id>` (string)            | |
+  `scan_type`         | `<scan-type>` (string)                    | |
+  `label`             | `<label>` (string)                        | |
+  `key`               | `<key>` (hex string)                      | |
+  `hls_group`         | `<hls-group>` (string)                    | (only with `--hls`  |
+  `hls_group_match`   | `<hls-group-match>`                       | (only with `--hls`) |
+  `hls_default`       | `YES` or `NO`                             | (only with `--hls`) |
+  `hls_autoselect`    | `YES` or `NO`                             | (only with `--hls`) |
+
+### Multi-language
+
+Use a `language=<language-code>` selector to select one of the audio tracks. The language code  is a 2 or 3 letter code as defined by the DASH specification – (see [RFC 5646](https://datatracker.ietf.org/doc/html/rfc5646)]. It is possible to combine the language selector with a type selector, by separating the two by a comma (ex: `[type=audio,language=fr]`). If the language selector is used by itself without a type selector, the video track as well as the matching audio track will be selected.
+
+#### Examples
+
+!!! example
+    Select the French audio track and the video track from video.mp4:
+
+    ```
+    mp4dash [language=fr]video.mp4
+    ```
+
+!!! example
+    Select the French audio track from `video1.mp4` and the video track from `video2.mp4`:
+
+    ```
+    mp4dash [type=audio,language=fr]video1.mp4 [type=video]video2.mp4
+    ```
+
+!!! example
+    Select track ID 3 from video1.mp4 and all tracks from video2.mp4:
+
+    ```
+    mp4dash [track=3]video1.mp4 video2.mp4
+    ```
+
+!!! example
+    Select the track with `undefined` language from `video1.mp4` and remap the language to `fr`
+
+    ```
+    mp4dash --language-map=und:fr [language=und]video1.mp4
+    ```
+
+!!! tip
+    Using the `--verbose` option may be useful when debugging language selection options
+
+### Encryption and DRM
+
+MPEG DASH streams can be encrypted, and played on clients that have a DRM-enabled DASH player.
+Visit the [MPEG DASH Encryption & DRM page](encryption_and_drm.md) for details.
+
+### Codec Support
+
+The `mp4dash` packager supports input files with streams encoded with a variety of difference codecs. For details on what's supported and what options may be used, read the [Codecs page](codecs.md).
+
+# Serving DASH Streams
+
+By default, `mp4dash` produces an output that can be served by any regular HTTP server. In order to make this possible, each one of the media segments and the init segments are stored in separate files. The MPD then refers to relative URLs for those files. Care should be taken to configure the HTTP server to return the correct `Content-Type` for the MPD document and segment files. The MPD document (named `stream.mpd` by default by the `mp4dash` tool) should be served with `Content-Type: application/dash+xml` and the init and media segments should be served with a `Content-Type: video/mp4`
+
+## Serving DASH without splitting segments
+
+For players that support the "on demand" profile, input files can be kept as single files on the server, and the players use an index embedded in the files to access individual segments using HTTP range requests. 
+For the "live" profile, however, there is no such embedded index. With special support from the server, it is possible to serve such DASH streams without splitting the segments into individual files. This is achieved by having a server-side module that can virtualize URLs, so as to be able to expose each segment as an separate URL, mapping it back to a byte range in a source file when requests are made. MPEG does not specify a common standard for such URL virtualization. Each server that supports this model is free do do it any way it chooses. For example, the Microsoft IIS server can be used with a IIS Media Services extension for Smooth Streaming to deliver MPEG DASH streams. More details can be found on the Serving MPEG DASH with Microsoft IIS page. Another useful way to do the same thing is to use the open-source [Hippo Media Server](https://github.com/barbibulle/hippo) package, which knows how to virtualize URLs for MPEG DASH and Smooth Streaming.
+The `--hippo` option of `mp4dash` is used to generate the server-side manifest needed by the Hippo Media Server.
\ No newline at end of file

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash/multi_bitrate_audio.md Added

@@ -0,0 +1,51 @@
+MULTI-BITRATE AUDIO
+===================
+
+The most common use of MPEG DASH is for delivering adaptive streaming presentations to players. The adaptive part is achieved by offering the same video streams encoded at different bitrates (and typically different resolutions). When properly encoded, the segments of media for the different video bitrates are such that seamless transition from one bitrate set to another can be done on-the-fly without glitches. 
+
+For audio, however, it is typical to only have one bitrate. Offering multiple audio variants is often limited to offering a choice of stereo and multi-channel audio, where the stereo stream is usually encoded with AAC, and the multi-channel stream(s) with Dolby Digital or similar. The main reason for only having a single bitrate is the fact that with AAC and other codecs, seamless transition between audio streams encoded at different bitrates isn't easy or even possible. A second reason is that the audio bitrate is usually much lower than the video bitrate, so varrying the audio bitrate doesn't offer much of a difference in terms of the absolute total bitrate that the player has to receive.
+
+With new generations of codecs, like xHE-AAC ("Extended High Efficiency AAC"), which combines the MPEG-D USAC standard (ISO/IEC 23003-3)) and appropriate parts of the MPEG-D DRC Loudness Control Profile or Dynamic Range Control Profile, it is now possible to offer audio encoded at different bitrates, and allow the player to seamlessly switch between the different bitrates on the fly.
+
+The `mp4dash` tool supports input audio files that are encoded with xHE-AAC.
+
+# xHE-AAC with MPEG DASH
+
+No special option is needed when creating an MPEG DASH presentation with xHE-AAC audio tracks. Simply pass all the audio files as input to the packager, along with any video files if applicable.
+
+!!! example "Example: 4 audio bitrates and 2 video bitrates"
+    ```
+    mp4dash audio-16kbps.mp4 audio_32kbps.mp4 audio-64kbps.mp4 audio-128kbps.mp4 video-500kbps.mp4 video-2000kbps.mp4
+    ```
+
+# xHE-AAC with HLS
+
+With HLS, more precise control may be needed. With HLS, every possible combination of audio and video streams must be listed explicitly in the playlist (as opposed to MPEG DASH, where the audio and video streams are listed separately in the manifest, and it is up to the player to pick the right combination of audio and video streams).
+
+By default, the `mp4dash` packager, when creating the HLS playlist, will list all possible combinations of audio and video streams. This means that if you have N audio streams and M video streams, the HLS playlist will have N*M `#EXT-X-STREAM-INF` entries, one for each possible (audio,video) pair.
+If you need more control over the different combinations listed in the playlist, you can use the `hls_group` and `hls_group_match` input specifiers. The `hls_group` specifier for audio input files assigns a group name to the audio track. The `hls_group_match` specifier for video input files specifies which should be combined with that video track If `hls_group_match` is not set, or set to `*`, all audio groups will be combined with the video track.
+
+!!! example "Example: audio-only, 4 bitrates"
+    ```
+    mp4dash --hls audio-16kbps.mp4 audio-32kbps.mp4 audio-64kbps.mp4 audio-128kbps.mp4
+    ```
+
+!!! example "Example: 4 audio bitrates, 1 video bitrate"
+    ```
+    mp4dash --hls audio-16kbps.mp4 audio-32kbps.mp4 audio-64kbps.mp4 audio-128kbps.mp4 video_00500.mp4
+    ```
+    The playlist will have 4 `#EXT-X-STREAM-INF` entries
+
+!!! example "Example: 4 audio bitrates, 3 video bitrates, all combinations listed"
+    ```
+    mp4dash --hls audio-16kbps.mp4 audio-32kbps.mp4 audio-64kbps.mp4 audio-128kbps.mp4 video_00500.mp4 video_00800.mp4 video_01400.mp4
+    ```
+    The playlist will have 12 `#EXT-X-STREAM-INF` entries
+
+!!! example "Example: 4 audio bitrates, 3 video bitrates, with only the lowest bitrate video combined with multiple audio bitrates"
+    ```
+    mp4dash --hls [+hls_group=audio_16]audio-16kbps.mp4 [+hls_group=audio_32]audio-32kbps.mp4 [+hls_group=audio_64]audio-64kbps.mp4 [+hls_group=audio_128]audio-128kbps.mp4 "[+hls_group_match=audio_16&audio_32&audio_64&audio_128]video_00500.mp4" video_00800.mp4 video_01400.mp4
+    ```
+    The playlist will have 4 `#EXT-X-STREAM-INF` entries
+
+

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash/sample_content.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/dash/subtitles.md Added

@@ -0,0 +1,61 @@
+MPEG DASH SUBTITLES
+===================
+
+The `mp4dash` tool supports including one or more subtitles track(s) in an MPEG DASH presentation.
+There are two ways for subtitles to be used with MPEG DASH. Subtitles data may be encapsulated in MP4 tracks, just like audio and video frames, or may be stored in a separate, standalone text or XML file without MP4 encapsulation.
+
+# Formats
+
+Subtitles can be encoded in a varietry of formats. Most of those formats belong to two family of related formats:
+
+## IMSC1 Conformant Profiles
+[IMSC1](https://dvcs.w3.org/hg/ttml/raw-file/tip/ttml-ww-pro-files/ttml-ww-profiles.html) conformant profiles of TTML include:
+  * W3C TTML
+  * SMPTE Timed Text (SMPTE-TT)
+  * EBU-TT
+
+## WebVTT
+WebVTT is a text format, based on the SRT text format. The specification can be found here: [https://w3c.github.io/webvtt](https://w3c.github.io/webvtt)
+
+## 3GPP Timed Text
+Another timed text format defined by 3GPP. This format is currently not supported.
+
+# Using Subtitles with `mp4dash`
+The `mp4dash` packager can take one or more subtitles file(s) as input.
+
+## External Subtitles
+This is the simplest mode to support, as no MP4 encapsulation is necessary, so a simple WebVTT text or IMSC1-conformant TTML XML file is all that’s needed to hold the subtitles.
+When the subtitles are in non-MP4 external files, the input filenames must be prefixed with an input specifier `[+format=webvtt]` for WebVTT-formatted subtitles, or `[+format=ttml]` for IMSC1-conformant TTML files. Also, since WebVTT files do not carry language information, you may want to specify the language code for the input file by adding the parameter `+language=xxx` to the input specifier.
+
+!!! example "Example: single english-language WebVTT subtitles file"
+    ```
+    mp4dash video.mp4 [+format=webvtt,+language=eng]sub_eng_webvtt.txt
+    ```
+
+!!! example "Example: single TTML subtitles file"
+    ```
+    mp4dash video.mp4 [+format=ttml]sub_fre_ttml.xml
+    ```
+
+!!! example "Example: two WebVTT subtitles files"
+    ```
+    mp4dash video_00500.mp4 [+format=webvtt,+language=eng]sub_eng_webvtt.txt [+format=webvtt,+language=fre]sub_fre_webvtt.txt
+    ```
+
+## MP4-Encapsulated Subtitles
+MPEG- 4 Part 30 (ISO/IEC 14496-30) defines a way to carry IMSC1-conformat TTM XML in MP4 tracks. Those tracks have a codec 4-character code of `stpp`.
+When the subtitles are encapsulated in MP4 tracks, you must specify the `--subtitles` command line option to tell mp4dash to include those tracks in the DASH output.
+
+!!! example "Example: single MP4 input file that contains video, audio and subtitles tracks"
+    ```
+    mp4dash --subtitles video_file_with_subtitle_track.mp4
+    ```
+
+!!! example "Example: separate MP4 file for video/audio and subtitles"
+    ```
+    mp4dash --subtitles video.mp4 subtitles.mp4
+    ```
+# References
+
+  * [W3C TTML Profiles for Internet Media Subtitles and Captions 1.0.1 (IMSC1)](https://www.w3.org/TR/ttml-imsc1.0.1/)
+  * [SMPTE ST 2052-1:2013 “Timed Text Format (SMPTE-TT)](https://ieeexplore.ieee.org/document/7291854)

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/hls Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/developers/hls/index.md Added

@@ -0,0 +1,22 @@
+HTTP LIVE STREAMING (HLS)
+=========================
+
+The Bento4 tools support HLS in several ways
+
+# HLS With MP4
+
+
+# HLS With MPEG2 TS
+
+## Using `mp4hls`
+`mp4hls` is a high level tool that facilitates the use of the lower-level tool `mp42hls`. `mp4hls` will invoke the `mp42hls` tool, once for each input, in order to create a multi-bitrate HLS presentation.
+
+!!! tip "Use `mp4dash` for HLS with MP4 segments (a.k.a `fMP4`)"
+    The `mp4hls` tool only supports creating "legacy" HLS presentations, where the media segments are in MPEG2 TS format. Unless it isn't supported by the players you are targetting, we recommend using HLS with fMP4 segments, as this is compatible with MPEG DASH, and likely what is expected by modern environments.
+    See the [MPEG DASH page](../dash/index.md) for details on how to use the `mp4dash` tool, which supports both MPEG DASH and HLS
+
+See the [`mp4hls` documenation](../../documentation/mp4hls.md) for details on how to use the tool.
+
+## Using `mp42hls`
+`mp42hls` is the low-level tool that can create an HLS output for a single MP4 input file.
+See the [`mp42hls` documentation](../../documentation/mp42hls.md) for details on how to use the tool.
\ No newline at end of file

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

@@ -0,0 +1,27 @@
+DEVELOPERS
+==========
+
+Precompiled SDKs and Tools
+--------------------------
+
+For your convenience, we make available pre-compiled SDK and tools for the most popular platforms. Visit the [Download Page](/downloads/) for details.
+
+There is one SDK for each target platform. Once you download the SDK for your platform, you must unzip it. You will obtain a directory named Bento4-SDK-. (ex: Bento4-SDK-1-4-3-607.universal-apple-macosx for version 1.4.3-607 on Mac OSX).
+In the SDK directory, you will find the following subdirectories:
+
+  * `bin` ==> precompiled tools, scripts and shared libraries
+  * `docs` ==> documentation
+  * `include` ==> C++ header files for the API
+  * `lib` ==> static libraries
+  * `utils` ==> tools and scripts
+
+Source Code
+-----------
+
+The code is hosted on GitHub: https://github.com/axiomatic-systems/Bento4 You can browse the source code directly through the GitHub interface, or download a copy of the source tree using the GitHub download link or a git client from the command line:
+
+```
+git clone https://github.com/axiomatic-systems/Bento4.git
+```
+
+You can also download a zip file containing the latest source distribution only (without history) from the [Downloads page](/downloads/)
\ No newline at end of file

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation Added

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

@@ -0,0 +1,51 @@
+DOCUMENTATION
+=============
+
+The documentation for Bento4 consists of pages hosted on this site, documents stored as files in the source distribution and SDKs, as well as embedded documentation in the source code header files.
+
+MPEG DASH Packager
+------------------
+The [MPEG DASH](../developers/dash/index.md) page is the starting point for information on MPEG DASH packaging.
+For a more advanced, detailed set of options, you can also directly consult the documentation for the [mp4dash](mp4dash.md) tool.  
+The MPEG DASH packager can also be used to package HLS with MP4 fragments, allowing a dual DASH/HLS output from a single set of media files.
+
+HLS Packager
+------------
+The [HLS](../developers/hls/index.md) page is the starting point for information HLS packaging.
+For a more advanced and detailed set of options, you can also directly consult the documentation for the mp4hls tool.
+
+Tools Documentation
+-------------------
+
+| TOOL NAME | DESCRIPTION |
+|-----------|-------------|
+| [mp4info](mp4info.md) | displays high level info about an MP4 file, including all tracks and codec details
+| [mp4dump](mp4info.md) | displays the entire atom/box structure of an MP4 file
+| [mp4edit](mp4edit.md) | add/insert/remove/replace atom/box items of an MP4 file
+| [mp4extract](mp4extract.md) | extracts an atom/box from an MP4 file
+| [mp4encrypt](mp4encrypt.md) | encrypts an MP4 file (multiple encryption schemes are supported)
+| [mp4decrypt](mp4decrypt.md) | decrypts an MP4 file (multiple encryption schemes are supported)
+| [mp4dcfpackager](mp4dcfpackager.md) | encrypts a media file into an OMA DCF file
+| [mp4compact](mp4compact.md) | converts stsz tables into stz2 tables to create more compact MP4 files
+| [mp4fragment](mp4fragment.md) | creates a fragmented MP4 file from a non-fragmented one.
+| [mp4split](mp4split.md) | splits a fragmented MP4 file into discrete files
+| [mp4tag](mp4tag.md) | show/edit MP4 metadata (iTunes-style and others)
+| [mp4mux](mp4mux.md) | multiplexes one or more elementary streams (H264, AAC) into an MP4 file
+| [mp42aac](mp42aac.md) | extract a raw AAC elementary stream from an MP4 file
+| [mp42avc](mp42avc.md) | extract a raw AVC/H.264 elementary stream from an MP4 file
+| [mp42hevc](mp42hevc.md) | extract a raw AVC/H.264 elementary stream from an MP4 file
+| [mp42hls](mp42hls.md) | converts an MP4 file to an HLS (HTTP Live Streaming) presentation, including the generation of the segments and .m3u8 playlist as well as AES-128 and SAMPLE-AES (for FairPlay) encryption. This can be used as a replacement for Apple’s mediafilesegmenter tool.
+| [mp42ts](mp42ts.md) | converts an MP4 file to an MPEG2-TS file.
+| [mp4dash](mp4dash.md) | creates an MPEG DASH output from one or more MP4 files, including encryption.
+| [mp4dashclone](mp4dashclone.md) | creates a local clone of a remote or local MPEG DASH presentation, optionally encrypting the segments as they are cloned.
+| [mp4hls](mp4hls.md) | creates a multi-bitrate HLS master playlist from one or more MP4 files, including support for encryption and I-frame-only playlists. This can be used as a replacement for Apple’s variantplaylistcreator tool.
+
+Library API Documentation
+-------------------------
+
+Some of the API documentation is produced from the source code comments using Doxygen. The doxygen output is available as a windows CHM file in Bento4.chm, and a set of HTML pages zipped together in Bento4-HTML.zip (to start, open the file named index.html with an HTML browser)
+
+Licensing
+---------
+
+Consult the [About](../about.md) page for GPL and non-GPL licensing information.
\ No newline at end of file

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp42aac.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp42avc.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp42hevc.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp42hls.md Added

@@ -0,0 +1,65 @@
+# mp42hls
+```
+MP4 To HLS File Converter - Version 1.2
+(Bento4 Version 1.6.0.0)
+(c) 2002-2018 Axiomatic Systems, LLC
+
+usage: mp42hls [options] <input>
+Options:
+  --verbose
+  --show-info
+  --hls-version <n> (default: 3)
+  --pmt-pid <pid>
+    PID to use for the PMT (default: 0x100)
+  --audio-pid <pid>
+    PID to use for audio packets (default: 0x101)
+  --video-pid <pid>
+    PID to use for video packets (default: 0x102)
+  --audio-track-id <n>
+    Read audio from track ID <n> (0 means no audio)
+  --video-track-id <n>
+    Read video from track ID <n> (0 means no video)
+  --audio-format <format>
+    Format to use for audio-only segments: 'ts' or 'packed' (default: 'ts')
+  --segment-duration <n>
+    Target segment duration in seconds (default: 6)
+  --segment-duration-threshold <t>
+    Segment duration threshold in milliseconds (default: 15)
+  --pcr-offset <offset> in units of 90kHz (default 10000)
+  --index-filename <filename>
+    Filename to use for the playlist/index (default: stream.m3u8)
+  --segment-filename-template <pattern>
+    Filename pattern to use for the segments. Use a printf-style pattern with
+    one number field for the segment number, unless using single file mode
+    (default: segment-%d.<ext> for separate segment files, or stream.<ext> for single file)
+  --segment-url-template <pattern>
+    URL pattern to use for the segments. Use a printf-style pattern with
+    one number field for the segment number unless unsing single file mode.
+    (may be a relative or absolute URI).
+    (default: segment-%d.<ext> for separate segment files, or stream.<ext> for single file)
+  --iframe-index-filename <filename>
+    Filename to use for the I-Frame playlist (default: iframes.m3u8 when HLS version >= 4)
+  --output-single-file
+    Output all the media in a single file instead of separate segment files.
+    The segment filename template and segment URL template must be simple strings
+    without '%d' or other printf-style patterns
+  --encryption-mode <mode>
+    Encryption mode (only used when --encryption-key is specified). AES-128 or SAMPLE-AES (default: AES-128)
+  --encryption-key <key>
+    Encryption key in hexadecimal (default: no encryption)
+  --encryption-iv-mode <mode>
+    Encryption IV mode: 'sequence', 'random' or 'fps' (FairPlay Streaming) (default: sequence)
+    (when the mode is 'fps', the encryption key must be 32 bytes: 16 bytes for the key
+    followed by 16 bytes for the IV).
+  --encryption-key-uri <uri>
+    Encryption key URI (may be a realtive or absolute URI). (default: key.bin)
+  --encryption-key-format <format>
+    Encryption key format. (default: 'identity')
+  --encryption-key-format-versions <versions>
+    Encryption key format versions.
+  --encryption-key-line <ext-x-key-line>
+    Preformatted encryption key line (only the portion after the #EXT-X-KEY: tag).
+    This option can be used multiple times, once for each preformatted key line to be included in the playlist.
+    (this option is mutually exclusive with the --encryption-key-uri, --encryption-key-format and --encryption-key-format-versions options)
+    (the IV and METHOD parameters will automatically be added, so they must not appear in the <ext-x-key-line> argument)
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp42ts.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4compact.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4dash.md Added

@@ -0,0 +1,166 @@
+# mp4dash
+```
+Usage: mp4-dash.py [options] <media-file> [<media-file> ...]
+
+Each <media-file> is the path to a fragmented MP4 file, optionally prefixed
+with a stream selector delimited by [ and ]. The same input MP4 file may be
+repeated, provided that the stream selector prefixes select different streams.
+Version 2.0.0 r637
+
+Options:
+  -h, --help            show this help message and exit
+  -v, --verbose         Be verbose
+  -d, --debug           Print out debugging information
+  -o <output-dir>, --output-dir=<output-dir>
+                        Output directory
+  -f, --force           Allow output to an existing directory
+  --mpd-name=<filename>
+                        MPD file name
+  --profiles=<profiles>
+                        Comma-separated list of one or more profile(s).
+                        Complete profile names can be used, or profile aliases
+                        ('live'='urn:mpeg:dash:profile:isoff-live:2011', 'on-
+                        demand'='urn:mpeg:dash:profile:isoff-on-demand:2011',
+                        'hbbtv-1.5='urn:hbbtv:dash:profile:isoff-live:2012')
+  --no-media            Do not output media files (MPD/Manifests only)
+  --rename-media        Use a file name pattern instead of the base name of
+                        input files for output media files.
+  --media-prefix=<prefix>
+                        Use this prefix for prefixed media file names (instead
+                        of the default prefix "media")
+  --init-segment=<filename>
+                        Initialization segment name
+  --no-split            Do not split the file into individual segment files
+  --use-segment-list    Use segment lists instead of segment templates
+  --use-segment-template-number-padding
+                        Use padded numbers in segment URL/filename templates
+  --use-segment-timeline
+                        Use segment timelines (necessary if segment durations
+                        vary)
+  --min-buffer-time=<duration>
+                        Minimum buffer time (in seconds)
+  --max-playout-rate=<strategy>
+                        Max Playout Rate setting strategy for trick-play
+                        support. Supported strategies: lowest:X
+  --language-map=<lang_from>:<lang_to>[,...]
+                        Remap language code <lang_from> to <lang_to>. Multiple
+                        mappings can be specified, separated by ','
+  --always-output-lang  Always output an @lang attribute for audio tracks even
+                        when the language is undefined
+  --subtitles           Enable Subtitles
+  --attributes=<attributes-definition>
+                        Specify the attributes of a set of tracks. This option
+                        may be used multiple times, once per attribute set.
+  --smooth              Produce an output compatible with Smooth Streaming
+  --smooth-client-manifest-name=<filename>
+                        Smooth Streaming Client Manifest file name
+  --smooth-server-manifest-name=<filename>
+                        Smooth Streaming Server Manifest file name
+  --smooth-h264-fourcc=<fourcc>
+                        Smooth Streaming FourCC value for H.264 video
+                        (default=H264) [some older players use AVC1]
+  --hls                 Output HLS playlists in addition to MPEG DASH
+  --hls-key-url=<url>   HLS key URL (default: key.bin)
+  --hls-master-playlist-name=<filename>
+                        HLS master playlist name (default: master.m3u8)
+  --hls-media-playlist-name=<filename>
+                        HLS media playlist name (default: media.m3u8)
+  --hls-iframes-playlist-name=<filename>
+                        HLS I-Frames playlist name (default: iframes.m3u8)
+  --hippo               Produce an output compatible with the Hippo Media
+                        Server
+  --hippo-server-manifest-name=<filename>
+                        Hippo Media Server Manifest file name
+  --use-compat-namespace
+                        Use the original DASH MPD namespace as it was
+                        specified in the first published specification
+  --use-legacy-audio-channel-config-uri
+                        Use the legacy DASH namespace URI for the
+                        AudioChannelConfiguration descriptor
+  --encryption-key=<key-spec>
+                        Encrypt some or all tracks with MPEG CENC (AES-128),
+                        where <key-spec> specifies the KID(s) and Key(s) to
+                        use, using one of the following forms: (1) <KID>:<key>
+                        or <KID>:<key>:<IV> with <KID> (and <IV> if
+                        specififed) as a 32-character hex string and <key>
+                        either a 32-character hex string or the character '#'
+                        followed by a base64-encoded key seed; or (2) @<key-
+                        locator> where <key-locator> is an expression of one
+                        of the supported key locator schemes. Each entry may
+                        be prefixed with an optional track filter, and
+                        multiple <key-spec> entries can be used, separated by
+                        ','. (see online docs for details)
+  --encryption-cenc-scheme=<cenc-scheme>
+                        MPEG Common Encryption scheme (cenc, cbc1, cens or
+                        cbcs). (default: cenc)
+  --encryption-args=<cmdline-arguments>
+                        Pass additional command line arguments to mp4encrypt
+                        (separated by spaces)
+  --eme-signaling=<eme-signaling-type>
+                        Add EME-compliant signaling in the MPD and PSSH boxes
+                        (valid options are 'pssh-v0' and 'pssh-v1')
+  --merge-keys          Merge all keys in a single set used for all
+                        <ContentProtection> elements
+  --marlin              Add Marlin signaling to the MPD (requires an encrypted
+                        input, or the --encryption-key option)
+  --marlin-add-pssh     Add an (optional) Marlin 'pssh' box in the init
+                        segment(s)
+  --playready           Add PlayReady signaling to the MPD (requires an
+                        encrypted input, or the --encryption-key option)
+  --playready-version=PLAYREADY_VERSION
+                        PlayReady version to use (4.0, 4.1, 4.2, 4.3),
+                        defaults to 4.0
+  --playready-header=<playready-header>
+                        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: (1) the character '@' followed
+                        by the name of a file containing a PlayReady XML
+                        Rights Management Header (<WRMHEADER>) or a PlayReady
+                        Header Object (PRO) in binary form,  or (2) the
+                        character '#' followed by a PlayReady Header Object
+                        encoded in Base64, or (3) one or more <name>:<value>
+                        pair(s) (separated by '#' if more than one) specifying
+                        fields of a PlayReady Header Object (field names
+                        include LA_URL, LUI_URL and DS_ID)
+  --playready-add-pssh  Store the PlayReady header in a 'pssh' box in the init
+                        segment(s) [deprecated: this is now implicitly on by
+                        default when the --playready or --playready-header
+                        option is used]
+  --playready-no-pssh   Do not store the PlayReady header in a 'pssh' box in
+                        the init segment(s)
+  --widevine            Add Widevine signaling to the MPD (requires an
+                        encrypted input, or the --encryption-key option)
+  --widevine-header=<widevine-header>
+                        Add a Widevine entry in the MPD, and a Widevine PSSH
+                        box in the init segments. The use of this option
+                        implies the --widevine option. The <widevine-header>
+                        argument can be either: (1) the character '#' followed
+                        by a Widevine header encoded in Base64 (either a
+                        complete PSSH box or just the PSSH box payload), 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],
+                        'content_id' [byte array in hex], 'policy' [string])
+  --primetime           Add Primetime signaling to the MPD (requires an
+                        encrypted input, or the --encryption-key option)
+  --primetime-metadata=<primetime-metadata>
+                        Add Primetime metadata in a PSSH box in the init
+                        segments. The use of this option implies the
+                        --primetime option. The <primetime-data> argument can
+                        be either: (1) the character '@' followed by the name
+                        of a file containing the Primetime Metadata to use, or
+                        (2) the character '#' followed by the Primetime
+                        Metadata encoded in Base64
+  --fairplay-key-uri=FAIRPLAY_KEY_URI
+                        Specify the key URI to use for FairPlay Streaming key
+                        delivery (only valid with --hls option)
+  --clearkey            Add Clear Key signaling to the MPD (requires an
+                        encrypted input, or the --encryption-key option))
+  --clearkey-license-uri=CLEARKEY_LICENSE_URI
+                        Specify the license/key URI to use for Clear Key (only
+                        valid with --clearkey option)
+  --exec-dir=<exec_dir>
+                        Directory where the Bento4 executables are located
+                        (use '-' to look for executable in the current PATH)
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4dashclone.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4dcfpackager.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4decrypt.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4dump.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4edit.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4encrypt.md Added

@@ -0,0 +1,74 @@
+# mp4encrypt
+```
+MP4 Encrypter - Version 1.6
+(Bento4 Version 1.6.0.0)
+(c) 2002-2016 Axiomatic Systems, LLC
+
+usage: mp4encrypt --method <method> [options] <input> <output>
+     <method> is OMA-PDCF-CBC, OMA-PDCF-CTR, MARLIN-IPMP-ACBC,
+     MARLIN-IPMP-ACGK, ISMA-IAEC, PIFF-CBC, PIFF-CTR, MPEG-CENC,
+     MPEG-CBC1, MPEG-CENS, MPEG-CBCS
+  Options:
+  --show-progress
+      Show progress details
+  --fragments-info <filename>
+      Encrypt the fragments read from <input>, with track info read
+      from <filename>
+  --key <n>:<k>:<iv>
+      Specifies the key to use for a track (or group key).
+      <n> is a track ID, <k> a 128-bit key in hex (32 characters)
+      and <iv> a 64-bit or 128-bit IV or salting key in hex
+      (16 or 32 characters) depending on the cipher mode
+      The key and IV values can also be specified with the keyword 'random'
+      instead of a hex-encoded value, in which case a randomly generated value
+      will be used.
+      (several --key options can be used, one for each track)
+  --strict
+      Fail if there is a warning (ex: one or more tracks would be left unencrypted)
+  --property <n>:<name>:<value>
+      Specifies a named string property for a track
+      <n> is a track ID, <name> a property name, and <value> is the
+      property value
+      (several --property options can be used, one or more for each track)
+  --global-option <name>:<value>
+      Sets the global option <name> to be equal to <value>
+  --pssh <system-id>:<filename>
+      Add a 'pssh' atom for this system ID, with the payload
+      loaded from <filename>.
+      (several --pssh options can be used, with a different system ID for each)
+      (the filename can be left empty after the ':' if no payload is needed)
+  --pssh-v1 <system-id>:<filename>
+      Same as --pssh but generates a version=1 'pssh' atom
+      (this option must appear *after* the --property options on the command line)
+  --kms-uri <uri>
+      Specifies the KMS URI for the ISMA-IAEC method
+
+  Method Specifics:
+    OMA-PDCF-CBC, MARLIN-IPMP-ACBC, MARLIN-IPMP-ACGK, PIFF-CBC, MPEG-CBC1, MPEG-CBCS: 
+    the <iv> can be 64-bit or 128-bit
+    If the IV is specified as a 64-bit value, it will be padded with zeros.
+
+    OMA-PDCF-CTR, ISMA-IAEC, PIFF-CTR, MPEG-CENC, MPEG-CENS:
+    the <iv> should be a 64-bit hex string.
+    If a 128-bit value is supplied, it will be truncated to 64-bit.
+
+    OMA-PDCF-CBC, OMA-PDCF-CTR: The following properties are defined,
+    and all other properties are stored in the textual headers:
+      ContentId       -> the content ID for the track
+      RightsIssuerUrl -> the Rights Issuer URL
+
+    MARLIN-IPMP-ACBC, MARLIN-IPMP-ACGK: The following properties are defined:
+      ContentId -> the content ID for the track
+
+    MARLIN-IPMP-ACGK: The group key is specified with --key where <n>
+    is 0. The <iv> part of the key must be present, but will be ignored;
+    It should therefore be set to 0000000000000000
+
+    MPEG-CENC, MPEG-CBC1, MPEG-CENS, MPEG-CBCS, PIFF-CTR, PIFF-CBC:
+    The following properties are defined:
+      KID -> the value of KID, 16 bytes, in hexadecimal (32 characters)
+      ContentId -> Content ID mapping for KID (Marlin option)
+      PsshPadding -> pad the 'pssh' container to this size
+                    (only when using ContentId).
+                    This property should be set for track ID 0 only
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4extract.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4fragment.md Added

@@ -0,0 +1,25 @@
+# mp4fragment
+```
+MP4 Fragmenter - Version 1.7.0
+(Bento4 Version 1.6.0.0)
+(c) 2002-2020 Axiomatic Systems, LLC
+
+usage: mp4fragment [options] <input> <output>
+options are:
+  --verbosity <n> sets the verbosity (details) level to <n> (between 0 and 3)
+  --debug enable debugging information output
+  --quiet don't print out notice messages
+  --fragment-duration <milliseconds> (default = automatic)
+  --timescale <n> (use 10000000 for Smooth Streaming compatibility)
+  --track <track-id or type> only include media from one track (pass a track ID, 'audio', 'video' or 'subtitles')
+  --index (re)create the segment index
+  --trim trim excess media in longer tracks
+  --no-tfdt don't add 'tfdt' boxes in the fragments (may be needed for legacy Smooth Streaming clients)
+  --tfdt-start <start> value of the first tfdt timestamp, expressed as a floating point number in seconds
+  --sequence-number-start <start> value of the first segment sequence number (default: 1)
+  --force-i-frame-sync <auto|all> treat all I-frames as sync samples (for open-gop sequences)
+    'auto' only forces the flag if an open-gop source is detected, 'all' forces the flag in all cases
+  --copy-udta copy the moov/udta atom from input to output
+  --no-zero-elst don't set the last edit list entry to 0 duration
+  --trun-version-zero set the 'trun' box version to zero (default version: 1)
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4hls.md Added

@@ -0,0 +1,75 @@
+# mp4hls
+```
+Usage: mp4-hls.py [options] <media-file> [<media-file> ...]
+
+Each <media-file> is the path to an MP4 file, optionally prefixed with a
+stream selector delimited by [ and ]. The same input MP4 file may be repeated,
+provided that the stream selector prefixes select different streams. Version
+1.2.0 r637
+
+Options:
+  -h, --help            show this help message and exit
+  -v, --verbose         Be verbose
+  -d, --debug           Print out debugging information
+  -o <output-dir>, --output-dir=<output-dir>
+                        Output directory
+  -f, --force           Allow output to an existing directory
+  --hls-version=<version>
+                        HLS Version (default: 4)
+  --master-playlist-name=<filename>
+                        Master Playlist name
+  --media-playlist-name=<name>
+                        Media Playlist name
+  --iframe-playlist-name=<name>
+                        I-frame Playlist name
+  --output-single-file  Store segment data in a single output file per input
+                        file
+  --audio-format=AUDIO_FORMAT
+                        Format for audio segments (packed or ts) (default:
+                        packed)
+  --segment-duration=SEGMENT_DURATION
+                        Segment duration (default: 6)
+  --encryption-mode=<mode>
+                        Encryption mode (only used when --encryption-key is
+                        specified). AES-128 or SAMPLE-AES (default: AES-128)
+  --encryption-key=<key>
+                        Encryption key in hexadecimal (default: no encryption)
+  --encryption-iv-mode=<mode>
+                        Encryption IV mode: 'sequence', 'random' or 'fps'
+                        (Fairplay Streaming) (default: sequence). When the
+                        mode is 'fps', the encryption key must be 32 bytes: 16
+                        bytes for the key followed by 16 bytes for the IV.
+  --encryption-key-uri=<uri>
+                        Encryption key URI (may be a relative or absolute
+                        URI). (default: key.bin)
+  --encryption-key-format=<format>
+                        Encryption key format. (default: 'identity')
+  --encryption-key-format-versions=<versions>
+                        Encryption key format versions.
+  --signal-session-key  Signal an #EXT-X-SESSION-KEY tag in the master
+                        playlist
+  --fairplay=<fairplay-parameters>
+                        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)
+  --widevine=<widevine-parameters>
+                        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))
+  --output-encryption-key
+                        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'
+  --exec-dir=<exec_dir>
+                        Directory where the Bento4 executables are located
+  --base-url=<base_url>
+                        The base URL for the Media Playlists and TS files
+                        listed in the playlists. This is the prefix for the
+                        files.
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4info.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4mux.md Added

@@ -0,0 +1,36 @@
+# mp4mux
+```
+MP4 Elementary Stream Multiplexer - Version 3.0
+(Bento4 Version 1.6.0.0)
+(c) 2002-20020 Axiomatic Systems, LLC
+
+usage: mp4mux [options] --track [<type>:]<input>[#<params>] [--track [<type>:]<input>[#<params>] ...] <output>
+
+  <params>, when specified, are expressd as a comma-separated list of
+  one or more <name>=<value> parameters
+
+Supported types:
+  h264: H264/AVC NAL units
+  h265: H265/HEVC NAL units
+    optional params:
+      dv_profile: integer number for Dolby vision profile ID (valid value: 5,8,9)
+      dv_bc: integer number for Dolby vision BL signal cross-compatibility ID (mandatory if dv_profile is set to 8/9)
+      frame_rate: floating point number in frames per second (default=24.0)
+      format: hev1 or hvc1 (default) for HEVC tracks and Dolby Vision backward-compatible tracks
+              dvhe or dvh1 (default) for Dolby vision tracks
+  aac:  AAC in ADTS format
+  ac3:  Dolby Digital
+  ec3:  Dolby Digital Plus
+  ac4:  Dolby AC-4
+  mp4:  MP4 track(s) from an MP4 file
+    optional params:
+      track: audio, video, or integer track ID (default=all tracks)
+
+Common optional parameters for all types:
+  language: language code (3-character ISO 639-2 Alpha-3 code)
+
+If no type is specified for an input, the type will be inferred from the file extension
+
+Options:
+  --verbose: show more details
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4split.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/documentation/mp4tag.md Added

@@ -0,0 +1,48 @@
+# mp4tag
+```
+MP4 File Tagger - Version 1.2 (Bento4 Version 1.6.0.0)
+(c) 2002-2008 Axiomatic Systems, LLC
+
+usage: mp4tag [options] [commands...] <input> [<output>]
+commands:
+  --help            print this usage information
+  --show-tags       show tags found in the input file
+  --list-symbols    list all the builtin symbols
+  --list-keys       list all the builtin symbolic key names
+  --set <key>:<type>:<value>
+      set a tag (if the tag does not already exist, set behaves like add)
+  --add <key>:<type>:<value>
+      set/add a tag
+      where <type> is:
+        S    if <value> is a UTF-8 string
+        LS   if <value> is a UTF-8 string with a language code (see notes)
+        I8   if <value> is an 8-bit integer
+        I16  if <value> is a 16-bit integer
+        I32  if <value> is a 32-bit integer
+        JPEG if <value> is the name of a JPEG file
+        GIF  if <value> is the name of a GIF file
+        B    if <value> is a binary string (see notes)
+        Z    if <value> is the name of a builtin symbol
+  --remove <key>
+       remove a tag
+  --extract <key>:<file>
+       extract the value of a tag and save it to a file
+
+NOTES:
+  In all commands with a <key> argument, except for '--add', <key> can be 
+  <key-name> or <key-name>#n where n is the zero-based index of the key when
+  there is more than one key with the same name (ex: multiple images for cover
+  art).
+  A <key-name> has the form <namespace>/<name> or simply <name> (in which case
+  the namespace defaults to 'meta').
+  The <name> of a key is either one of a symbolic keys
+  (see --list-keys) or a 4-character atom name.
+  The namespace can be 'meta' for itunes-style metadata or 'dcf' for
+  OMA-DCF-style metadata, or a user-defined long-form namespace
+  (ex: com.mycompany.foo).
+  Binary strings can be expressed as a normal string of ASCII characters
+  prefixed by a + character if all the bytes fall in the ASCII range,
+  or hex-encoded prefixed by a # character (ex: +hello, or #0FC4)
+  Strings with a language code are expressed as: <lang>:<string>,
+  where <lang> is a 3 character language code (ex: eng:hello)
+```

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/downloads.md Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/images/favicon.png Added

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/images/rocks_and_plants.jpg Added

bento4-1.6.0r637.tar.gz/Documents/MkDocs/src/index.md -> bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/index.md Changed

@@ -1,8 +1,65 @@
 Welcome to Bento4
 ======================
-![](images/tokyometro.jpg)
 
 Bento4 MP4, DASH/HLS/CMAF Class Library, SDK and Tools
 ------------------------------------------------------
 
-A fast, modern, open source C++ toolkit for all your MP4 and DASH/HLS/CMAF media format needs
\ No newline at end of file
+A fast, modern, open source C++ toolkit for all your MP4 and DASH/HLS/CMAF media format needs.  
+
+![](images/tokyometro.jpg)
+
+Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15. The format is a derivative of the Apple Quicktime file format, so Bento4 can be used to read and write most Quicktime files as well. In addition to supporting ISO-MP4, Bento4 includes support for parsing and multiplexing H.264 and H.265 elementary streams, converting ISO-MP4 to MPEG2-TS, packaging HLS and MPEG-DASH, CMAF, content encryption, decryption, and much more.
+
+Features
+--------
+
+A number of formats and features based on the ISO-MP4 format and related technologies are also supported, including:
+
+  * [MPEG DASH](developers/dash/index.md) with fragmented MP4 files, as defined in the international specification [ISO/IEC 23009-1](https://www.iso.org/standard/75485.html)
+  * [HLS](developers/hls/index.md) with TS or MP4 segments (dual DASH/HLS output), as defined in [RFC 8216](https://datatracker.ietf.org/doc/html/rfc8216)
+  * [CMAF](developers/cmaf/index.md) (Common Media Application Format) as defined in ISO/IEC 23000-19
+  * MPEG Common Encryption (CENC) as specified in the international specification [ISO/IEC 23001-7](https://www.iso.org/standard/68042.html)
+  * [PIFF](http://go.microsoft.com/?linkid=9682897) (Protected Interoperable File Format), and encrypted, fragmented MP4 format specified by Microsoft and used for encrypted HTTP Smooth Streaming.
+  * Reading and writing 3GPP and iTunes-compatible metadata.
+  * ISMA Encrytion and Decryption as defined in the [ISMA E&A specification](http://www.isma.tv/)
+  * OMA 2.0 and 2.1 DCF/PDCF Encryption and Decryption as defined in the [OMA specifications](http://www.openmobilealliance.org/).
+  * ISO-MP4 files profiled as part of the [3GPP family of standards](http://www.3gpp.org/).
+  * The [UltraViolet](http://www.uvvu.com/) (DECE) CFF (Common File Format).
+  * Parsing and multiplexing of H.264 (AVC) video and AAC audio elementary streams
+  * Support for multiple DRM systems that are compatible with MP4-formatted content (usually leveraging CENC Common Encryption), such as Marlin, PlayReady, Widevine, FairPlay and Adobe Access.
+  * Support for a wide range of codecs, including H.264 (AVC), H.265 (HEVC), AAC, HE-AAC, xHE-AAC, AC3 and eAC3 (Dolby Digital), AC4, Dolby Atmos, DTS, ALAC, and many more.
+  * Support for Dolby Vision and HDR.
+
+The SDK is designed to be cross-platform. The code is very portable; it can be compiled with any sufficiently modern C++ compiler. The implementation does not rely on any external library. All the code necessary to compile the SDK and tools is included in the standard distribution. The standard distribution contains makefiles for unix-like operating systems, including Linux and Android, project files for Microsoft Visual Studio, and an XCode project for MacOS X and iOS. There is also support for building the library with the [SCons](http://www.scons.org/) build system as well as [CMake](https://cmake.org/).
+
+The library is Open Source, with a dual-license model. You can find out more about the license on the [About Page](about.md).
+The [Developers Page](developers/index.md) contains specific information on where to obtain the source code and documentation.  
+The [Downloads Page](downloads.md) contains the links to pre-built SDKs and tools that you can use to get started quickly.
+
+Included Applications
+---------------------
+
+The Bento4 SDK includes several command-line applications/tools that are built using the SDK API. These include:
+
+| TOOL NAME | DESCRIPTION |
+|-----------|-------------|
+| mp4info	| displays high level info about an MP4 file, including all tracks and codec details |
+| mp4dump	|displays the entire atom/box structure of an MP4 file |
+| mp4edit	|add/insert/remove/replace atom/box items of an MP4 file |
+| mp4extract |extracts an atom/box from an MP4 file |
+| mp4encrypt |encrypts an MP4 file (multiple encryption schemes are supported) |
+| mp4decryp | decrypts an MP4 file (multiple encryption schemes are supported) |
+| mp4dcfpackager | encrypts a media file into an OMA DCF file |
+| mp4compact | converts ‘stsz’ tables into ‘stz2’ tables to create more compact MP4 files |
+| mp4fragment | creates a fragmented MP4 file from a non-fragmented one |
+| mp4split | splits a fragmented MP4 file into discrete files |
+| mp4tag | show/edit MP4 metadata (iTunes-style and others) |
+| mp4mux | multiplexes one or more elementary streams (H264/AVC, H265/HEVC, AAC) into an MP4 file |
+| mp42aac | extract a raw AAC elementary stream from an MP4 file |
+| mp42avc | extract a raw AVC/H.264 elementary stream from an MP4 file |
+| mp42hevc | extract a raw HEVC/H.265 elementary stream from an MP4 file |
+| mp42hls | converts an MP4 file to an HLS (HTTP Live Streaming) presentation, including the generation of the segments and .m3u8 playlist as well as AES-128 and SAMPLE-AES (for Fairplay) encryption. This can be used as a replacement for Apple’s mediafilesegmenter tool |
+| mp42ts | converts an MP4 file to an MPEG2-TS file |
+| mp4dash | creates an MPEG DASH output from one or more MP4 files, including encryption. As an option, an HLS playlist with MP4 segments can also be generated at the same time, allowing a single stream to be served as DASH and HLS. This is a full-featured MPEG DASH / HLS packager |
+| mp4dashclone | creates a local clone of a remote or local MPEG DASH presentation, optionally encrypting the segments as they are cloned |
+| mp4hls | creates a multi-bitrate HLS master playlist from one or more MP4 files, including support for encryption and I-frame-only playlists. This tool uses the ‘mp42hls’ low level tool internally, so all the options supported by that low level tool are also available. This can be used as a replacement for Apple’s variantplaylistcreator tool |
\ No newline at end of file

bento4-1.6.0r638.tar.gz/Documents/MkDocs/src/support.md Added

bento4-1.6.0r637.tar.gz/README.md -> bento4-1.6.0r638.tar.gz/README.md Changed

bento4-1.6.0r638.tar.gz/Scripts/GenerateToolsMarkdownDoc.sh Added

bento4-1.6.0r637.tar.gz/Source/C++/Apps/Mp42Hls/Mp42Hls.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Apps/Mp42Hls/Mp42Hls.cpp Changed

@@ -289,7 +289,7 @@
 			++zero_counter;
 		} else {
 			zero_counter = 0;
-		}		
+        }
 	}
 
     output.SetDataSize(output_size);
@@ -667,6 +667,26 @@
 }
 
 /*----------------------------------------------------------------------
+|   WriteAc4Header
++---------------------------------------------------------------------*/
+static AP4_Result
+WriteAc4Header(AP4_ByteStream& output,
+                unsigned int    frame_size)
+{
+    unsigned char bits[7];
+
+    bits[0] = 0xac;
+    bits[1] = 0x40;
+    bits[2] = 0xff;
+    bits[3] = 0xff;
+    bits[4] = (frame_size>>16)&0xFF;
+    bits[5] = (frame_size>>8 )&0xFF;
+    bits[6] = (frame_size    )&0xFF;
+
+    return output.Write(bits, 7);
+}
+
+/*----------------------------------------------------------------------
 |   MakeAudioSetupData
 +---------------------------------------------------------------------*/
 static AP4_Result
@@ -960,6 +980,8 @@
         unsigned int channel_configuration    = channel_count;
 
         WriteAdtsHeader(output, sample.GetSize(), sampling_frequency_index, channel_configuration);
+    } else if (sample_description->GetFormat() == AP4_SAMPLE_FORMAT_AC_4) {
+        WriteAc4Header(output, sample.GetSize());
     }
     return output.Write(sample_data.GetData(), sample_data.GetDataSize());
 }
@@ -979,8 +1001,10 @@
     AP4_Result result = reader.ReadSample(sample, sample_data);
     if (AP4_FAILED(result)) {
         if (result == AP4_ERROR_EOS) {
+            // advance the timestamp by the last sample's duration
             ts += duration;
             eos = true;
+            return AP4_SUCCESS;
         } else {
             return result;
         }
@@ -1053,7 +1077,15 @@
         AP4_Track* chosen_track= NULL;
         if (audio_track && !audio_eos) {
             chosen_track = audio_track;
-            if (video_track == NULL) sync_sample = true;
+            if (video_track == NULL) {
+                if (audio_track->GetSampleDescription(0)->GetFormat() == AP4_SAMPLE_FORMAT_AC_4) {
+                    if (audio_sample.IsSync()) {
+                        sync_sample = true;
+                    }
+                } else {
+                    sync_sample = true;
+                }
+            }
         }
         if (video_track && !video_eos) {
             if (audio_track) {
@@ -1960,6 +1992,9 @@
             } else if (sample_description->GetFormat() == AP4_SAMPLE_FORMAT_EC_3) {
                 default_stream_name    = "stream.ec3";
                 default_stream_pattern = "segment-%d.ec3";
+            } else if (sample_description->GetFormat() == AP4_SAMPLE_FORMAT_AC_4) {
+                default_stream_name    = "stream.ac4";
+                default_stream_pattern = "segment-%d.ac4";
             }
 
             // override the segment names
@@ -2017,7 +2052,50 @@
                 fprintf(stderr, "ERROR: audio codec not supported\n");
                 return 1;
             }
-
+            if (stream_type == AP4_MPEG2_STREAM_TYPE_ATSC_EAC3) {
+                // E-AC-3 descriptor
+                unsigned int number_of_channels = 0;
+                AP4_String track_language;
+                AP4_Dec3Atom* dec3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, sample_description->GetDetails().GetChild(AP4_ATOM_TYPE_DEC3));
+                AP4_BitWriter bits(8);
+                bits.Write(0xCC, 8);
+                bits.Write(0x06, 8);    // fixed value
+                bits.Write(0xC0, 8);    // reserved, bsid_flag, mainid_flag, asvc_flag, mixinfoexists, substream1_flag, substream2_flag and substream3_flag 
+                bits.Write(24, 5);      // reserved, full_service_flag and service_type
+                if (dec3->GetSubStreams()[0].acmod == 0) {
+                    number_of_channels = 1;
+                } else if (dec3->GetSubStreams()[0].acmod == 1) {
+                    number_of_channels = 0;
+                } else if (dec3->GetSubStreams()[0].acmod == 2) {
+                    number_of_channels = 2;
+                } else {
+                    number_of_channels = 4;
+                }
+                if (dec3->GetSubStreams()[0].num_dep_sub > 0) {
+                    number_of_channels = 5;
+                }
+                bits.Write(number_of_channels, 3);              // number_of_channels
+                bits.Write(4, 3);                               // language_flag, language_flag_2, reserved
+                bits.Write(dec3->GetSubStreams()[0].bsid, 5);   // bsid
+                track_language = audio_track->GetTrackLanguage();
+                if (track_language.GetLength() == 3) {
+                    bits.Write(track_language.GetChars()[0], 8);
+                    bits.Write(track_language.GetChars()[1], 8);
+                    bits.Write(track_language.GetChars()[2], 8);
+                } else {
+                    bits.Write(0x75, 8);
+                    bits.Write(0x6E, 8);
+                    bits.Write(0x64, 8);
+                }
+                 // setup the audio stream
+                result = ts_writer->SetAudioStream(audio_track->GetMediaTimeScale(),
+                                                   stream_type,
+                                                   stream_id,
+                                                   audio_stream,
+                                                   Options.audio_pid,
+                                                   bits.GetData(), 8,
+                                                   Options.pcr_offset);
+            } else {
             // setup the audio stream
             result = ts_writer->SetAudioStream(audio_track->GetMediaTimeScale(),
                                                stream_type,
@@ -2026,6 +2104,7 @@
                                                Options.audio_pid,
                                                NULL, 0,
                                                Options.pcr_offset);
+            }
             if (AP4_FAILED(result)) {
                 fprintf(stderr, "could not create audio stream (%d)\n", result);
                 goto end;

bento4-1.6.0r637.tar.gz/Source/C++/Apps/Mp42Ts/Mp42Ts.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Apps/Mp42Ts/Mp42Ts.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Apps/Mp4DcfPackager/Mp4DcfPackager.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Apps/Mp4DcfPackager/Mp4DcfPackager.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Apps/Mp4Fragment/Mp4Fragment.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Apps/Mp4Fragment/Mp4Fragment.cpp Changed

@@ -31,15 +31,16 @@
 +---------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "Ap4.h"
 
 /*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
-#define BANNER "MP4 Fragmenter - Version 1.6.1\n"\
+#define BANNER "MP4 Fragmenter - Version 1.7.0\n"\
                "(Bento4 Version " AP4_VERSION_STRING ")\n"\
-               "(c) 2002-2019 Axiomatic Systems, LLC"
+               "(c) 2002-2020 Axiomatic Systems, LLC"
 
 /*----------------------------------------------------------------------
 |   constants
@@ -93,6 +94,7 @@
             "    '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"
+            "  --trun-version-zero set the 'trun' box version to zero (default version: 1)\n"
             );
     exit(1);
 }
@@ -308,7 +310,8 @@
          AP4_UI32                 fragment_duration,
          AP4_UI32                 timescale,
          bool                     create_segment_index,
-         bool                     copy_udta)
+         bool                     copy_udta,
+         bool                     trun_version_one)
 {
     AP4_List<FragmentInfo>       fragments;
     AP4_List<IndexedSegmentInfo> indexed_segments;
@@ -323,7 +326,13 @@
     }
 
     // create the output file object
-    AP4_Movie* output_movie = new AP4_Movie(AP4_FRAGMENTER_OUTPUT_MOVIE_TIMESCALE);
+    AP4_UI64 creation_time = 0;
+    time_t now = time(NULL);
+    if (now != (time_t)-1) {
+        // adjust the time based on the MPEG time origin
+        creation_time = (AP4_UI64)now + 0x7C25B080;
+    }
+    AP4_Movie* output_movie = new AP4_Movie(AP4_FRAGMENTER_OUTPUT_MOVIE_TIMESCALE, 0, creation_time, creation_time);
     
     // create an mvex container
     AP4_ContainerAtom* mvex = new AP4_ContainerAtom(AP4_ATOM_TYPE_MVEX);
@@ -359,49 +368,51 @@
                                                 track);
         
         // add an edit list if needed
-        if (const AP4_TrakAtom* trak = track->GetTrakAtom()) {
-            AP4_ContainerAtom* edts = AP4_DYNAMIC_CAST(AP4_ContainerAtom, trak->GetChild(AP4_ATOM_TYPE_EDTS));
-            if (edts) {
-                // create an 'edts' container
-                AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
-                
-                // create a new 'edts' for each original 'edts'
-                for (AP4_List<AP4_Atom>::Item* edts_entry = edts->GetChildren().FirstItem();
-                     edts_entry;
-                     edts_entry = edts_entry->GetNext()) {
-                    AP4_ElstAtom* elst = AP4_DYNAMIC_CAST(AP4_ElstAtom, edts_entry->GetData());
-                    AP4_ElstAtom* new_elst = new AP4_ElstAtom();
-                    
-                    // 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];
-                        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(),
-                                                                                   timescale?timescale:track->GetMediaTimeScale());
-                                                                               
-                        }
-                        new_elst->AddEntry(new_elst_entry);
-                    }
-                    
-                    // add the 'elst' to the 'edts' container
-                    new_edts->AddChild(new_elst);
-                }
-                
-                // add the edit list to the output track (just after the 'tkhd' atom)
-                output_track->UseTrakAtom()->AddChild(new_edts, 1);
-            }
+        if (!trun_version_one) {
+          if (const AP4_TrakAtom* trak = track->GetTrakAtom()) {
+              AP4_ContainerAtom* edts = AP4_DYNAMIC_CAST(AP4_ContainerAtom, trak->GetChild(AP4_ATOM_TYPE_EDTS));
+              if (edts) {
+                  // create an 'edts' container
+                  AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+                  
+                  // create a new 'edts' for each original 'edts'
+                  for (AP4_List<AP4_Atom>::Item* edts_entry = edts->GetChildren().FirstItem();
+                       edts_entry;
+                       edts_entry = edts_entry->GetNext()) {
+                      AP4_ElstAtom* elst = AP4_DYNAMIC_CAST(AP4_ElstAtom, edts_entry->GetData());
+                      AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+                      
+                      // 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];
+                          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(),
+                                                                                     timescale?timescale:track->GetMediaTimeScale());
+                                                                                 
+                          }
+                          new_elst->AddEntry(new_elst_entry);
+                      }
+                      
+                      // add the 'elst' to the 'edts' container
+                      new_edts->AddChild(new_elst);
+                  }
+                  
+                  // add the edit list to the output track (just after the 'tkhd' atom)
+                  output_track->UseTrakAtom()->AddChild(new_edts, 1);
+              }
+          }
         }
         
         // add the track to the output
@@ -633,12 +644,19 @@
         AP4_UI32 trun_flags = AP4_TRUN_FLAG_DATA_OFFSET_PRESENT |
                               AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT;
         AP4_UI32 first_sample_flags = 0;
-        if (cursor->m_Track->GetType() == AP4_Track::TYPE_VIDEO) {
+        if ( (cursor->m_Track->GetType() == AP4_Track::TYPE_VIDEO) ||
+             (cursor->m_Track->GetSampleDescriptionCount() >= 1 && cursor->m_Track->GetSampleDescription(0)->GetFormat() == AP4_SAMPLE_FORMAT_AC_4) ) {
             trun_flags |= AP4_TRUN_FLAG_FIRST_SAMPLE_FLAGS_PRESENT;
             first_sample_flags = 0x2000000; // sample_depends_on=2 (I frame)
         }
         AP4_TrunAtom* trun = new AP4_TrunAtom(trun_flags, 0, first_sample_flags);
         
+        unsigned int initial_offset = 0;
+        if(trun_version_one) {
+            trun->SetVersion(1);
+            initial_offset = cursor->m_Sample.GetCtsDelta();
+        }
+
         traf->AddChild(trun);
         moof->AddChild(traf);
         
@@ -675,6 +693,9 @@
                                                                                   timescale):
                                                         cursor->m_Sample.GetCtsDelta();
                         
+            if (trun->GetVersion() == 1) {
+                trun_entry.sample_composition_time_offset -= initial_offset;
+            }
             fragment->m_SampleIndexes.SetItemCount(sample_count+1);
             fragment->m_SampleIndexes[sample_count] = cursor->m_SampleIndex;
             fragment->m_MdatSize += trun_entry.sample_size;
@@ -847,6 +868,7 @@
             reference.m_ReferencedSize     = segment->m_Size;
             reference.m_SubsegmentDuration = segment->m_Duration;
             reference.m_StartsWithSap      = true;
+            reference.m_SapType            = 1;
             sidx->SetReference(segment_index++, reference);
         }
         AP4_Position here = 0;
@@ -1088,6 +1110,7 @@
     bool         create_segment_index          = false;
     bool         quiet                         = false;
     bool         copy_udta                     = false;
+    bool         trun_version_one              = true;
     AP4_UI32     timescale                     = 0;
     AP4_Result   result;
 
@@ -1169,6 +1192,8 @@
                 fprintf(stderr, "ERROR: missing argument after --track option\n");
                 return 1;
             }
+        } else if (!strcmp(arg, "--trun-version-zero")) {
+            trun_version_one = false;
         } else if (!strcmp(arg, "--copy-udta")) {
             copy_udta = true;
         } else if (!strcmp(arg, "--no-zero-elst")) {
@@ -1421,7 +1446,7 @@
     } else {
         tracks_to_fragment = cursors;
     }
-    Fragment(input_file, *output_stream, tracks_to_fragment, fragment_duration, timescale, create_segment_index, copy_udta);
+    Fragment(input_file, *output_stream, tracks_to_fragment, fragment_duration, timescale, create_segment_index, copy_udta, trun_version_one);
     
     // cleanup and exit
     if (input_stream)  input_stream->Release();

bento4-1.6.0r637.tar.gz/Source/C++/Apps/Mp4Info/Mp4Info.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Apps/Mp4Info/Mp4Info.cpp Changed

@@ -299,17 +299,13 @@
     AP4_MpegAudioSampleDescription::Mpeg4AudioObjectType object_type = 
         mpeg_audio_desc.GetMpeg4AudioObjectType();
     const char* object_type_string = AP4_MpegAudioSampleDescription::GetMpeg4AudioObjectTypeString(object_type);
-    AP4_String codec_string;
-    mpeg_audio_desc.GetCodecString(codec_string);
     
     switch (Options.format) {
         case TEXT_FORMAT:
-            printf("    Codecs String: %s\n", codec_string.GetChars());
             printf("    MPEG-4 Audio Object Type: %d (%s)\n", object_type, object_type_string);
             break;
 
         case JSON_FORMAT:
-            printf("\"codecs_string\": \"%s\",\n", codec_string.GetChars());
             printf("\"mpeg_4_audio_object_type\":%d,\n",          object_type);
             printf("\"mpeg_4_audio_object_type_name\":\"%s\"", object_type_string);
             break;
@@ -388,14 +384,19 @@
     
     char coding[5];
     AP4_FormatFourChars(coding, desc->GetFormat());
-    printf(    "    Coding:      %s", coding);
+    printf(    "    Coding:       %s", coding);
     const char* format_name = AP4_GetFormatName(desc->GetFormat());
     if (format_name) {
         printf(" (%s)\n", format_name);
     } else {
         printf("\n");
     }
-    if (desc->GetType() == AP4_SampleDescription::TYPE_MPEG) {
+    AP4_String codec;
+    desc->GetCodecString(codec);
+    printf(    "    Codec String: %s\n", codec.GetChars());
+    
+    switch (desc->GetType()) {
+      case AP4_SampleDescription::TYPE_MPEG: {
         // MPEG sample description
         AP4_MpegSampleDescription* mpeg_desc = AP4_DYNAMIC_CAST(AP4_MpegSampleDescription, desc);
 
@@ -411,93 +412,11 @@
             AP4_MpegAudioSampleDescription* mpeg_audio_desc = AP4_DYNAMIC_CAST(AP4_MpegAudioSampleDescription, mpeg_desc);
             if (mpeg_audio_desc) ShowMpegAudioSampleDescription(*mpeg_audio_desc);
         }
-    }
-    AP4_AudioSampleDescription* audio_desc = 
-        AP4_DYNAMIC_CAST(AP4_AudioSampleDescription, desc);
-    if (audio_desc) {
-        // Audio sample description
-        printf("    Sample Rate: %d\n", audio_desc->GetSampleRate());
-        printf("    Sample Size: %d\n", audio_desc->GetSampleSize());
-        printf("    Channels:    %d\n", audio_desc->GetChannelCount());
-    }
-    AP4_VideoSampleDescription* video_desc = 
-        AP4_DYNAMIC_CAST(AP4_VideoSampleDescription, desc);
-    if (video_desc) {
-        // Video sample description
-        printf("    Width:       %d\n", video_desc->GetWidth());
-        printf("    Height:      %d\n", video_desc->GetHeight());
-        printf("    Depth:       %d\n", video_desc->GetDepth());
-    }
-
-    // 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) {
-            printf("    AC-3 Data Rate: %d\n", dec3->GetDataRate());
-            for (unsigned int i=0; i<dec3->GetSubStreams().ItemCount(); i++) {
-                printf("    AC-3 Substream %d:\n", i);
-                printf("        fscod       = %d\n", dec3->GetSubStreams()[i].fscod);
-                printf("        bsid        = %d\n", dec3->GetSubStreams()[i].bsid);
-                printf("        bsmod       = %d\n", dec3->GetSubStreams()[i].bsmod);
-                printf("        acmod       = %d\n", dec3->GetSubStreams()[i].acmod);
-                printf("        lfeon       = %d\n", dec3->GetSubStreams()[i].lfeon);
-                printf("        num_dep_sub = %d\n", dec3->GetSubStreams()[i].num_dep_sub);
-                printf("        chan_loc    = %d\n", dec3->GetSubStreams()[i].chan_loc);
-            }
-            printf("    AC-3 dec3 payload: [");
-            ShowData(dec3->GetRawBytes());
-            printf("]\n");
-        }
-    }
-
-    // Dolby AC-4 specifics
-    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_AC_4) {
-        AP4_Dac4Atom* dac4 = AP4_DYNAMIC_CAST(AP4_Dac4Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DAC4));
-        if (dac4) {
-            printf("    Codecs String: ");
-            AP4_String codec;
-            dac4->GetCodecString(codec);
-            printf("%s", codec.GetChars());
-            printf("\n");
-
-            const AP4_Dac4Atom::Ac4Dsi& dsi = dac4->GetDsi();
-            if (dsi.ac4_dsi_version == 1) {
-                for (unsigned int i = 0; i < dsi.d.v1.n_presentations; i++) {
-                    AP4_Dac4Atom::Ac4Dsi::PresentationV1& presentation = dsi.d.v1.presentations[i];
-                    if (presentation.presentation_version == 1) {
-                        printf("    AC-4 Presentation %d:\n", i);
-                        printf("        presentation_channel_mask_v1 = %x\n",
-                               presentation.d.v1.presentation_channel_mask_v1);
-                    }
-                }
-            }
-            
-            printf("    AC-4 dac4 payload: [");
-            ShowData(dac4->GetRawBytes());
-            printf("]\n");
-        }
-    }
+        break;
+      }
 
-    // AVC specifics
-    if (desc->GetType() == AP4_SampleDescription::TYPE_AVC) {
-        // AVC Sample Description
+      case AP4_SampleDescription::TYPE_AVC: {
+        // AVC specifics
         AP4_AvcSampleDescription* avc_desc = AP4_DYNAMIC_CAST(AP4_AvcSampleDescription, desc);
         const char* profile_name = AP4_AvccAtom::GetProfileName(avc_desc->GetProfile());
         printf("    AVC Profile:          %d", avc_desc->GetProfile());
@@ -525,13 +444,11 @@
             sep = ", ";
         }
         printf("]\n");
-        printf("    Codecs String: ");
-        AP4_String codec;
-        avc_desc->GetCodecString(codec);
-        printf("%s", codec.GetChars());
-        printf("\n");
-    } else if (desc->GetType() == AP4_SampleDescription::TYPE_HEVC) {
-        // HEVC Sample Description
+        break;
+      }
+
+      case AP4_SampleDescription::TYPE_HEVC: {
+        // HEVC specifics
         AP4_HevcSampleDescription* hevc_desc = AP4_DYNAMIC_CAST(AP4_HevcSampleDescription, desc);
         const char* profile_name = AP4_HvccAtom::GetProfileName(hevc_desc->GetGeneralProfileSpace(), hevc_desc->GetGeneralProfile());
         printf("    HEVC Profile Space:       %d\n", hevc_desc->GetGeneralProfileSpace());
@@ -569,34 +486,169 @@
             }
             printf("\n      }\n");
         }
-        printf("    Codecs String: ");
-        AP4_String codec;
-        hevc_desc->GetCodecString(codec);
-        printf("%s", codec.GetChars());
-        printf("\n");
-    }
-
-    // Dolby Vision specifics
-    AP4_DvccAtom* dvcc = AP4_DYNAMIC_CAST(AP4_DvccAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DVCC));
-    if (dvcc) {
-        printf("    Dolby Vision:\n");
-        printf("      Version:     %d.%d\n", dvcc->GetDvVersionMajor(), dvcc->GetDvVersionMinor());
-        const char* profile_name = AP4_DvccAtom::GetProfileName(dvcc->GetDvProfile());
+        break;
+      }
+
+      case AP4_SampleDescription::TYPE_AV1: {
+        // AV1 specifics
+        AP4_Av1SampleDescription* av1_desc = AP4_DYNAMIC_CAST(AP4_Av1SampleDescription, desc);
+        const char* profile_name = AP4_Av1cAtom::GetProfileName(av1_desc->GetSeqProfile());
+        printf("    AV1 Profile: %d", av1_desc->GetSeqProfile());
         if (profile_name) {
-            printf("      Profile:     %s\n", profile_name);
+            printf(" (%s)\n", profile_name);
         } else {
-            printf("      Profile:     %d\n", dvcc->GetDvProfile());
+            printf("\n");
         }
-        printf("      Level:       %d\n", dvcc->GetDvLevel());
-        printf("      RPU Present: %s\n", dvcc->GetRpuPresentFlag()?"true":"false");
-        printf("      EL Present:  %s\n", dvcc->GetElPresentFlag()?"true":"false");
-        printf("      BL Present:  %s\n", dvcc->GetBlPresentFlag()?"true":"false");
+        printf("    AV1 Level:   %d.%d\n",
+               2 + (av1_desc->GetSeqLevelIdx0() / 4),
+               av1_desc->GetSeqLevelIdx0() % 4);
+        printf("    AV1 Tier:    %d\n", av1_desc->GetSeqTier0());
+        break;
+      }
+      
+      case AP4_SampleDescription::TYPE_SUBTITLES: {
+        // Subtitles
+        AP4_SubtitleSampleDescription* subt_desc = AP4_DYNAMIC_CAST(AP4_SubtitleSampleDescription, desc);
+        printf("    Subtitles:\n");
+        printf("       Namespace:       %s\n", subt_desc->GetNamespace().GetChars());
+        printf("       Schema Location: %s\n", subt_desc->GetSchemaLocation().GetChars());
+        printf("       Image Mime Type: %s\n", subt_desc->GetImageMimeType().GetChars());
+        break;
+      }
+
+      default:
+        break;
     }
     
-    // VPx Specifics
-    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_VP8 ||
-        desc->GetFormat() == AP4_SAMPLE_FORMAT_VP9 ||
-        desc->GetFormat() == AP4_SAMPLE_FORMAT_VP10) {
+    AP4_AudioSampleDescription* audio_desc = 
+        AP4_DYNAMIC_CAST(AP4_AudioSampleDescription, desc);
+    if (audio_desc) {
+        // Audio sample description
+        printf("    Sample Rate: %d\n", audio_desc->GetSampleRate());
+        printf("    Sample Size: %d\n", audio_desc->GetSampleSize());
+        printf("    Channels:    %d\n", audio_desc->GetChannelCount());
+    }
+    AP4_VideoSampleDescription* video_desc = 
+        AP4_DYNAMIC_CAST(AP4_VideoSampleDescription, desc);
+    if (video_desc) {
+        // Video sample description
+        printf("    Width:       %d\n", video_desc->GetWidth());
+        printf("    Height:      %d\n", video_desc->GetHeight());
+        printf("    Depth:       %d\n", video_desc->GetDepth());
+    }
+
+    switch (desc->GetFormat()) {
+      case AP4_SAMPLE_FORMAT_AC_3: {
+        // Dolby Digital specifics
+        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");
+        }
+        break;
+      }
+
+      case AP4_SAMPLE_FORMAT_EC_3: {
+        // Dolby Digital Plus specifics
+        AP4_Dec3Atom* dec3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DEC3));
+        if (dec3) {
+            printf("    E-AC-3 Data Rate: %d\n", dec3->GetDataRate());
+            for (unsigned int i=0; i<dec3->GetSubStreams().ItemCount(); i++) {
+                printf("    E-AC-3 Substream %d:\n", i);
+                printf("        fscod       = %d\n", dec3->GetSubStreams()[i].fscod);
+                printf("        bsid        = %d\n", dec3->GetSubStreams()[i].bsid);
+                printf("        bsmod       = %d\n", dec3->GetSubStreams()[i].bsmod);
+                printf("        acmod       = %d\n", dec3->GetSubStreams()[i].acmod);
+                printf("        lfeon       = %d\n", dec3->GetSubStreams()[i].lfeon);
+                printf("        num_dep_sub = %d\n", dec3->GetSubStreams()[i].num_dep_sub);
+                printf("        chan_loc    = %d\n", dec3->GetSubStreams()[i].chan_loc);
+            }
+            if (dec3->GetFlagEC3ExtensionTypeA()){
+                printf("    Dolby Digital Plus with Dolby Atmos: Yes\n");
+                printf("    Dolby Atmos Complexity Index: %d\n", dec3->GetComplexityIndexTypeA());
+            } else {
+                printf("    Dolby Digital Plus with Dolby Atmos: No\n");
+            }
+            printf("    E-AC-3 dec3 payload: [");
+            ShowData(dec3->GetRawBytes());
+            printf("]\n");
+        }
+        break;
+      }
+
+      case AP4_SAMPLE_FORMAT_AC_4: {
+        // Dolby AC-4 specifics
+        AP4_Dac4Atom* dac4 = AP4_DYNAMIC_CAST(AP4_Dac4Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DAC4));
+        if (dac4) {
+            const AP4_Dac4Atom::Ac4Dsi& dsi = dac4->GetDsi();
+            unsigned short self_contained = 0;
+            if (dsi.ac4_dsi_version == 1) {
+                for (unsigned int i = 0; i < dsi.d.v1.n_presentations; i++) {
+                    AP4_Dac4Atom::Ac4Dsi::PresentationV1& presentation = dsi.d.v1.presentations[i];
+                    if (presentation.presentation_version == 1 || presentation.presentation_version == 2) {
+                        printf("    AC-4 Presentation %d:\n", i);
+
+                        char presentation_type [64];
+                        char presentation_codec[64];
+                        char presentation_lang [64 + 1] = "un";
+                        AP4_FormatString(presentation_codec,
+                                         sizeof(presentation_codec),
+                                         "ac-4.%02x.%02x.%02x",
+                                         dsi.d.v1.bitstream_version,
+                                         presentation.presentation_version,
+                                         presentation.d.v1.mdcompat);
+                        for (int sg = 0; sg < presentation.d.v1.n_substream_groups; sg++){
+                            if ( presentation.d.v1.substream_groups[sg].d.v1.b_content_type &&
+                                (presentation.d.v1.substream_groups[sg].d.v1.content_classifier == 0 ||presentation.d.v1.substream_groups[sg].d.v1.content_classifier == 4) &&
+                                 presentation.d.v1.substream_groups[sg].d.v1.b_language_indicator){
+                                     memcpy(presentation_lang, presentation.d.v1.substream_groups[sg].d.v1.language_tag_bytes, presentation.d.v1.substream_groups[sg].d.v1.n_language_tag_bytes);
+                                     presentation_lang[presentation.d.v1.substream_groups[sg].d.v1.n_language_tag_bytes] = '\0';
+                            }
+                        }
+                        if (presentation.d.v1.b_multi_pid == 0) { self_contained ++; }
+                        if (presentation.d.v1.b_presentation_channel_coded == 1) {
+                            AP4_FormatString(presentation_type, sizeof(presentation_type), "Channel based");
+                            if (presentation.d.v1.dsi_presentation_ch_mode >= 11 && presentation.d.v1.dsi_presentation_ch_mode <= 15) {
+                                AP4_FormatString(presentation_type, sizeof(presentation_type), "Channel based immsersive");
+                            }
+                        } else {
+                            AP4_FormatString(presentation_type, sizeof(presentation_type), "Object based");
+                        }
+                        if (presentation.presentation_version == 2) {
+                            printf("        Stream Type = Immersive stereo\n");
+                        }else {
+                            printf("        Stream Type = %s\n", presentation_type);
+                        }
+                        printf("        presentation_id = %d\n", presentation.d.v1.b_presentation_id? presentation.d.v1.presentation_id : -1);
+                        printf("        Codec String = %s\n", presentation_codec);
+                        printf("        presentation_channel_mask_v1 = 0x%x\n", presentation.d.v1.presentation_channel_mask_v1);
+                        printf("        Dolby Atmos source = %s\n", presentation.d.v1.dolby_atmos_indicator? "Yes": "No");
+                        printf("        Language = %s\n", presentation_lang);
+                        printf("        Self Contained = %s\n", presentation.d.v1.b_multi_pid? "No": "Yes");
+                    }
+                }
+            }
+            
+            printf("    Self Contained: %s\n", (self_contained == dsi.d.v1.n_presentations) ? "Yes": ((self_contained == 0)? "No": "Part"));
+            printf("    AC-4 dac4 payload: [");
+            ShowData(dac4->GetRawBytes());
+            printf("]\n");
+        }
+        break;
+      }
+
+      // VPx Specifics
+      case AP4_SAMPLE_FORMAT_VP8:
+      case AP4_SAMPLE_FORMAT_VP9:
+      case 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());
@@ -607,20 +659,28 @@
             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");
         }
+        break;
+      }
     }
-
-    // Subtitles
-    if (desc->GetType() == AP4_SampleDescription::TYPE_SUBTITLES) {
-        AP4_SubtitleSampleDescription* subt_desc = AP4_DYNAMIC_CAST(AP4_SubtitleSampleDescription, desc);
-        printf("    Subtitles:\n");
-        printf("       Namespace:       %s\n", subt_desc->GetNamespace().GetChars());
-        printf("       Schema Location: %s\n", subt_desc->GetSchemaLocation().GetChars());
-        printf("       Image Mime Type: %s\n", subt_desc->GetImageMimeType().GetChars());
+    
+    // Dolby Vision specifics
+    AP4_DvccAtom* dvcc = AP4_DYNAMIC_CAST(AP4_DvccAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DVCC));
+    if (dvcc) {
+        /* Dolby Vision */
+        printf("    Dolby Vision:\n");
+        printf("      Version:     %d.%d\n", dvcc->GetDvVersionMajor(), dvcc->GetDvVersionMinor());
+        const char* profile_name = AP4_DvccAtom::GetProfileName(dvcc->GetDvProfile());
+        if (profile_name) {
+            printf("      Profile:     %s\n", profile_name);
+        } else {
+            printf("      Profile:     %d\n", dvcc->GetDvProfile());
+        }
+        printf("      Level:       %d\n", dvcc->GetDvLevel());
+        printf("      RPU Present: %s\n", dvcc->GetRpuPresentFlag()?"true":"false");
+        printf("      EL Present:  %s\n", dvcc->GetElPresentFlag()?"true":"false");
+        printf("      BL Present:  %s\n", dvcc->GetBlPresentFlag()?"true":"false");
+        printf("      BL Signal Compatibility ID:  %d\n", dvcc->GetDvBlSignalCompatibilityID());
     }
 }
 
@@ -644,14 +704,13 @@
     AP4_FormatFourChars(coding, desc->GetFormat());
     const char* format_name = AP4_GetFormatName(desc->GetFormat());
     printf("\"coding\":\"%s\",\n", coding);
-    printf("\"coding_name\":");
-    if (format_name) {
-        printf("\"%s\"", format_name);
-    } else {
-        printf("\"\"");
-    }
+    printf("\"coding_name\":\"%s\",\n", format_name ? format_name : "");
+    AP4_String codec;
+    desc->GetCodecString(codec);
+    printf("\"codecs_string\":\"%s\"", codec.GetChars());
     
-    if (desc->GetType() == AP4_SampleDescription::TYPE_MPEG) {
+    switch (desc->GetType()) {
+      case AP4_SampleDescription::TYPE_MPEG: {
         // MPEG sample description
         AP4_MpegSampleDescription* mpeg_desc = AP4_DYNAMIC_CAST(AP4_MpegSampleDescription, desc);
 
@@ -662,7 +721,7 @@
         printf("\"object_type_name\":\"%s\",\n", mpeg_desc->GetObjectTypeString(mpeg_desc->GetObjectTypeId()));
         printf("\"max_bitrate\":%d,\n",          mpeg_desc->GetMaxBitrate());
         printf("\"average_bitrate\":%d,\n",      mpeg_desc->GetAvgBitrate());
-        printf("\"buffer_size\":%d,\n",             mpeg_desc->GetBufferSize());
+        printf("\"buffer_size\":%d,\n",          mpeg_desc->GetBufferSize());
         printf("\"decoder_info\": \"");
         ShowData(mpeg_desc->GetDecoderInfo());
         printf("\"");
@@ -675,7 +734,118 @@
                 ShowMpegAudioSampleDescription(*mpeg_audio_desc);
             }
         }
+        break;
+      }
+
+      case AP4_SampleDescription::TYPE_AVC: {
+        // AVC specifics
+        AP4_AvcSampleDescription* avc_desc = AP4_DYNAMIC_CAST(AP4_AvcSampleDescription, desc);
+        printf(",\n");
+        printf("\"avc_profile\":%d,\n",        avc_desc->GetProfile());
+        const char* profile_name = AP4_AvccAtom::GetProfileName(avc_desc->GetProfile());
+        if (profile_name) printf("\"avc_profile_name\":\"%s\",\n", profile_name);
+        printf("\"avc_profile_compat\":%d,\n", avc_desc->GetProfileCompatibility());
+        printf("\"avc_level\":%d,\n",          avc_desc->GetLevel());
+        printf("\"avc_nalu_length_size\":%d,\n",  avc_desc->GetNaluLengthSize());
+        printf("\"avc_sps\": [");
+        const char* sep = "";
+        for (unsigned int i=0; i<avc_desc->GetSequenceParameters().ItemCount(); i++) {
+            printf("%s", sep);
+            printf("\"");
+            ShowData(avc_desc->GetSequenceParameters()[i]);
+            printf("\"");
+            sep = ", ";
+        }
+        printf("],\n");
+        printf("\"avc_pps\": [");
+        sep = "";
+        for (unsigned int i=0; i<avc_desc->GetPictureParameters().ItemCount(); i++) {
+            printf("%s", sep);
+            printf("\"");
+            ShowData(avc_desc->GetPictureParameters()[i]);
+            printf("\"");
+            sep = ", ";
+        }
+        printf("]");
+        break;
+      }
+      
+      case AP4_SampleDescription::TYPE_HEVC: {
+        // HEVC Specifics
+        AP4_HevcSampleDescription* hevc_desc = AP4_DYNAMIC_CAST(AP4_HevcSampleDescription, desc);
+        printf(",\n");
+        printf("\"hevc_profile_space\":%d,\n", hevc_desc->GetGeneralProfileSpace());
+        printf("\"hevc_profile\":%d,\n", hevc_desc->GetGeneralProfile());
+        const char* profile_name = AP4_HvccAtom::GetProfileName(hevc_desc->GetGeneralProfileSpace(), hevc_desc->GetGeneralProfile());
+        if (profile_name) printf("\"hevc_profile_name\":\"%s\",\n", profile_name);
+        printf("\"hevc_profile_compat\":%d,\n", hevc_desc->GetGeneralProfileCompatibilityFlags());
+        printf("\"hevc_constraints\":%llu,\n", hevc_desc->GetGeneralConstraintIndicatorFlags());
+        printf("\"hevc_level\":%d,\n", hevc_desc->GetGeneralLevel());
+        printf("\"hevc_level_name\":\"%d.%d\",\n", hevc_desc->GetGeneralLevel()/30, (hevc_desc->GetGeneralLevel()%30)/3);
+        printf("\"hevc_tier\":%d,\n", hevc_desc->GetGeneralTierFlag());
+        printf("\"hevc_chroma_format\":%d,\n", hevc_desc->GetChromaFormat());
+        const char* chroma_format_name = AP4_HvccAtom::GetChromaFormatName(hevc_desc->GetChromaFormat());
+        if (chroma_format_name) printf("\"hevc_chroma_format_name\":\"%s\",\n", chroma_format_name);
+        printf("\"hevc_chroma_bit_depth\":%d,\n", hevc_desc->GetChromaBitDepth());
+        printf("\"hevc_lunma_bit_depth\":%d,\n", hevc_desc->GetLumaBitDepth());
+        printf("\"hevc_average_frame_rate\":%d,\n", hevc_desc->GetAverageFrameRate());
+        printf("\"hevc_constant_frame_rate\":%d,\n", hevc_desc->GetConstantFrameRate());
+        printf("\"hevc_nalu_length_size\":%d,\n", hevc_desc->GetNaluLengthSize());
+        printf("\"hevc_sequences\": [\n");
+        const char* seq_sep = "";
+        for (unsigned int i=0; i<hevc_desc->GetSequences().ItemCount(); i++) {
+            const AP4_HvccAtom::Sequence& seq = hevc_desc->GetSequences()[i];
+            printf("%s      {\n", seq_sep);
+            printf("        \"array_completeness\":%d,\n", seq.m_ArrayCompleteness);
+            printf("        \"type\":%d,\n", seq.m_NaluType);
+            const char* nalu_type_name = AP4_HevcNalParser::NaluTypeName(seq.m_NaluType);
+            if (nalu_type_name) {
+                printf("        \"type_name\":\"%s\",\n", nalu_type_name);
+            }
+            printf("        \"data\":[");
+            const char* sep = "";
+            for (unsigned int j=0; j<seq.m_Nalus.ItemCount(); j++) {
+                printf("%s", sep);
+                printf("\"");
+                ShowData(seq.m_Nalus[j]);
+                printf("\"");
+                sep = ", ";
+            }
+            printf("]\n      }");
+            seq_sep = ",\n";
+        }
+        printf("]");
+        break;
+      }
+      
+      case AP4_SampleDescription::TYPE_AV1: {
+        // AV1 specifics
+        AP4_Av1SampleDescription* av1_desc = AP4_DYNAMIC_CAST(AP4_Av1SampleDescription, desc);
+        printf(",\n");
+        printf("\"av1_seq_profile\":%d,\n", av1_desc->GetSeqProfile());
+        const char* profile_name = AP4_Av1cAtom::GetProfileName(av1_desc->GetSeqProfile());
+        if (profile_name) printf("\"av1_seq_profile_name\":\"%s\",\n", profile_name);
+        printf("\"av1_seq_level_idx_0\":%d,\n", av1_desc->GetSeqLevelIdx0());
+        printf("\"av1_seq_tier_0\":%d", av1_desc->GetSeqTier0());
+        break;
+      }
+
+      case AP4_SampleDescription::TYPE_SUBTITLES: {
+        // Subtitles
+        printf(",\n");
+        printf("\"subtitles\": {\n");
+        AP4_SubtitleSampleDescription* subt_desc = AP4_DYNAMIC_CAST(AP4_SubtitleSampleDescription, desc);
+        printf("  \"namespace\": \"%s\",\n",       subt_desc->GetNamespace().GetChars());
+        printf("  \"schema_location\": \"%s\",\n", subt_desc->GetSchemaLocation().GetChars());
+        printf("  \"image_mime_type\": \"%s\"\n",  subt_desc->GetImageMimeType().GetChars());
+        printf("}");
+        break;
+      }
+    
+      default:
+        break;
     }
+    
     AP4_AudioSampleDescription* audio_desc = AP4_DYNAMIC_CAST(AP4_AudioSampleDescription, desc);
     if (audio_desc) {
         // Audio sample description
@@ -684,6 +854,7 @@
         printf("\"sample_size\":%d,\n", audio_desc->GetSampleSize());
         printf("\"channels\":%d",       audio_desc->GetChannelCount());
     }
+    
     AP4_VideoSampleDescription* video_desc = 
         AP4_DYNAMIC_CAST(AP4_VideoSampleDescription, desc);
     if (video_desc) {
@@ -694,8 +865,9 @@
         printf("\"depth\":%d",     video_desc->GetDepth());
     }
 
-    // Dolby Digital specifics
-    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_AC_3) {
+    switch (desc->GetFormat()) {
+      case AP4_SAMPLE_FORMAT_AC_3: {
+        // Dolby Digital specifics
         AP4_Dac3Atom* dac3 = AP4_DYNAMIC_CAST(AP4_Dac3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE('d', 'a', 'c', '3')));
         if (dac3) {
             printf(",\n");
@@ -713,10 +885,11 @@
             printf("  }\n");
             printf("}");
         }
-    }
+        break;
+      }
 
-    // Dolby Digital Plus specifics
-    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_EC_3) {
+      case AP4_SAMPLE_FORMAT_EC_3: {
+        // Dolby Digital Plus specifics
         AP4_Dec3Atom* dec3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE('d', 'e', 'c', '3')));
         if (dec3) {
             printf(",\n");
@@ -725,6 +898,12 @@
             ShowData(dec3->GetRawBytes());
             printf("\",\n");
             printf("  \"data_rate\": %d,\n", dec3->GetDataRate());
+            if (dec3->GetFlagEC3ExtensionTypeA()){
+                printf("  \"Dolby Digital Plus with Dolby Atmos\": \"Yes\",\n");
+                printf("  \"Dolby Atmos Complexity Index\": %d,\n", dec3->GetComplexityIndexTypeA());
+            } else {
+                printf("  \"Dolby Digital Plus with Dolby Atmos\": \"No\",\n");
+            }
             printf("  \"substreams\": [\n");
             const char* sep = "";
             for (unsigned int i=0; i<dec3->GetSubStreams().ItemCount(); i++) {
@@ -741,10 +920,11 @@
             }
             printf("\n  ]\n}");
         }
-    }
+        break;
+      }
 
-    // Dolby AC-4 specifics
-    if (desc->GetFormat() == AP4_SAMPLE_FORMAT_AC_4) {
+      case AP4_SAMPLE_FORMAT_AC_4: {
+        // Dolby AC-4 specifics
         AP4_Dac4Atom* dac4 = AP4_DYNAMIC_CAST(AP4_Dac4Atom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DAC4));
         if (dac4) {
             printf(",\n");
@@ -752,123 +932,90 @@
 
             printf("  \"presentations\": [\n");
             const AP4_Dac4Atom::Ac4Dsi& dsi = dac4->GetDsi();
+            unsigned short self_contained = 0;
             if (dsi.ac4_dsi_version == 1) {
                 const char* separator = "";
                 for (unsigned int i = 0; i < dsi.d.v1.n_presentations; i++) {
                     AP4_Dac4Atom::Ac4Dsi::PresentationV1& presentation = dsi.d.v1.presentations[i];
-                    if (presentation.presentation_version == 1) {
-                        printf("%s    { \"presentation_channel_mask_v1\": %u }",
-                               separator,
-                               presentation.d.v1.presentation_channel_mask_v1);
+                    if (presentation.presentation_version == 1 || presentation.presentation_version == 2) {
+                        printf("%s    { ", separator);
+                        
+                        char presentation_type [64];
+                        char presentation_codec[64];
+                        char presentation_lang [64 + 1] = "un";
+                        AP4_FormatString(presentation_codec,
+                                         sizeof(presentation_codec),
+                                         "ac-4.%02x.%02x.%02x",
+                                         dsi.d.v1.bitstream_version,
+                                         presentation.presentation_version,
+                                         presentation.d.v1.mdcompat);
+                        for (int sg = 0; sg < presentation.d.v1.n_substream_groups; sg++){
+                            if ( presentation.d.v1.substream_groups[sg].d.v1.b_content_type &&
+                                (presentation.d.v1.substream_groups[sg].d.v1.content_classifier == 0 ||presentation.d.v1.substream_groups[sg].d.v1.content_classifier == 4) &&
+                                 presentation.d.v1.substream_groups[sg].d.v1.b_language_indicator){
+                                     memcpy(presentation_lang, presentation.d.v1.substream_groups[sg].d.v1.language_tag_bytes, presentation.d.v1.substream_groups[sg].d.v1.n_language_tag_bytes);
+                                     presentation_lang[presentation.d.v1.substream_groups[sg].d.v1.n_language_tag_bytes] = '\0';
+                            }
+                        }
+                        if (presentation.d.v1.b_multi_pid == 0) { self_contained ++; }
+                        if (presentation.d.v1.b_presentation_channel_coded == 1) {
+                            AP4_FormatString(presentation_type, sizeof(presentation_type), "Channel based");
+                            if (presentation.d.v1.dsi_presentation_ch_mode >= 11 && presentation.d.v1.dsi_presentation_ch_mode <= 15) {
+                                AP4_FormatString(presentation_type, sizeof(presentation_type), "Channel based immsersive");
+                            }
+                        } else {
+                            AP4_FormatString(presentation_type, sizeof(presentation_type), "Object based");
+                        }
+                        if (presentation.presentation_version == 2) {
+                            printf("\"Stream Type\": \"Immersive stereo\", ");
+                        } else {
+                            printf("\"Stream Type\": \"%s\", ", presentation_type);
+                        }
+                        printf("\"presentation_id\": %d, ", presentation.d.v1.b_presentation_id? presentation.d.v1.presentation_id : -1);
+                        printf("\"presentation_channel_mask_v1\": %u, ",presentation.d.v1.presentation_channel_mask_v1);
+                        printf("\"Dolby Atmos source\": \"%s\", ", presentation.d.v1.dolby_atmos_indicator? "Yes": "No");
+                        printf("\"Language\": \"%s\", ", presentation_lang);
+                        printf("\"Self Contained\": \"%s\"} ", presentation.d.v1.b_multi_pid? "No": "Yes");
                         separator = ",\n";
                     }
                 }
             }
             printf("\n  ],\n");
 
+            printf("  \"Self Contained\": \"%s\",\n", (self_contained == dsi.d.v1.n_presentations) ? "Yes": ((self_contained == 0)? "No": "Part"));
             printf("  \"dac4_payload\": \"");
             ShowData(dac4->GetRawBytes());
-            printf("\"\n},\n");
-            
-            printf("\"codecs_string\":\"");
-            AP4_String codec;
-            dac4->GetCodecString(codec);
-            printf("%s", codec.GetChars());
-            printf("\"");
+            printf("\"\n}");
         }
-    }
+        break;
+      }
 
-    // AVC specifics
-    if (desc->GetType() == AP4_SampleDescription::TYPE_AVC) {
-        // AVC Sample Description
-        AP4_AvcSampleDescription* avc_desc = AP4_DYNAMIC_CAST(AP4_AvcSampleDescription, desc);
-        printf(",\n");
-        printf("\"avc_profile\":%d,\n",        avc_desc->GetProfile());
-        const char* profile_name = AP4_AvccAtom::GetProfileName(avc_desc->GetProfile());
-        if (profile_name) printf("\"avc_profile_name\":\"%s\",\n", profile_name);
-        printf("\"avc_profile_compat\":%d,\n", avc_desc->GetProfileCompatibility());
-        printf("\"avc_level\":%d,\n",          avc_desc->GetLevel());
-        printf("\"avc_nalu_length_size\":%d,\n",  avc_desc->GetNaluLengthSize());
-        printf("\"avc_sps\": [");
-        const char* sep = "";
-        for (unsigned int i=0; i<avc_desc->GetSequenceParameters().ItemCount(); i++) {
-            printf("%s", sep);
-            printf("\"");
-            ShowData(avc_desc->GetSequenceParameters()[i]);
-            printf("\"");
-            sep = ", ";
-        }
-        printf("],\n");
-        printf("\"avc_pps\": [");
-        sep = "";
-        for (unsigned int i=0; i<avc_desc->GetPictureParameters().ItemCount(); i++) {
-            printf("%s", sep);
-            printf("\"");
-            ShowData(avc_desc->GetPictureParameters()[i]);
-            printf("\"");
-            sep = ", ";
-        }
-        printf("],\n");
-        printf("\"codecs_string\":\"");
-        AP4_String codec;
-        avc_desc->GetCodecString(codec);
-        printf("%s", codec.GetChars());
-        printf("\"");
-    } else if (desc->GetType() == AP4_SampleDescription::TYPE_HEVC) {
-        // HEVC Sample Description
-        AP4_HevcSampleDescription* hevc_desc = AP4_DYNAMIC_CAST(AP4_HevcSampleDescription, desc);
-        printf(",\n");
-        printf("\"hevc_profile_space\":%d,\n", hevc_desc->GetGeneralProfileSpace());
-        printf("\"hevc_profile\":%d,\n", hevc_desc->GetGeneralProfile());
-        const char* profile_name = AP4_HvccAtom::GetProfileName(hevc_desc->GetGeneralProfileSpace(), hevc_desc->GetGeneralProfile());
-        if (profile_name) printf("\"hevc_profile_name\":\"%s\",\n", profile_name);
-        printf("\"hevc_profile_compat\":%d,\n", hevc_desc->GetGeneralProfileCompatibilityFlags());
-        printf("\"hevc_constraints\":%llu,\n", hevc_desc->GetGeneralConstraintIndicatorFlags());
-        printf("\"hevc_level\":%d,\n", hevc_desc->GetGeneralLevel());
-        printf("\"hevc_level_name\":\"%d.%d\",\n", hevc_desc->GetGeneralLevel()/30, (hevc_desc->GetGeneralLevel()%30)/3);
-        printf("\"hevc_tier\":%d,\n", hevc_desc->GetGeneralTierFlag());
-        printf("\"hevc_chroma_format\":%d,\n", hevc_desc->GetChromaFormat());
-        const char* chroma_format_name = AP4_HvccAtom::GetChromaFormatName(hevc_desc->GetChromaFormat());
-        if (chroma_format_name) printf("\"hevc_chroma_format_name\":\"%s\",\n", chroma_format_name);
-        printf("\"hevc_chroma_bit_depth\":%d,\n", hevc_desc->GetChromaBitDepth());
-        printf("\"hevc_lunma_bit_depth\":%d,\n", hevc_desc->GetLumaBitDepth());
-        printf("\"hevc_average_frame_rate\":%d,\n", hevc_desc->GetAverageFrameRate());
-        printf("\"hevc_constant_frame_rate\":%d,\n", hevc_desc->GetConstantFrameRate());
-        printf("\"hevc_nalu_length_size\":%d,\n", hevc_desc->GetNaluLengthSize());
-        printf("\"hevc_sequences\": [\n");
-        const char* seq_sep = "";
-        for (unsigned int i=0; i<hevc_desc->GetSequences().ItemCount(); i++) {
-            const AP4_HvccAtom::Sequence& seq = hevc_desc->GetSequences()[i];
-            printf("%s      {\n", seq_sep);
-            printf("        \"array_completeness\":%d,\n", seq.m_ArrayCompleteness);
-            printf("        \"type\":%d,\n", seq.m_NaluType);
-            const char* nalu_type_name = AP4_HevcNalParser::NaluTypeName(seq.m_NaluType);
-            if (nalu_type_name) {
-                printf("        \"type_name\":\"%s\",\n", nalu_type_name);
-            }
-            printf("        \"data\":[");
-            const char* sep = "";
-            for (unsigned int j=0; j<seq.m_Nalus.ItemCount(); j++) {
-                printf("%s", sep);
-                printf("\"");
-                ShowData(seq.m_Nalus[j]);
-                printf("\"");
-                sep = ", ";
-            }
-            printf("]\n      }");
-            seq_sep = ",\n";
+      case AP4_SAMPLE_FORMAT_VP8:
+      case AP4_SAMPLE_FORMAT_VP9:
+      case AP4_SAMPLE_FORMAT_VP10: {
+        // VPx Specifics
+        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("}");
         }
-        printf("\n],\n");
-        printf("\"codecs_string\":\"");
-        AP4_String codec;
-        hevc_desc->GetCodecString(codec);
-        printf("%s", codec.GetChars());
-        printf("\"");
+        break;
+      }
     }
-
+        
     // Dolby Vision specifics
     AP4_DvccAtom* dvcc = AP4_DYNAMIC_CAST(AP4_DvccAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DVCC));
     if (dvcc) {
+        /* Dolby Vision */
         printf(",\n");
         printf("\"dolby_vision\": {\n");
         printf("   \"version_major\": %d,\n", dvcc->GetDvVersionMajor());
@@ -879,46 +1026,11 @@
         printf("   \"level\": %d,\n", dvcc->GetDvLevel());
         printf("   \"rpu_present\": %s,\n", dvcc->GetRpuPresentFlag()?"true":"false");
         printf("   \"el_present\": %s,\n", dvcc->GetElPresentFlag()?"true":"false");
-        printf("   \"bl_present\": %s\n", dvcc->GetBlPresentFlag()?"true":"false");
+        printf("   \"bl_present\": %s,\n", dvcc->GetBlPresentFlag()?"true":"false");
+        printf("   \"dv_bl_signal_compatibility_id\": %d\n", dvcc->GetDvBlSignalCompatibilityID());
         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");
-        printf("\"subtitles\": {\n");
-        AP4_SubtitleSampleDescription* subt_desc = AP4_DYNAMIC_CAST(AP4_SubtitleSampleDescription, desc);
-        printf("  \"namespace\": \"%s\",\n",       subt_desc->GetNamespace().GetChars());
-        printf("  \"schema_location\": \"%s\",\n", subt_desc->GetSchemaLocation().GetChars());
-        printf("  \"image_mime_type\": \"%s\"\n",  subt_desc->GetImageMimeType().GetChars());
-        printf("}");
-    }
-    
     printf("\n}");
 }
 
@@ -1378,7 +1490,8 @@
     switch (Options.format) {
         case TEXT_FORMAT:
             printf("Movie:\n");
-            printf("  duration:   %d ms\n", movie.GetDurationMs());
+            printf("  duration:   %lld (media timescale units)\n", movie.GetDuration());
+            printf("  duration:   %d (ms)\n", movie.GetDurationMs());
             printf("  time scale: %d\n", movie.GetTimeScale());
             printf("  fragments:  %s\n", movie.HasFragments()?"yes":"no");
             printf("\n");
@@ -1771,6 +1884,8 @@
         } else {
             if (Options.format == TEXT_FORMAT) {
                 printf("No movie found in the file\n");
+            } else {
+                printf("\"movie\":{}\n");
             }
         }
     }

bento4-1.6.0r637.tar.gz/Source/C++/Apps/Mp4Mux/Mp4Mux.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Apps/Mp4Mux/Mp4Mux.cpp Changed

@@ -2,7 +2,7 @@
 |
 |    AP4 - Elementary Stream Muliplexer
 |
-|    Copyright 2002-2019 Axiomatic Systems, LLC
+|    Copyright 2002-2020 Axiomatic Systems, LLC
 |
 |
 |    This file is part of Bento4/AP4 (MP4 Atom Processing Library).
@@ -33,15 +33,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <time.h>
 
 #include "Ap4.h"
 
 /*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
-#define BANNER "MP4 Elementary Stream Multiplexer - Version 2.0\n"\
+#define BANNER "MP4 Elementary Stream Multiplexer - Version 3.0\n"\
                "(Bento4 Version " AP4_VERSION_STRING ")\n"\
-               "(c) 2002-20019 Axiomatic Systems, LLC"
+               "(c) 2002-20020 Axiomatic Systems, LLC"
 
 const unsigned int AP4_MUX_DEFAULT_VIDEO_FRAME_RATE = 24;
 const unsigned int AP4_MUX_READ_BUFFER_SIZE         = 65536;
@@ -92,9 +93,16 @@
             "  h264: H264/AVC NAL units\n"
             "  h265: H265/HEVC NAL units\n"
             "    optional params:\n"
+            "      dv_profile: integer number for Dolby vision profile ID (valid value: 5,8,9)\n"
+            "      dv_bc: integer number for Dolby vision BL signal cross-compatibility ID (mandatory if dv_profile is set to 8/9)\n"
             "      frame_rate: floating point number in frames per second (default=24.0)\n"
-            "      format: hev1 or hvc1 (default) for HEVC tracks\n"
+            "      format: hev1 or hvc1 (default) for HEVC tracks and Dolby Vision backward-compatible tracks\n"
+            "              dvhe or dvh1 (default) for Dolby vision tracks\n"
             "  aac:  AAC in ADTS format\n"
+            "  ac3:  Dolby Digital\n"
+            "  ec3:  Dolby Digital Plus\n"
+            "  ac4:  Dolby AC-4\n"
+
             "  mp4:  MP4 track(s) from an MP4 file\n"
             "    optional params:\n"
             "      track: audio, video, or integer track ID (default=all tracks)\n"
@@ -147,6 +155,158 @@
 }
 
 /*----------------------------------------------------------------------
+|   ComputeDoviLevel
++---------------------------------------------------------------------*/
+static AP4_Result
+ComputeDoviLevel(AP4_UI32 video_width, AP4_UI32 video_height, double frame_rate, AP4_UI32& dv_level)
+{
+    double level = video_width * video_height * frame_rate;
+
+    if (level <= 1280*720*24) {
+        dv_level = 1;
+    } else if (level<= 1280*720*30) {
+        dv_level = 2;
+    } else if (level <= 1920*1080*24) {
+        dv_level = 3;
+    } else if (level <= 1920*1080*30) {
+        dv_level = 4;
+    } else if (level <= 1920*1080*60) {
+        dv_level = 5;
+    } else if (level <= 3840*2160*24) {
+        dv_level = 6;
+    } else if (level <= 3840*2160*30) {
+        dv_level = 7;
+    } else if (level <= 3840*2160*48) {
+        dv_level = 8;
+    } else if (level <= 3840*2160*60) {
+        dv_level = 9;
+    } else if (level <= 3840*2160*120) {
+        if(video_width == 7680) {
+            dv_level = 11;
+        } else {
+            dv_level = 10;
+        }
+    } else if (level <= 7680*4320*60) {
+        dv_level = 12;
+    } else if (level <= (double)7680*4320*120) {
+        dv_level = 13;
+    }
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   CheckDoviInputParameters
++---------------------------------------------------------------------*/
+static AP4_Result
+CheckDoviInputParameters(AP4_Array<Parameter>& parameters)
+{
+    AP4_UI32 profile = 0;
+    AP4_UI32 bc = -1;
+    AP4_UI32 format = 0;
+
+    //check: profile set correctly
+    for (unsigned int i=0; i<parameters.ItemCount(); i++) {
+        if (parameters[i].m_Name == "dv_profile") {
+            profile = atoi(parameters[i].m_Value.GetChars());
+            if ((profile != 5) && (profile != 8) && (profile != 9)) {
+                fprintf(stderr, "ERROR: invalid dolby vision profile id\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        }
+    }
+
+    //check: bl signal compatibility id value range
+    for (unsigned int i=0; i<parameters.ItemCount(); i++) {
+        if (parameters[i].m_Name == "dv_bc") {
+            bc = atoi(parameters[i].m_Value.GetChars());
+            if (bc > 7) {
+                fprintf(stderr, "ERROR: invalid dolby vision bl signal compatibility id\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        }
+    }
+
+    for (unsigned int i=0; i<parameters.ItemCount(); i++) {
+        if (parameters[i].m_Name == "format") {
+            if (parameters[i].m_Value == "hvc1") {
+                format = AP4_SAMPLE_FORMAT_HVC1;
+            } else if (parameters[i].m_Value == "hev1") {
+                format = AP4_SAMPLE_FORMAT_HEV1;
+            } else if (parameters[i].m_Value == "dvh1") {
+                format = AP4_SAMPLE_FORMAT_DVH1;
+            } else if (parameters[i].m_Value == "dvhe") {
+                format = AP4_SAMPLE_FORMAT_DVHE;
+            } else if (parameters[i].m_Value == "dvav") {
+                format = AP4_SAMPLE_FORMAT_DVAV;
+            } else if (parameters[i].m_Value == "dva1") {
+                format = AP4_SAMPLE_FORMAT_DVA1;
+            }
+        }
+    }
+
+    //check: sample entry box name is set correctly
+    if (format) {
+        if ((format == AP4_SAMPLE_FORMAT_DVAV) || (format == AP4_SAMPLE_FORMAT_DVA1)) {
+            if (profile != 9) {
+                fprintf(stderr, "ERROR: sample entry name is mismatch with profile\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        } else {
+            if ((profile != 8) && (profile != 5)) {
+                fprintf(stderr, "ERROR: sample entry name is mismatch with profile\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        }
+    }
+
+    if (format) {
+        if(profile == 5) {
+            if ((format != AP4_SAMPLE_FORMAT_DVHE) && (format != AP4_SAMPLE_FORMAT_DVH1)) {
+                fprintf(stderr, "ERROR: sample entry name is not correct for profile 5\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        } else if (profile == 8) {
+            if ((format != AP4_SAMPLE_FORMAT_HVC1) && (format != AP4_SAMPLE_FORMAT_HEV1)) {
+                fprintf(stderr, "ERROR: sample entry name is not correct for profile 8\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        } else if (profile == 9) {
+            if (format != AP4_SAMPLE_FORMAT_AVC1) {
+                fprintf(stderr, "ERROR: sample entry name is not correct for profile 9\n");
+                return AP4_ERROR_INVALID_PARAMETERS;
+            }
+        }
+    }
+
+    //check: for profile 8/9, bl signal compatibility id must be set
+    if ((bc == (AP4_UI32)-1) && ((profile == 8) || (profile == 9))) {
+        fprintf(stderr, "ERROR: dolby vision bl signal compatibility id must be set when profile is 8 or 9\n");
+        return AP4_ERROR_INVALID_PARAMETERS;
+    }
+
+    //check: for profile 8, bl signal compatibility id must be: 1,2,4
+    if ((profile == 8) && (bc != 1) && (bc != 2) && (bc != 4)) {
+        fprintf(stderr, "ERROR: for dolby vision profile 8, bl signal compatibility id must be: 1, 2 or 4\n");
+        return AP4_ERROR_INVALID_PARAMETERS;
+    }
+
+    //check: for profile 9, bl signal compatibility id must be: 2
+    if ((profile == 9) && (bc != 2) ) {
+        fprintf(stderr, "ERROR: for dolby vision profile 9, bl signal compatibility id must be 2\n");
+        return AP4_ERROR_INVALID_PARAMETERS;
+    }
+
+    //check: for profile 5, bl signal compatibility id must be 0
+    if ((profile == 5) && (bc != 0) && (bc != (AP4_UI32)-1)) {
+        fprintf(stderr, "ERROR: for dolby vision profile 5, bl signal compatibility id must be 0\n");
+        return AP4_ERROR_INVALID_PARAMETERS;
+    }
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
 |   SampleFileStorage
 +---------------------------------------------------------------------*/
 class SampleFileStorage
@@ -317,71 +477,1014 @@
                 sample_rate = (AP4_UI32)frame.m_Info.m_SamplingFrequency;
             }
 
-            // read and store the sample data
-            AP4_Position position = 0;
-            sample_storage.GetStream()->Tell(position);
-            AP4_DataBuffer sample_data(frame.m_Info.m_FrameLength);
-            sample_data.SetDataSize(frame.m_Info.m_FrameLength);
-            frame.m_Source->ReadBytes(sample_data.UseData(), frame.m_Info.m_FrameLength);
-            sample_storage.GetStream()->Write(sample_data.GetData(), frame.m_Info.m_FrameLength);
+            // read and store the sample data
+            AP4_Position position = 0;
+            sample_storage.GetStream()->Tell(position);
+            AP4_DataBuffer sample_data(frame.m_Info.m_FrameLength);
+            sample_data.SetDataSize(frame.m_Info.m_FrameLength);
+            frame.m_Source->ReadBytes(sample_data.UseData(), frame.m_Info.m_FrameLength);
+            sample_storage.GetStream()->Write(sample_data.GetData(), frame.m_Info.m_FrameLength);
+
+            // add the sample to the table
+            sample_table->AddSample(*sample_storage.GetStream(), position, frame.m_Info.m_FrameLength, 1024, sample_description_index, 0, 0, true);
+            sample_count++;
+        } else {
+            if (result == AP4_ERROR_CORRUPTED_BITSTREAM) {
+                fprintf(stderr, "WARN: The stream in corrupted, muxing stopped. The muxed MP4 only contains the first %d samples.\n", sample_count);
+                break;
+            } else if ((result == AP4_ERROR_NOT_ENOUGH_DATA) && (parser.GetBytesAvailable() == (AP4_BITSTREAM_BUFFER_SIZE -1))){
+                fprintf(stderr, "WARN: The frame %d size is larger than the max buffer size, muxing stopped. The muxed MP4 only contains the first %d samples.\n", sample_count + 1, sample_count);
+                break;
+            }
+            if (eos) break;
+        }
+
+        // read some data and feed the parser
+        AP4_UI08 input_buffer[AP4_MUX_READ_BUFFER_SIZE];
+        AP4_Size to_read = parser.GetBytesFree();
+        if (to_read) {
+            AP4_Size bytes_read = 0;
+            if (to_read > sizeof(input_buffer)) to_read = sizeof(input_buffer);
+            result = input->ReadPartial(input_buffer, to_read, bytes_read);
+            if (AP4_SUCCEEDED(result)) {
+                AP4_Size to_feed = bytes_read;
+                result = parser.Feed(input_buffer, &to_feed);
+                if (AP4_FAILED(result)) {
+                    AP4_Debug("ERROR: parser.Feed() failed (%d)\n", result);
+                    return;
+                }
+            } else {
+                if (result == AP4_ERROR_EOS) {
+                    eos = true;
+                    parser.Feed(NULL, NULL, AP4_BITSTREAM_FLAG_EOS);
+                }
+            }
+        }
+    }
+    
+    // create an audio track
+    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_AUDIO,
+                                     sample_table,
+                                     0,                 // track id
+                                     sample_rate,       // movie time scale
+                                     sample_count*1024, // track duration
+                                     sample_rate,       // media time scale
+                                     sample_count*1024, // media duration
+                                     language,          // language
+                                     0, 0);             // width, height
+
+    // cleanup
+    input->Release();
+
+    movie.AddTrack(track);
+}
+
+/*----------------------------------------------------------------------
+ |   AddAc3Track
+ +---------------------------------------------------------------------*/
+static void
+AddAc3Track(AP4_Movie&             movie,
+            const char*             input_name,
+            AP4_Array<Parameter>&   parameters,
+            SampleFileStorage&      sample_storage)
+{
+    AP4_ByteStream* input;
+    AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
+    if (AP4_FAILED(result)) {
+        fprintf(stderr, "ERROR: cannot open input file '%s' (%d))\n", input_name, result);
+        return;
+    }
+
+    // check if we have a language parameter
+    const char* language = GetLanguageFromParameters(parameters, "und");
+    if (!language) return;
+
+    // create a sample table
+    AP4_SyntheticSampleTable* sample_table = new AP4_SyntheticSampleTable(); // chunk_size is used to control chunk size in 'stsc' box
+
+    // create an AC-3 Sync Frame parser
+    AP4_Ac3Parser parser;
+    bool           initialized = false;
+    unsigned int   sample_description_index = 0;
+
+    // read from the input, feed, and get AC-3 frames
+    AP4_UI32     sample_rate = 0;
+    AP4_Cardinal sample_count = 0;
+
+    bool eos = false;
+    for(;;) {
+        // try to get a frame
+        AP4_Ac3Frame frame;
+        result = parser.FindFrame(frame);
+        if (AP4_SUCCEEDED(result)) {
+            if (Options.verbose) {
+                printf("AC-3 frame [%06d]: size = %d, %d kHz, %d ch\n",
+                       sample_count,
+                       frame.m_Info.m_FrameSize,
+                       frame.m_Info.m_SampleRate,
+                       frame.m_Info.m_ChannelCount);
+            }
+            if (!initialized) {
+                initialized = true;
+
+                // create a sample description for our samples
+                AP4_Dac3Atom::StreamInfo *ac3_stream_info = &frame.m_Info.m_Ac3StreamInfo;
+
+                AP4_Ac3SampleDescription* sample_description =
+                new AP4_Ac3SampleDescription(
+                                             frame.m_Info.m_SampleRate,       // sample rate
+                                             16,                              // sample size
+                                             2,                               // channel count
+                                             frame.m_Info.m_FrameSize,        // Access Unit size
+                                             ac3_stream_info);            // AC-3 SubStream
+
+                sample_description_index = sample_table->GetSampleDescriptionCount();
+                sample_table->AddSampleDescription(sample_description);
+                sample_rate      = frame.m_Info.m_SampleRate;
+            }
+
+            // read and store the sample data
+            AP4_Position position = 0;
+            sample_storage.GetStream()->Tell(position);
+            AP4_DataBuffer sample_data(frame.m_Info.m_FrameSize);
+            sample_data.SetDataSize(frame.m_Info.m_FrameSize);
+            frame.m_Source->ReadBytes(sample_data.UseData(), frame.m_Info.m_FrameSize);
+            if (frame.m_LittleEndian) {
+                AP4_ByteSwap16(sample_data.UseData(), (unsigned int)frame.m_Info.m_FrameSize);
+            }
+            sample_storage.GetStream()->Write(sample_data.GetData(), frame.m_Info.m_FrameSize);
+
+            // add the sample to the table
+            sample_table->AddSample(*sample_storage.GetStream(), position, frame.m_Info.m_FrameSize, 1536, sample_description_index, 0, 0, true);
+            sample_count++;
+        } else {
+            if (eos) break;
+        }
+
+        // read some data and feed the parser
+        AP4_UI08 input_buffer[AP4_MUX_READ_BUFFER_SIZE];
+        AP4_Size to_read = parser.GetBytesFree();
+        if (to_read) {
+            AP4_Size bytes_read = 0;
+            if (to_read > sizeof(input_buffer)) to_read = sizeof(input_buffer);
+            result = input->ReadPartial(input_buffer, to_read, bytes_read);
+            if (AP4_SUCCEEDED(result)) {
+                AP4_Size to_feed = bytes_read;
+                result = parser.Feed(input_buffer, &to_feed);
+                if (AP4_FAILED(result)) {
+                    AP4_Debug("ERROR: parser.Feed() failed (%d)\n", result);
+                    return;
+                }
+            } else {
+                if (result == AP4_ERROR_EOS) {
+                    eos = true;
+                    parser.Feed(NULL, NULL, AP4_BITSTREAM_FLAG_EOS);
+                }
+            }
+        }
+    }
+
+    // create an audio track
+    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_AUDIO,
+                                     sample_table,
+                                     0,                   // track id
+                                     sample_rate,         // movie time scale
+                                     sample_count * 1536, // track duration
+                                     sample_rate,         // media time scale
+                                     sample_count * 1536, // media duration
+                                     language,            // language
+                                     0, 0);
+
+    // add an edit list with MediaTime==0 to ac3 track defautly.
+    if(1) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = sample_count * 1536;
+        } else {
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), sample_rate, movie.GetTimeScale());
+        }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, 0, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
+    }
+
+    // cleanup
+    input->Release();
+
+    movie.AddTrack(track);
+}
+
+/*----------------------------------------------------------------------
+|   AddEac3Track
++---------------------------------------------------------------------*/
+static void
+AddEac3Track(AP4_Movie&             movie,
+            const char*             input_name,
+            AP4_Array<Parameter>&   parameters,
+            SampleFileStorage&      sample_storage)
+{
+    AP4_ByteStream* input;
+    AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
+    if (AP4_FAILED(result)) {
+        fprintf(stderr, "ERROR: cannot open input file '%s' (%d))\n", input_name, result);
+        return;
+    }
+
+    // check if we have a language parameter
+    const char* language = GetLanguageFromParameters(parameters, "und");
+    if (!language) return;
+
+    // create a sample table
+    AP4_SyntheticSampleTable* sample_table = new AP4_SyntheticSampleTable(); // The parameter chunk_size is used to control chunk size in 'stsc' box
+
+    // create an E-AC-3 Sync Frame parser
+    AP4_Eac3Parser parser;
+    bool           initialized = false;
+    unsigned int   sample_description_index = 0;
+
+    // read from the input, feed, and get E-AC-3 frames
+    AP4_UI32     sample_rate = 0;
+    AP4_Cardinal sample_count = 0;
+
+    bool eos = false;
+    for(;;) {
+        // try to get a frame
+        AP4_Eac3Frame frame;
+        result = parser.FindFrame(frame);
+        if (AP4_SUCCEEDED(result)) {
+            if (Options.verbose) {
+                printf("E-AC-3 frame [%06d]: size = %d, %d kHz, %d ch\n",
+                       sample_count,
+                       frame.m_Info.m_FrameSize,
+                       frame.m_Info.m_SampleRate,
+                       frame.m_Info.m_ChannelCount);
+            }
+            if (!initialized) {
+                initialized = true;
+
+                // create a sample description for our samples
+                AP4_Dec3Atom::SubStream *eac3_substream = &frame.m_Info.m_Eac3SubStream;
+                const unsigned int obj_num = frame.m_Info.complexity_index_type_a;
+
+                AP4_Eac3SampleDescription* sample_description =
+                    new AP4_Eac3SampleDescription(
+                    frame.m_Info.m_SampleRate,      // sample rate
+                    16,                             // sample size
+                    2,                              // channel count
+                    frame.m_Info.m_FrameSize,       // Access Unit size
+                    eac3_substream,                 // E-AC-3 SubStream
+                    obj_num);                       // DD+JOC object numbers
+                sample_description_index = sample_table->GetSampleDescriptionCount();
+                sample_table->AddSampleDescription(sample_description);
+                sample_rate      = frame.m_Info.m_SampleRate;
+            }
+
+            // read and store the sample data
+            AP4_Position position = 0;
+            sample_storage.GetStream()->Tell(position);
+            AP4_DataBuffer sample_data(frame.m_Info.m_FrameSize);
+            sample_data.SetDataSize(frame.m_Info.m_FrameSize);
+            frame.m_Source->ReadBytes(sample_data.UseData(), frame.m_Info.m_FrameSize);
+            if (frame.m_LittleEndian) {
+                AP4_ByteSwap16(sample_data.UseData(), (unsigned int)frame.m_Info.m_FrameSize);
+            }
+            sample_storage.GetStream()->Write(sample_data.GetData(), frame.m_Info.m_FrameSize);
+
+            // add the sample to the table
+            sample_table->AddSample(*sample_storage.GetStream(), position, frame.m_Info.m_FrameSize, 1536, sample_description_index, 0, 0, true);
+            sample_count++;
+        } else {
+            if (result == AP4_ERROR_CORRUPTED_BITSTREAM) {
+                fprintf(stderr, "WARN: The stream in corrupted, so stop muxing. The muxed MP4 only contains the first %d samples.\n", sample_count);
+                break;
+            } else if ((result == AP4_ERROR_NOT_ENOUGH_DATA) && (parser.GetBytesAvailable() == (AP4_BITSTREAM_BUFFER_SIZE -1))){
+                fprintf(stderr, "WARN: The frame %d size is larger than pre-defined buffer size (8191 bytes), so stop muxing. The muxed MP4 only contains the first %d samples.\n", sample_count + 1, sample_count);
+                break;
+            }
+            if (eos) break;
+        }
+
+        // read some data and feed the parser
+        AP4_UI08 input_buffer[AP4_MUX_READ_BUFFER_SIZE];
+        AP4_Size to_read = parser.GetBytesFree();
+        if (to_read) {
+            AP4_Size bytes_read = 0;
+            if (to_read > sizeof(input_buffer)) to_read = sizeof(input_buffer);
+            result = input->ReadPartial(input_buffer, to_read, bytes_read);
+            if (AP4_SUCCEEDED(result)) {
+                AP4_Size to_feed = bytes_read;
+                result = parser.Feed(input_buffer, &to_feed);
+                if (AP4_FAILED(result)) {
+                    AP4_Debug("ERROR: parser.Feed() failed (%d)\n", result);
+                    return;
+                }
+            } else {
+                if (result == AP4_ERROR_EOS) {
+                    eos = true;
+                    parser.Feed(NULL, NULL, AP4_BITSTREAM_FLAG_EOS);
+                }
+            }
+        }
+    }
+
+    // create an audio track
+    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_AUDIO,
+                                     sample_table,
+                                     0,                   // track id
+                                     sample_rate,         // movie time scale
+                                     sample_count * 1536, // track duration
+                                     sample_rate,         // media time scale
+                                     sample_count * 1536, // media duration
+                                     language,            // language
+                                     0, 0);               // width, height
+
+    // add an edit list with MediaTime==0 to ec3 track defautly.
+    if(1) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = sample_count * 1536;
+        } else {
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), sample_rate, movie.GetTimeScale());
+        }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, 0, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
+    }
+
+    // cleanup
+    input->Release();
+
+    movie.AddTrack(track);
+}
+
+/*----------------------------------------------------------------------
+|   AddAc4Track
++---------------------------------------------------------------------*/
+static void
+AddAc4Track(AP4_Movie&            movie,
+            const char*           input_name,
+            AP4_Array<Parameter>& parameters,
+            SampleFileStorage&    sample_storage)
+{
+    AP4_ByteStream* input;
+    AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
+    if (AP4_FAILED(result)) {
+        fprintf(stderr, "ERROR: cannot open input file '%s' (%d))\n", input_name, result);
+        return;
+    }
+
+    // check if we have a language parameter
+    const char* language = GetLanguageFromParameters(parameters, "und");
+    if (!language) return;
+
+    // create a sample table
+    AP4_SyntheticSampleTable* sample_table = new AP4_SyntheticSampleTable(); // The parameter chunk_size is used to control chunk size in 'stsc' box
+
+    // create an AC-4 Sync Frame parser
+    AP4_Ac4Parser parser;
+    bool           initialized = false;
+    unsigned int   sample_description_index = 0;
+
+    // read from the input, feed, and get AC-4 frames
+    // AP4_UI32     sample_rate = 0;
+    AP4_Cardinal sample_count = 0;
+    AP4_Cardinal sample_duration = 0;
+    AP4_Cardinal media_time_scale = 0;
+    bool eos = false;
+    for(;;) {
+        // try to get a frame
+        AP4_Ac4Frame frame;
+        result = parser.FindFrame(frame);
+        if (AP4_SUCCEEDED(result)) {
+            if (Options.verbose) {
+                printf("AC-4 frame [%06d]: size = %d, %d kHz, %d ch\n",
+                       sample_count,
+                       frame.m_Info.m_FrameSize,
+                       (int)frame.m_Info.m_Ac4Dsi.d.v1.fs,
+                       frame.m_Info.m_ChannelCount);
+            }
+            if (!initialized) {
+                initialized = true;
+
+                // create a sample description for our samples
+                AP4_Dac4Atom::Ac4Dsi *ac4Dsi = &frame.m_Info.m_Ac4Dsi;
+
+                AP4_Ac4SampleDescription* sample_description =
+                    new AP4_Ac4SampleDescription(
+                    frame.m_Info.m_Ac4Dsi.d.v1.fs,  // sample rate
+                    16,                             // sample size
+                    frame.m_Info.m_ChannelCount,    // channel count
+                    frame.m_Info.m_FrameSize,       // DIS size, can't calcuate the DSI size in advance, so assume the maximum value is frame size.
+                    ac4Dsi);                        // AC-4 DSI
+                sample_description_index = sample_table->GetSampleDescriptionCount();
+                sample_table->AddSampleDescription(sample_description);
+                /* sample_rate = */frame.m_Info.m_Ac4Dsi.d.v1.fs;
+                sample_duration  = frame.m_Info.m_SampleDuration;
+                media_time_scale = frame.m_Info.m_MediaTimeScale;
+
+            }
+
+            // read and store the sample data
+            AP4_Position position = 0;
+            sample_storage.GetStream()->Tell(position);
+            AP4_DataBuffer sample_data(frame.m_Info.m_FrameSize);
+            sample_data.SetDataSize(frame.m_Info.m_FrameSize);
+            frame.m_Source->ReadBytes(sample_data.UseData(), frame.m_Info.m_FrameSize);
+            sample_storage.GetStream()->Write(sample_data.GetData(), frame.m_Info.m_FrameSize);
+
+            // add the sample to the table
+            sample_table->AddSample(*sample_storage.GetStream(), position, frame.m_Info.m_FrameSize, sample_duration, sample_description_index, 0, 0, (frame.m_Info.m_Iframe == 1));
+            sample_count++;
+            // Skip the CRC word for 0xAC41 stream
+            frame.m_Source->SkipBytes(frame.m_Info.m_CRCSize);
+        } else {
+            if (result == AP4_ERROR_CORRUPTED_BITSTREAM) {
+                fprintf(stderr, "WARN: The stream in corrupted, so stop muxing. The muxed MP4 only contains the first %d samples.\n", sample_count);
+                break;
+            } else if ((result == AP4_ERROR_NOT_ENOUGH_DATA) && (parser.GetBytesAvailable() == (AP4_BITSTREAM_BUFFER_SIZE -1))){
+                fprintf(stderr, "WARN: The frame %d size is larger than pre-defined buffer size (8191 bytes), so stop muxing. The muxed MP4 only contains the first %d samples.\n", sample_count + 1, sample_count);
+                break;
+            }
+            if (eos) break;
+        }
+
+        // read some data and feed the parser
+        AP4_UI08 input_buffer[AP4_MUX_READ_BUFFER_SIZE];
+        AP4_Size to_read = parser.GetBytesFree();
+        if (to_read) {
+            AP4_Size bytes_read = 0;
+            if (to_read > sizeof(input_buffer)) to_read = sizeof(input_buffer);
+            result = input->ReadPartial(input_buffer, to_read, bytes_read);
+            if (AP4_SUCCEEDED(result)) {
+                AP4_Size to_feed = bytes_read;
+                result = parser.Feed(input_buffer, &to_feed);
+                if (AP4_FAILED(result)) {
+                    AP4_Debug("ERROR: parser.Feed() failed (%d)\n", result);
+                    return;
+                }
+            } else {
+                if (result == AP4_ERROR_EOS) {
+                    eos = true;
+                    parser.Feed(NULL, NULL, AP4_BITSTREAM_FLAG_EOS);
+                }
+            }
+        }
+    }
+
+    // create an audio track
+    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_AUDIO,
+                                     sample_table,
+                                     0,                                        // track id
+                                     media_time_scale,                         // movie time scale
+                                     AP4_UI64(sample_count) * sample_duration, // track duration
+                                     media_time_scale,                         // media time scale
+                                     AP4_UI64(sample_count) * sample_duration, // media duration
+                                     language,                                 // language
+                                     0, 0);                                    // width, height
+
+    // add an edit list with MediaTime==0 to ac4 track defautly.
+    if(1) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = AP4_UI64(sample_count) * sample_duration;
+        } else {
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_time_scale, movie.GetTimeScale());
+        }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, 0, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
+    }
+
+    // cleanup
+    input->Release();
+
+    movie.AddTrack(track);
+}
+
+/*----------------------------------------------------------------------
+|   AddH264Track
++---------------------------------------------------------------------*/
+static void
+AddH264Track(AP4_Movie&            movie,
+             const char*           input_name,
+             AP4_Array<Parameter>& parameters,
+             AP4_Array<AP4_UI32>&  brands,
+             SampleFileStorage&    sample_storage)
+{
+    AP4_ByteStream* input;
+    AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
+    if (AP4_FAILED(result)) {
+        fprintf(stderr, "ERROR: cannot open input file '%s' (%d))\n", input_name, result);
+        return;
+    }
+
+    // check if we have a language parameter
+    const char* language = GetLanguageFromParameters(parameters, "und");
+    if (!language) return;
+
+    // see if the frame rate is specified
+    unsigned int video_frame_rate = AP4_MUX_DEFAULT_VIDEO_FRAME_RATE*1000;
+    for (unsigned int i=0; i<parameters.ItemCount(); i++) {
+        if (parameters[i].m_Name == "frame_rate") {
+            double frame_rate = atof(parameters[i].m_Value.GetChars());
+            if (frame_rate == 0.0) {
+                fprintf(stderr, "ERROR: invalid video frame rate %s\n", parameters[i].m_Value.GetChars());
+                input->Release();
+                return;
+            }
+            video_frame_rate = (unsigned int)(1000.0*frame_rate);
+        }
+    }
+    
+    // create a sample table
+    AP4_SyntheticSampleTable* sample_table = new AP4_SyntheticSampleTable();
+
+    // allocate an array to keep track of sample order
+    AP4_Array<SampleOrder> sample_orders;
+    
+    // parse the input
+    AP4_AvcFrameParser parser;
+    for (;;) {
+        bool eos;
+        unsigned char input_buffer[AP4_MUX_READ_BUFFER_SIZE];
+        AP4_Size bytes_in_buffer = 0;
+        result = input->ReadPartial(input_buffer, sizeof(input_buffer), bytes_in_buffer);
+        if (AP4_SUCCEEDED(result)) {
+            eos = false;
+        } else if (result == AP4_ERROR_EOS) {
+            eos = true;
+        } else {
+            fprintf(stderr, "ERROR: failed to read from input file\n");
+            break;
+        }
+        AP4_Size offset = 0;
+        bool     found_access_unit = false;
+        do {
+            AP4_AvcFrameParser::AccessUnitInfo access_unit_info;
+
+            found_access_unit = false;
+            AP4_Size bytes_consumed = 0;
+            result = parser.Feed(&input_buffer[offset],
+                                 bytes_in_buffer,
+                                 bytes_consumed,
+                                 access_unit_info,
+                                 eos);
+            if (AP4_FAILED(result)) {
+                fprintf(stderr, "ERROR: Feed() failed (%d)\n", result);
+                break;
+            }
+            if (access_unit_info.nal_units.ItemCount()) {
+                // we got one access unit
+                found_access_unit = true;
+                if (Options.verbose) {
+                    printf("H264 Access Unit, %d NAL units, decode_order=%d, display_order=%d\n",
+                           access_unit_info.nal_units.ItemCount(),
+                           access_unit_info.decode_order,
+                           access_unit_info.display_order);
+                }
+                
+                // compute the total size of the sample data
+                unsigned int sample_data_size = 0;
+                for (unsigned int i=0; i<access_unit_info.nal_units.ItemCount(); i++) {
+                    sample_data_size += 4+access_unit_info.nal_units[i]->GetDataSize();
+                }
+
+                // store the sample data
+                AP4_Position position = 0;
+                sample_storage.GetStream()->Tell(position);
+                for (unsigned int i=0; i<access_unit_info.nal_units.ItemCount(); i++) {
+                    sample_storage.GetStream()->WriteUI32(access_unit_info.nal_units[i]->GetDataSize());
+                    sample_storage.GetStream()->Write(access_unit_info.nal_units[i]->GetData(), access_unit_info.nal_units[i]->GetDataSize());
+                }
+
+                // add the sample to the track
+                sample_table->AddSample(*sample_storage.GetStream(), position, sample_data_size, 1000, 0, 0, 0, access_unit_info.is_idr);
+            
+                // remember the sample order
+                sample_orders.Append(SampleOrder(access_unit_info.decode_order, access_unit_info.display_order));
+                
+                // free the memory buffers
+                access_unit_info.Reset();
+            }
+
+            offset += bytes_consumed;
+            bytes_in_buffer -= bytes_consumed;
+        } while (bytes_in_buffer || found_access_unit);
+        if (eos) break;
+    }
+
+    // adjust the sample CTS/DTS offsets based on the sample orders
+    if (sample_orders.ItemCount() > 1) {
+        unsigned int start = 0;
+        for (unsigned int i=1; i<=sample_orders.ItemCount(); i++) {
+            if (i == sample_orders.ItemCount() || sample_orders[i].m_DisplayOrder == 0) {
+                // we got to the end of the GOP, sort it by display order
+                SortSamples(&sample_orders[start], i-start);
+                start = i;
+            }
+        }
+    }
+    unsigned int max_delta = 0;
+    for (unsigned int i=0; i<sample_orders.ItemCount(); i++) {
+        if (sample_orders[i].m_DecodeOrder > i) {
+            unsigned int delta =sample_orders[i].m_DecodeOrder-i;
+            if (delta > max_delta) {
+                max_delta = delta;
+            }
+        }
+    }
+    for (unsigned int i=0; i<sample_orders.ItemCount(); i++) {
+        sample_table->UseSample(sample_orders[i].m_DecodeOrder).SetCts(1000ULL*(AP4_UI64)(i+max_delta));
+    }
+
+    // check the video parameters
+    AP4_AvcSequenceParameterSet* sps = NULL;
+    for (unsigned int i=0; i<=AP4_AVC_SPS_MAX_ID; i++) {
+        if (parser.GetSequenceParameterSets()[i]) {
+            sps = parser.GetSequenceParameterSets()[i];
+            break;
+        }
+    }
+    if (sps == NULL) {
+        fprintf(stderr, "ERROR: no sequence parameter set found in video\n");
+        input->Release();
+        return;
+    }
+    unsigned int video_width = 0;
+    unsigned int video_height = 0;
+    sps->GetInfo(video_width, video_height);
+    if (Options.verbose) {
+        printf("VIDEO: %dx%d\n", video_width, video_height);
+    }
+
+    // collect the SPS and PPS into arrays
+    AP4_Array<AP4_DataBuffer> sps_array;
+    for (unsigned int i=0; i<=AP4_AVC_SPS_MAX_ID; i++) {
+        if (parser.GetSequenceParameterSets()[i]) {
+            sps_array.Append(parser.GetSequenceParameterSets()[i]->raw_bytes);
+        }
+    }
+    AP4_Array<AP4_DataBuffer> pps_array;
+    for (unsigned int i=0; i<=AP4_AVC_PPS_MAX_ID; i++) {
+        if (parser.GetPictureParameterSets()[i]) {
+            pps_array.Append(parser.GetPictureParameterSets()[i]->raw_bytes);
+        }
+    }
+    
+    // setup the video the sample descripton
+    AP4_AvcSampleDescription* sample_description =
+        new AP4_AvcSampleDescription(AP4_SAMPLE_FORMAT_AVC1,
+                                     video_width,
+                                     video_height,
+                                     24,
+                                     "AVC Coding",
+                                     sps->profile_idc,
+                                     sps->level_idc,
+                                     sps->constraint_set0_flag<<7 |
+                                     sps->constraint_set1_flag<<6 |
+                                     sps->constraint_set2_flag<<5 |
+                                     sps->constraint_set3_flag<<4,
+                                     4,
+                                     sps->chroma_format_idc,
+                                     sps->bit_depth_luma_minus8,
+                                     sps->bit_depth_chroma_minus8,
+                                     sps_array,
+                                     pps_array);
+    sample_table->AddSampleDescription(sample_description);
+
+    AP4_UI32 movie_timescale      = 1000;
+    AP4_UI32 media_timescale      = video_frame_rate;
+    AP4_UI64 video_track_duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie_timescale);
+    AP4_UI64 video_media_duration = 1000*sample_table->GetSampleCount();
+
+    // create a video track
+    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_VIDEO,
+                                     sample_table,
+                                     0,                    // auto-select track id
+                                     movie_timescale,      // movie time scale
+                                     video_track_duration, // track duration
+                                     video_frame_rate,     // media time scale
+                                     video_media_duration, // media duration
+                                     language,             // language
+                                     video_width<<16,      // width
+                                     video_height<<16      // height
+                                     );
+    // Use an edit list to compensate for the inital cts offset
+    if (max_delta) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = video_media_duration;
+        } else {
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie.GetTimeScale());
+        }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, max_delta*1000ULL, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
+    }
+    // update the brands list
+    brands.Append(AP4_FILE_BRAND_AVC1);
+
+    // cleanup
+    input->Release();
+
+    movie.AddTrack(track);
+}
+
+/*----------------------------------------------------------------------
+|   AddH264DoviTrack
++---------------------------------------------------------------------*/
+static void
+AddH264DoviTrack(AP4_Movie&            movie,
+                 const char*           input_name,
+                 AP4_Array<Parameter>& parameters,
+                 AP4_Array<AP4_UI32>&  brands,
+                 SampleFileStorage&    sample_storage)
+{
+    double frame_rate = 0.0;
+    //based on the Dovi iso spec, set the following values to const 
+    const AP4_UI32 dv_major_version = 1;
+    const AP4_UI32 dv_minor_version = 0;
+    const bool     dv_rpu_flag = 1;
+    const bool     dv_el_flag = 0;
+    const bool     dv_bl_flag = 1;
+
+    AP4_UI32 dv_profile = 0;
+    AP4_UI32 dv_bl_signal_comp_id = 0;
+    AP4_UI32 dv_level = 0;
+
+    AP4_ByteStream* input;
+    AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
+    if (AP4_FAILED(result)) {
+        fprintf(stderr, "ERROR: cannot open input file '%s' (%d))\n", input_name, result);
+        return;
+    }
+
+    // check if we have a language parameter
+    const char* language = GetLanguageFromParameters(parameters, "und");
+    if (!language) return;
+
+    // see if the frame rate is specified
+    AP4_UI32 video_frame_rate = AP4_MUX_DEFAULT_VIDEO_FRAME_RATE*1000;
+    for (unsigned int i=0; i<parameters.ItemCount(); i++) {
+        if (parameters[i].m_Name == "frame_rate") {
+            frame_rate = atof(parameters[i].m_Value.GetChars());
+            if (frame_rate == 0.0) {
+                fprintf(stderr, "ERROR: invalid video frame rate %s\n", parameters[i].m_Value.GetChars());
+                input->Release();
+                return;
+            }
+            video_frame_rate = (unsigned int)(1000.0*frame_rate);
+        } else if (parameters[i].m_Name == "dv_profile") {
+            dv_profile = atoi(parameters[i].m_Value.GetChars());
+        } else if (parameters[i].m_Name == "dv_bc") {
+            dv_bl_signal_comp_id = atoi(parameters[i].m_Value.GetChars());
+        }
+    }
+
+    //set default frame rate value
+    if(frame_rate == 0.0) {
+        frame_rate = 24.0;
+    }
+
+    // create a sample table
+    AP4_SyntheticSampleTable* sample_table = new AP4_SyntheticSampleTable();
+
+    // allocate an array to keep track of sample order
+    AP4_Array<SampleOrder> sample_orders;
+
+    // parse the input
+    AP4_AvcFrameParser parser;
+    for (;;) {
+        bool eos;
+        unsigned char input_buffer[AP4_MUX_READ_BUFFER_SIZE];
+        AP4_Size bytes_in_buffer = 0;
+        result = input->ReadPartial(input_buffer, sizeof(input_buffer), bytes_in_buffer);
+        if (AP4_SUCCEEDED(result)) {
+            eos = false;
+        } else if (result == AP4_ERROR_EOS) {
+            eos = true;
+        } else {
+            fprintf(stderr, "ERROR: failed to read from input file\n");
+            break;
+        }
+        AP4_Size offset = 0;
+        bool     found_access_unit = false;
+        do {
+            AP4_AvcFrameParser::AccessUnitInfo access_unit_info;
+    
+            found_access_unit = false;
+            AP4_Size bytes_consumed = 0;
+            result = parser.Feed(&input_buffer[offset],
+                                 bytes_in_buffer,
+                                 bytes_consumed,
+                                 access_unit_info,
+                                 eos);
+            if (AP4_FAILED(result)) {
+                fprintf(stderr, "ERROR: Feed() failed (%d)\n", result);
+                break;
+            }
+            if (access_unit_info.nal_units.ItemCount()) {
+                // we got one access unit
+                found_access_unit = true;
+                if (Options.verbose) {
+                    printf("H264 Access Unit, %d NAL units, decode_order=%d, display_order=%d\n",
+                           access_unit_info.nal_units.ItemCount(),
+                           access_unit_info.decode_order,
+                           access_unit_info.display_order);
+                }
+                
+                // compute the total size of the sample data
+                unsigned int sample_data_size = 0;
+                for (unsigned int i=0; i<access_unit_info.nal_units.ItemCount(); i++) {
+                    sample_data_size += 4+access_unit_info.nal_units[i]->GetDataSize();
+                }
+
+                // store the sample data
+                AP4_Position position = 0;
+                sample_storage.GetStream()->Tell(position);
+                for (unsigned int i=0; i<access_unit_info.nal_units.ItemCount(); i++) {
+                    sample_storage.GetStream()->WriteUI32(access_unit_info.nal_units[i]->GetDataSize());
+                    sample_storage.GetStream()->Write(access_unit_info.nal_units[i]->GetData(), access_unit_info.nal_units[i]->GetDataSize());
+                }
+
+                // add the sample to the track
+                sample_table->AddSample(*sample_storage.GetStream(), position, sample_data_size, 1000, 0, 0, 0, access_unit_info.is_idr);
+
+                // remember the sample order
+                sample_orders.Append(SampleOrder(access_unit_info.decode_order, access_unit_info.display_order));
+
+                // free the memory buffers
+                access_unit_info.Reset();
+            }
+
+            offset += bytes_consumed;
+            bytes_in_buffer -= bytes_consumed;
+        } while (bytes_in_buffer || found_access_unit);
+        if (eos) break;
+    }
+
+    // adjust the sample CTS/DTS offsets based on the sample orders
+    if (sample_orders.ItemCount() > 1) {
+        unsigned int start = 0;
+        for (unsigned int i=1; i<=sample_orders.ItemCount(); i++) {
+            if (i == sample_orders.ItemCount() || sample_orders[i].m_DisplayOrder == 0) {
+                // we got to the end of the GOP, sort it by display order
+                SortSamples(&sample_orders[start], i-start);
+                start = i;
+            }
+        }
+    }
+    unsigned int max_delta = 0;
+    for (unsigned int i=0; i<sample_orders.ItemCount(); i++) {
+        if (sample_orders[i].m_DecodeOrder > i) {
+            unsigned int delta =sample_orders[i].m_DecodeOrder-i;
+            if (delta > max_delta) {
+                max_delta = delta;
+            }
+        }
+    }
+    for (unsigned int i=0; i<sample_orders.ItemCount(); i++) {
+        sample_table->UseSample(sample_orders[i].m_DecodeOrder).SetCts(1000ULL*(AP4_UI64)(i+max_delta));
+    }
+
+    // check the video parameters
+    AP4_AvcSequenceParameterSet* sps = NULL;
+    for (unsigned int i=0; i<=AP4_AVC_SPS_MAX_ID; i++) {
+        if (parser.GetSequenceParameterSets()[i]) {
+            sps = parser.GetSequenceParameterSets()[i];
+            break;
+        }
+    }
+    if (sps == NULL) {
+        fprintf(stderr, "ERROR: no sequence parameter set found in video\n");
+        input->Release();
+        return;
+    }
+    unsigned int video_width = 0;
+    unsigned int video_height = 0;
+    sps->GetInfo(video_width, video_height);
+    if (Options.verbose) {
+        printf("VIDEO: %dx%d\n", video_width, video_height);
+    }
+
+    // collect the SPS and PPS into arrays
+    AP4_Array<AP4_DataBuffer> sps_array;
+    for (unsigned int i=0; i<=AP4_AVC_SPS_MAX_ID; i++) {
+        if (parser.GetSequenceParameterSets()[i]) {
+            sps_array.Append(parser.GetSequenceParameterSets()[i]->raw_bytes);
+        }
+    }
+    AP4_Array<AP4_DataBuffer> pps_array;
+    for (unsigned int i=0; i<=AP4_AVC_PPS_MAX_ID; i++) {
+        if (parser.GetPictureParameterSets()[i]) {
+            pps_array.Append(parser.GetPictureParameterSets()[i]->raw_bytes);
+        }
+    }
+
+    // compute the dolby vision level
+    ComputeDoviLevel(video_width, video_height, frame_rate, dv_level);
+
+    // setup the video the sample descripton
+    AP4_AvcDoviSampleDescription* sample_description =
+        new AP4_AvcDoviSampleDescription(AP4_SAMPLE_FORMAT_AVC1,
+                                     video_width,
+                                     video_height,
+                                     24,
+                                     "DOVI Coding",
+                                     sps->profile_idc,
+                                     sps->level_idc,
+                                     sps->constraint_set0_flag<<7 |
+                                     sps->constraint_set1_flag<<6 |
+                                     sps->constraint_set2_flag<<5 |
+                                     sps->constraint_set3_flag<<4,
+                                     4,
+                                     sps_array,
+                                     pps_array,
+                                     sps->chroma_format_idc,
+                                     sps->bit_depth_luma_minus8,
+                                     sps->bit_depth_chroma_minus8,
+                                     dv_major_version,
+                                     dv_minor_version,
+                                     dv_profile,
+                                     dv_level,
+                                     dv_rpu_flag,
+                                     dv_el_flag,
+                                     dv_bl_flag,
+                                     dv_bl_signal_comp_id);
+    sample_table->AddSampleDescription(sample_description);
+
+    AP4_UI32 movie_timescale      = 1000;
+    AP4_UI32 media_timescale      = video_frame_rate;
+    AP4_UI64 video_track_duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie_timescale);
+    AP4_UI64 video_media_duration = 1000*sample_table->GetSampleCount();
 
-            // add the sample to the table
-            sample_table->AddSample(*sample_storage.GetStream(), position, frame.m_Info.m_FrameLength, 1024, sample_description_index, 0, 0, true);
-            sample_count++;
+    // create a video track
+    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_VIDEO,
+                                     sample_table,
+                                     0,                    // auto-select track id
+                                     movie_timescale,      // movie time scale
+                                     video_track_duration, // track duration
+                                     video_frame_rate,     // media time scale
+                                     video_media_duration, // media duration
+                                     language,              // language
+                                     video_width<<16,      // width
+                                     video_height<<16      // height
+                                     );
+    // Using edit list to compensate the inital cts offset
+    if(max_delta) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = video_media_duration;
         } else {
-            if (eos) break;
-        }
-
-        // read some data and feed the parser
-        AP4_UI08 input_buffer[AP4_MUX_READ_BUFFER_SIZE];
-        AP4_Size to_read = parser.GetBytesFree();
-        if (to_read) {
-            AP4_Size bytes_read = 0;
-            if (to_read > sizeof(input_buffer)) to_read = sizeof(input_buffer);
-            result = input->ReadPartial(input_buffer, to_read, bytes_read);
-            if (AP4_SUCCEEDED(result)) {
-                AP4_Size to_feed = bytes_read;
-                result = parser.Feed(input_buffer, &to_feed);
-                if (AP4_FAILED(result)) {
-                    AP4_Debug("ERROR: parser.Feed() failed (%d)\n", result);
-                    return;
-                }
-            } else {
-                if (result == AP4_ERROR_EOS) {
-                    eos = true;
-                    parser.Feed(NULL, NULL, AP4_BITSTREAM_FLAG_EOS);
-                }
-            }
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie.GetTimeScale());
         }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, max_delta*1000ULL, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
     }
-    
-    // create an audio track
-    AP4_Track* track = new AP4_Track(AP4_Track::TYPE_AUDIO, 
-                                     sample_table, 
-                                     0,                 // track id
-                                     sample_rate,       // movie time scale
-                                     sample_count*1024, // track duration              
-                                     sample_rate,       // media time scale
-                                     sample_count*1024, // media duration
-                                     language,          // language
-                                     0, 0);             // width, height
-    
+    // update the brands list
+    brands.Append(AP4_FILE_BRAND_AVC1);
+
     // cleanup
     input->Release();
-    
+
     movie.AddTrack(track);
 }
 
 /*----------------------------------------------------------------------
-|   AddH264Track
+|   AddH265Track
 +---------------------------------------------------------------------*/
 static void
-AddH264Track(AP4_Movie&            movie,
+AddH265Track(AP4_Movie&            movie,
              const char*           input_name,
              AP4_Array<Parameter>& parameters,
              AP4_Array<AP4_UI32>&  brands,
              SampleFileStorage&    sample_storage)
 {
+    unsigned int video_width = 0;
+    unsigned int video_height = 0;
+    AP4_UI32     format = AP4_SAMPLE_FORMAT_HVC1;
+    
     AP4_ByteStream* input;
     AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
     if (AP4_FAILED(result)) {
@@ -404,6 +1507,12 @@
                 return;
             }
             video_frame_rate = (unsigned int)(1000.0*frame_rate);
+        } else if (parameters[i].m_Name == "format") {
+            if (parameters[i].m_Value == "hev1") {
+                format = AP4_SAMPLE_FORMAT_HEV1;
+            } else if (parameters[i].m_Value == "hvc1") {
+                format = AP4_SAMPLE_FORMAT_HVC1;
+            }
         }
     }
     
@@ -414,7 +1523,7 @@
     AP4_Array<SampleOrder> sample_orders;
     
     // parse the input
-    AP4_AvcFrameParser parser;
+    AP4_HevcFrameParser parser;
     for (;;) {
         bool eos;
         unsigned char input_buffer[AP4_MUX_READ_BUFFER_SIZE];
@@ -431,7 +1540,7 @@
         AP4_Size offset = 0;
         bool     found_access_unit = false;
         do {
-            AP4_AvcFrameParser::AccessUnitInfo access_unit_info;
+            AP4_HevcFrameParser::AccessUnitInfo access_unit_info;
             
             found_access_unit = false;
             AP4_Size bytes_consumed = 0;
@@ -448,7 +1557,7 @@
                 // we got one access unit
                 found_access_unit = true;
                 if (Options.verbose) {
-                    printf("H264 Access Unit, %d NAL units, decode_order=%d, display_order=%d\n",
+                    printf("H265 Access Unit, %d NAL units, decode_order=%d, display_order=%d\n",
                            access_unit_info.nal_units.ItemCount(),
                            access_unit_info.decode_order,
                            access_unit_info.display_order);
@@ -469,7 +1578,7 @@
                 }
                 
                 // add the sample to the track
-                sample_table->AddSample(*sample_storage.GetStream(), position, sample_data_size, 1000, 0, 0, 0, access_unit_info.is_idr);
+                sample_table->AddSample(*sample_storage.GetStream(), position, sample_data_size, 1000, 0, 0, 0, access_unit_info.is_random_access);
             
                 // remember the sample order
                 sample_orders.Append(SampleOrder(access_unit_info.decode_order, access_unit_info.display_order));
@@ -508,56 +1617,93 @@
         sample_table->UseSample(sample_orders[i].m_DecodeOrder).SetCts(1000ULL*(AP4_UI64)(i+max_delta));
     }
     
-    // check the video parameters
-    AP4_AvcSequenceParameterSet* sps = NULL;
-    for (unsigned int i=0; i<=AP4_AVC_SPS_MAX_ID; i++) {
-        if (parser.GetSequenceParameterSets()[i]) {
-            sps = parser.GetSequenceParameterSets()[i];
-            break;
-        }
+    // check that we have at least one SPS
+    AP4_HevcSequenceParameterSet* sps = NULL;
+    for (unsigned int i=0; i<=AP4_HEVC_SPS_MAX_ID; i++) {
+        sps = parser.GetSequenceParameterSets()[i];
+        if (sps) break;
     }
     if (sps == NULL) {
         fprintf(stderr, "ERROR: no sequence parameter set found in video\n");
         input->Release();
         return;
     }
-    unsigned int video_width = 0;
-    unsigned int video_height = 0;
+    
+    // collect parameters from the first SPS entry
+    // TODO: synthesize from multiple SPS entries if we have more than one
+    AP4_UI08 general_profile_space =               sps->profile_tier_level.general_profile_space;
+    AP4_UI08 general_tier_flag =                   sps->profile_tier_level.general_tier_flag;
+    AP4_UI08 general_profile =                     sps->profile_tier_level.general_profile_idc;
+    AP4_UI32 general_profile_compatibility_flags = sps->profile_tier_level.general_profile_compatibility_flags;
+    AP4_UI64 general_constraint_indicator_flags =  sps->profile_tier_level.general_constraint_indicator_flags;
+    AP4_UI08 general_level =                       sps->profile_tier_level.general_level_idc;
+    AP4_UI32 min_spatial_segmentation =            0; // TBD (should read from VUI if present)
+    AP4_UI08 parallelism_type =                    0; // unknown
+    AP4_UI08 chroma_format =                       sps->chroma_format_idc;
+    AP4_UI08 luma_bit_depth =                      8; // hardcoded temporarily, should be read from the bitstream
+    AP4_UI08 chroma_bit_depth =                    8; // hardcoded temporarily, should be read from the bitstream
+    AP4_UI16 average_frame_rate =                  0; // unknown
+    AP4_UI08 constant_frame_rate =                 0; // unknown
+    AP4_UI08 num_temporal_layers =                 0; // unknown
+    AP4_UI08 temporal_id_nested =                  0; // unknown
+    AP4_UI08 nalu_length_size =                    4;
+
     sps->GetInfo(video_width, video_height);
     if (Options.verbose) {
         printf("VIDEO: %dx%d\n", video_width, video_height);
     }
     
-    // collect the SPS and PPS into arrays
+    // collect the VPS, SPS and PPS into arrays
+    AP4_Array<AP4_DataBuffer> vps_array;
+    for (unsigned int i=0; i<=AP4_HEVC_VPS_MAX_ID; i++) {
+        if (parser.GetVideoParameterSets()[i]) {
+            vps_array.Append(parser.GetVideoParameterSets()[i]->raw_bytes);
+        }
+    }
     AP4_Array<AP4_DataBuffer> sps_array;
-    for (unsigned int i=0; i<=AP4_AVC_SPS_MAX_ID; i++) {
+    for (unsigned int i=0; i<=AP4_HEVC_SPS_MAX_ID; i++) {
         if (parser.GetSequenceParameterSets()[i]) {
             sps_array.Append(parser.GetSequenceParameterSets()[i]->raw_bytes);
         }
     }
     AP4_Array<AP4_DataBuffer> pps_array;
-    for (unsigned int i=0; i<=AP4_AVC_PPS_MAX_ID; i++) {
+    for (unsigned int i=0; i<=AP4_HEVC_PPS_MAX_ID; i++) {
         if (parser.GetPictureParameterSets()[i]) {
             pps_array.Append(parser.GetPictureParameterSets()[i]->raw_bytes);
         }
     }
     
     // setup the video the sample descripton
-    AP4_AvcSampleDescription* sample_description =
-        new AP4_AvcSampleDescription(AP4_SAMPLE_FORMAT_AVC1,
-                                     video_width,
-                                     video_height,
-                                     24,
-                                     "AVC Coding",
-                                     sps->profile_idc,
-                                     sps->level_idc,
-                                     sps->constraint_set0_flag<<7 |
-                                     sps->constraint_set1_flag<<6 |
-                                     sps->constraint_set2_flag<<5 |
-                                     sps->constraint_set3_flag<<4,
-                                     4,
-                                     sps_array,
-                                     pps_array);
+    AP4_UI08 parameters_completeness = (format == AP4_SAMPLE_FORMAT_HVC1 ? 1 : 0);
+    AP4_HevcSampleDescription* sample_description =
+        new AP4_HevcSampleDescription(format,
+                                      video_width,
+                                      video_height,
+                                      24,
+                                      "HEVC Coding",
+                                      general_profile_space,
+                                      general_tier_flag,
+                                      general_profile,
+                                      general_profile_compatibility_flags,
+                                      general_constraint_indicator_flags,
+                                      general_level,
+                                      min_spatial_segmentation,
+                                      parallelism_type,
+                                      chroma_format,
+                                      luma_bit_depth,
+                                      chroma_bit_depth,
+                                      average_frame_rate,
+                                      constant_frame_rate,
+                                      num_temporal_layers,
+                                      temporal_id_nested,
+                                      nalu_length_size,
+                                      vps_array,
+                                      parameters_completeness,
+                                      sps_array,
+                                      parameters_completeness,
+                                      pps_array,
+                                      parameters_completeness);
+    
     sample_table->AddSampleDescription(sample_description);
     
     AP4_UI32 movie_timescale      = 1000;
@@ -578,28 +1724,60 @@
                                      video_height<<16      // height
                                      );
 
+    // Use an edit list to compensate for the inital cts offset
+    if (max_delta) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = video_media_duration;
+        } else {
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie.GetTimeScale());
+        }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, max_delta*1000ULL, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
+    }
     // update the brands list
-    brands.Append(AP4_FILE_BRAND_AVC1);
+    brands.Append(AP4_FILE_BRAND_HVC1);
 
     // cleanup
     input->Release();
-    
+
     movie.AddTrack(track);
 }
 
 /*----------------------------------------------------------------------
-|   AddH265Track
+|   AddH265DoviTrack
 +---------------------------------------------------------------------*/
 static void
-AddH265Track(AP4_Movie&            movie,
+AddH265DoviTrack(AP4_Movie&        movie,
              const char*           input_name,
              AP4_Array<Parameter>& parameters,
              AP4_Array<AP4_UI32>&  brands,
              SampleFileStorage&    sample_storage)
 {
-    unsigned int video_width = 0;
-    unsigned int video_height = 0;
-    AP4_UI32     format = AP4_SAMPLE_FORMAT_HVC1;
+    AP4_UI32 video_width = 0;
+    AP4_UI32 video_height = 0;
+
+    AP4_UI32 time_scale = 0;
+    AP4_UI32 num_units = 0;
+    double frame_rate = 0.0;
+
+    //based on the Dovi iso spec, set the following values to const 
+    const AP4_UI32 dv_major_version = 1;
+    const AP4_UI32 dv_minor_version = 0;
+    const bool         dv_rpu_flag = 1;
+    const bool         dv_el_flag = 0;
+    const bool         dv_bl_flag = 1;
+
+    AP4_UI32 dv_profile = 0;
+    AP4_UI32 dv_bl_signal_comp_id = 0;
+    AP4_UI32 dv_level = 0;
+
+    AP4_UI32     format = 0;
     
     AP4_ByteStream* input;
     AP4_Result result = AP4_FileByteStream::Create(input_name, AP4_FileByteStream::STREAM_MODE_READ, input);
@@ -612,11 +1790,11 @@
     const char* language = GetLanguageFromParameters(parameters, "und");
     if (!language) return;
 
-    // see if the frame rate is specified
+    // see if the frame rate/format/dv_profile/dv_bc is specified
     unsigned int video_frame_rate = AP4_MUX_DEFAULT_VIDEO_FRAME_RATE*1000;
     for (unsigned int i=0; i<parameters.ItemCount(); i++) {
         if (parameters[i].m_Name == "frame_rate") {
-            double frame_rate = atof(parameters[i].m_Value.GetChars());
+            frame_rate = atof(parameters[i].m_Value.GetChars());
             if (frame_rate == 0.0) {
                 fprintf(stderr, "ERROR: invalid video frame rate %s\n", parameters[i].m_Value.GetChars());
                 input->Release();
@@ -624,14 +1802,35 @@
             }
             video_frame_rate = (unsigned int)(1000.0*frame_rate);
         } else if (parameters[i].m_Name == "format") {
-            if (parameters[i].m_Value == "hev1") {
-                format = AP4_SAMPLE_FORMAT_HEV1;
-            } else if (parameters[i].m_Value == "hvc1") {
+            if (parameters[i].m_Value == "hvc1") {
                 format = AP4_SAMPLE_FORMAT_HVC1;
+            } else if (parameters[i].m_Value == "hev1") {
+                format = AP4_SAMPLE_FORMAT_HEV1;
+            } else if (parameters[i].m_Value == "dvh1") {
+                format = AP4_SAMPLE_FORMAT_DVH1;
+            } else if (parameters[i].m_Value == "dvhe") {
+                format = AP4_SAMPLE_FORMAT_DVHE;
             }
+        } else if (parameters[i].m_Name == "dv_profile") {
+            dv_profile = atoi(parameters[i].m_Value.GetChars());
+        } else if (parameters[i].m_Name == "dv_bc") {
+            dv_bl_signal_comp_id = atoi(parameters[i].m_Value.GetChars());
         }
     }
     
+    //if not set format, set the default one based on profile 
+    if (!format) {
+        if (dv_profile == 5) {
+            format = AP4_SAMPLE_FORMAT_DVH1;
+        } else if (dv_profile == 8) {
+            if (dv_bl_signal_comp_id) {
+                format = AP4_SAMPLE_FORMAT_HVC1;
+            } else {
+                format = AP4_SAMPLE_FORMAT_DVH1;
+            }
+        }
+    }
+
     // create a sample table
     AP4_SyntheticSampleTable* sample_table = new AP4_SyntheticSampleTable();
 
@@ -788,15 +1987,26 @@
             pps_array.Append(parser.GetPictureParameterSets()[i]->raw_bytes);
         }
     }
-    
+
+    AP4_HevcVideoParameterSet* vps = parser.GetVideoParameterSets()[0];
+    vps->GetInfo(time_scale, num_units);
+
+    if(num_units)
+    {
+        frame_rate = time_scale/num_units;
+    }
+
+    //set dolby vision level
+    ComputeDoviLevel(video_width, video_height, frame_rate, dv_level);
+
     // setup the video the sample descripton
-    AP4_UI08 parameters_completeness = (format == AP4_SAMPLE_FORMAT_HVC1 ? 1 : 0);
-    AP4_HevcSampleDescription* sample_description =
-        new AP4_HevcSampleDescription(format,
+    AP4_UI08 parameters_completeness = ((format == AP4_SAMPLE_FORMAT_HVC1 || format == AP4_SAMPLE_FORMAT_DVH1) ? 1 : 0);
+    AP4_HevcDoviSampleDescription* sample_description =
+        new AP4_HevcDoviSampleDescription(format,
                                       video_width,
                                       video_height,
                                       24,
-                                      "HEVC Coding",
+                                      "DOVI Coding",
                                       general_profile_space,
                                       general_tier_flag,
                                       general_profile,
@@ -818,12 +2028,20 @@
                                       sps_array,
                                       parameters_completeness,
                                       pps_array,
-                                      parameters_completeness);
+                                      parameters_completeness,
+                                      dv_major_version,
+                                      dv_minor_version,
+                                      dv_profile,
+                                      dv_level,
+                                      dv_rpu_flag,
+                                      dv_el_flag,
+                                      dv_bl_flag,
+                                      dv_bl_signal_comp_id);
     
     sample_table->AddSampleDescription(sample_description);
-    
-    AP4_UI32 movie_timescale      = 1000;
-    AP4_UI32 media_timescale      = video_frame_rate;
+
+    AP4_UI32 movie_timescale      = (num_units != 0) ? num_units : 1000;
+    AP4_UI32 media_timescale      = (time_scale != 0) ? num_units : video_frame_rate;
     AP4_UI64 video_track_duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie_timescale);
     AP4_UI64 video_media_duration = 1000*sample_table->GetSampleCount();
 
@@ -839,13 +2057,28 @@
                                      video_width<<16,      // width
                                      video_height<<16      // height
                                      );
-
+    // Using edit list to compensate the inital cts offset
+    if(max_delta) {
+        // create an 'edts' container
+        AP4_ContainerAtom* new_edts = new AP4_ContainerAtom(AP4_ATOM_TYPE_EDTS);
+        AP4_ElstAtom* new_elst = new AP4_ElstAtom();
+        AP4_UI64 duration = 0;
+        if(!movie.GetTimeScale()) {
+            duration = video_media_duration;
+        } else {
+            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_timescale, movie.GetTimeScale());
+        }
+        AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, max_delta*1000ULL, 1);
+        new_elst->AddEntry(new_elst_entry);
+        new_edts->AddChild(new_elst);
+        track->UseTrakAtom()->AddChild(new_edts, 1);
+    }
     // update the brands list
-    brands.Append(AP4_FILE_BRAND_HVC1);
+    brands.Append(format);
 
     // cleanup
     input->Release();
-    
+
     movie.AddTrack(track);
 }
 
@@ -973,7 +2206,13 @@
     }
 
     // create the movie object to hold the tracks
-    AP4_Movie* movie = new AP4_Movie();
+    AP4_UI64 creation_time = 0;
+    time_t now = time(NULL);
+    if (now != (time_t)-1) {
+        // adjust the time based on the MPEG time origin
+        creation_time = (AP4_UI64)now + 0x7C25B080;
+    }
+    AP4_Movie* movie = new AP4_Movie(0, 0, creation_time, creation_time);
 
     // setup the brands
     AP4_Array<AP4_UI32> brands;
@@ -989,6 +2228,7 @@
     }
     
     // add all the tracks
+    bool hasDovi = false;
     for (unsigned int i=0; i<input_names.ItemCount(); i++) {
         char*       input_name = input_names[i];
         const char* input_type = NULL;
@@ -1041,13 +2281,48 @@
         if (input_params) {
             ParseParameters(input_params, parameters);
         }
-        
+
+        bool isDovi = false;
+        for (unsigned int i=0; i<parameters.ItemCount(); i++) {
+            if (parameters[i].m_Name == "dv_profile") {
+                isDovi = true;
+            }
+        }
+
         if (!strcmp(input_type, "h264")) {
-            AddH264Track(*movie, input_name, parameters, brands, *sample_storage);
+            if (isDovi) {
+                if (CheckDoviInputParameters(parameters) != AP4_SUCCESS) {
+                    fprintf(stderr, "ERROR: dolby vision input parameter error\n");
+                    delete sample_storage;
+                    return 1;
+                } else {
+                    AddH264DoviTrack(*movie, input_name, parameters, brands, *sample_storage);
+                    hasDovi = true;
+                }
+            } else {
+                AddH264Track(*movie, input_name, parameters, brands, *sample_storage);
+            }
         } else if (!strcmp(input_type, "h265")) {
-            AddH265Track(*movie, input_name, parameters, brands, *sample_storage);
+            if (isDovi) {
+                if (CheckDoviInputParameters(parameters) != AP4_SUCCESS) {
+                    fprintf(stderr, "ERROR: dolby vision input parameter error\n");
+                    delete sample_storage;
+                    return 1;
+                } else {
+                    AddH265DoviTrack(*movie, input_name, parameters, brands, *sample_storage);
+                    hasDovi = true;
+                }
+            } else {
+                AddH265Track(*movie, input_name, parameters, brands, *sample_storage);
+            }
         } else if (!strcmp(input_type, "aac")) {
             AddAacTrack(*movie, input_name, parameters, *sample_storage);
+        } else if (!strcmp(input_type, "ac3")) {
+            AddAc3Track(*movie, input_name, parameters, *sample_storage);
+        } else if (!strcmp(input_type, "ec3")) {
+            AddEac3Track(*movie, input_name, parameters, *sample_storage);
+        } else if (!strcmp(input_type, "ac4")) {
+            AddAc4Track(*movie, input_name, parameters, *sample_storage);
         } else if (!strcmp(input_type, "mp4")) {
             AddMp4Tracks(*movie, input_name, parameters, brands);
         } else {
@@ -1057,6 +2332,13 @@
         }
     }
 
+    // for Dolby Vision, add the 'dby1' brand
+    if (hasDovi) {
+        brands.Append(AP4_FILE_BRAND_DBY1);
+    }
+
+    movie->GetMvhdAtom()->SetNextTrackId(movie->GetTracks().ItemCount() + 1);
+
     // open the output
     AP4_ByteStream* output = NULL;
     result = AP4_FileByteStream::Create(output_filename, AP4_FileByteStream::STREAM_MODE_WRITE, output);

bento4-1.6.0r637.tar.gz/Source/C++/CApi/Bento4C.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/CApi/Bento4C.cpp Changed

@@ -1058,6 +1058,9 @@
                                 AP4_UI08         level,
                                 AP4_UI08         profile_compatibility,
                                 AP4_UI08         nalu_length_size,
+                                AP4_UI08         chroma_format,
+                                AP4_UI08         bit_depth_luma_minus8,
+                                AP4_UI08         bit_depth_chroma_minus8,
                                 AP4_DataBuffer** sequence_parameters,
                                 AP4_Size         sequence_parameter_count,
                                 AP4_DataBuffer** picture_parameters,
@@ -1083,6 +1086,9 @@
                                         level,
                                         profile_compatibility,
                                         nalu_length_size,
+                                        chroma_format,
+                                        bit_depth_luma_minus8,
+                                        bit_depth_chroma_minus8,
                                         sequence_params,
                                         picture_params);
 }

bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Ac3Parser.cpp Added

@@ -0,0 +1,320 @@
+/*****************************************************************
+ |
+ |    AP4 - AC-3 Sync Frame Parser
+ |
+ |    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 "Ap4BitStream.h"
+#include "Ap4Ac3Parser.h"
+#include "Ap4Utils.h"
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Header::AP4_Ac3Header
+ +----------------------------------------------------------------------*/
+AP4_Ac3Header::AP4_Ac3Header(const AP4_UI08* bytes)
+{
+    AP4_BitReader bits(bytes, AP4_AC3_HEADER_SIZE);
+    bits.SkipBits(16);                  // sync word
+    bits.SkipBits(16);                  // crc1
+    m_Fscod       = bits.ReadBits(2);
+    m_Frmsizecod  = bits.ReadBits(6);   // frmsizecod
+    m_FrameSize   = FRAME_SIZE_CODE_ARY_AC3[m_Fscod][m_Frmsizecod] * 2;
+    
+    m_Bsid        = bits.ReadBits(5);
+    m_Bsmod       = bits.ReadBits(3);
+    m_Acmod       = bits.ReadBits(3);
+    if((m_Acmod & 0x1) && (m_Acmod != 0x1)){
+        bits.SkipBits(2);               //cmixlev
+    }
+    if(m_Acmod & 0x4){
+        bits.SkipBits(2);               //surmixlev
+    }
+    if(m_Acmod == 0x2){
+        bits.SkipBits(2);               //dsurmod
+    }
+    m_Lfeon         = bits.ReadBit();
+    m_ChannelCount  = GLOBAL_CHANNEL_ARY[m_Acmod] + m_Lfeon;
+    bits.SkipBits(5);                   // dialnorm
+    if(bits.ReadBit()){                 // compre
+        bits.SkipBits(8);               // compr
+    }
+    if(bits.ReadBit()){                 // langcode
+        bits.SkipBits(8);               // langcod
+    }
+    if(bits.ReadBit()){                 // audprodie
+        bits.SkipBits(5);               // mixlevel
+        bits.SkipBits(2);               // roomtyp
+    }
+    if (m_Acmod == 0){
+        bits.SkipBits(5);               // dialnorm2
+        if(bits.ReadBit()){             // compr2e
+            bits.SkipBits(8);           // compr2
+        }
+        if(bits.ReadBit()){             // langcod2e
+            bits.SkipBits(8);           // langcod2
+        }
+        if(bits.ReadBit()){             // audprodi2e
+            bits.SkipBits(5);           // mixlevel2
+            bits.SkipBits(2);           // roomtyp2
+        }
+    }
+    bits.SkipBits(1);                   // copyrightb
+    bits.SkipBits(1);                   // origbs
+    if(bits.ReadBit()){                 // timecod1e
+        bits.SkipBits(14);              // timecod1
+    }
+    if(bits.ReadBit()){                 //timecod2e
+        bits.SkipBits(14);              // timecod2
+    }
+    m_Addbsie = bits.ReadBit();
+    if (m_Addbsie){
+        m_Addbsil = bits.ReadBits(6);
+        for (unsigned int idx = 0 ; idx < (m_Addbsil + 1); idx ++){
+            m_addbsi[idx] = bits.ReadBits(8);
+        }
+    } else {
+        m_Addbsil = 0;
+        AP4_SetMemory(m_addbsi, 0, sizeof (m_addbsi));
+    }
+    m_HeadSize = (bits.GetBitsRead() / 8) + ((bits.GetBitsRead() % 8 == 0) ? 0: 1);
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Header::MatchFixed
+ |
+ |    Check that two fixed headers are the same
+ |
+ +----------------------------------------------------------------------*/
+bool
+AP4_Ac3Header::MatchFixed(AP4_Ac3Header frame, AP4_Ac3Header next_frame)
+{
+    return true;
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Header::Check
+ +----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac3Header::Check()
+{
+    if (m_Bsid > 8) {
+        return AP4_FAILURE;
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::AP4_Ac3Parser
+ +----------------------------------------------------------------------*/
+AP4_Ac3Parser::AP4_Ac3Parser() :
+m_FrameCount(0)
+{
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::~AP4_Ac3Parser
+ +----------------------------------------------------------------------*/
+AP4_Ac3Parser::~AP4_Ac3Parser()
+{
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::Reset
+ +----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac3Parser::Reset()
+{
+    m_FrameCount = 0;
+    
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::Feed
+ +----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac3Parser::Feed(const AP4_UI08* buffer,
+                     AP4_Size*       buffer_size,
+                     AP4_Flags       flags)
+{
+    AP4_Size free_space;
+    
+    /* update flags */
+    m_Bits.m_Flags = flags;
+    
+    /* possible shortcut */
+    if (buffer == NULL ||
+        buffer_size == NULL ||
+        *buffer_size == 0) {
+        return AP4_SUCCESS;
+    }
+    
+    /* see how much data we can write */
+    free_space = m_Bits.GetBytesFree();
+    if (*buffer_size > free_space) *buffer_size = free_space;
+    if (*buffer_size == 0) return AP4_SUCCESS;
+    
+    /* write the data */
+    return m_Bits.WriteBytes(buffer, *buffer_size);
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::FindHeader
+ +----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac3Parser::FindHeader(AP4_UI08* header)
+{
+    AP4_Size available = m_Bits.GetBytesAvailable();
+    
+    /* look for the sync pattern */
+    while (available-- >= AP4_AC3_HEADER_SIZE) {
+        m_Bits.PeekBytes(header, 2);  // ac3 header begins with 0x0B77
+        
+        if( (((header[0] << 8) | header[1]) == AP4_AC3_SYNC_WORD_BIG_ENDIAN) ||
+           (((header[0] << 8) | header[1]) == AP4_AC3_SYNC_WORD_LITTLE_ENDIAN) ){
+            // Little Endian
+            if (((header[0] << 8) | header[1]) == AP4_AC3_SYNC_WORD_LITTLE_ENDIAN) {
+                m_LittleEndian = true;
+            } else {
+                m_LittleEndian = false;
+            }
+            /* found a sync pattern, read the entire the header */
+            m_Bits.PeekBytes(header, AP4_AC3_HEADER_SIZE);
+            
+            return AP4_SUCCESS;
+        } else {
+            m_Bits.ReadByte(); // skip
+        }
+    }
+    
+    return AP4_ERROR_NOT_ENOUGH_DATA;
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::FindFrame
+ +----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac3Parser::FindFrame(AP4_Ac3Frame& frame)
+{
+    unsigned int   available;
+    unsigned char  raw_header[AP4_AC3_HEADER_SIZE];
+    AP4_Result     result;
+    
+    /* align to the start of the next byte */
+    m_Bits.ByteAlign();
+    
+    /* find a frame header */
+    result = FindHeader(raw_header);
+    if (AP4_FAILED(result)) return result;
+    
+    if (m_LittleEndian) {
+        AP4_ByteSwap16(raw_header, AP4_AC3_HEADER_SIZE);
+    }
+    
+    /* parse the header */
+    AP4_Ac3Header ac3_header(raw_header);
+    
+    /* check the header */
+    result = ac3_header.Check();
+    if (AP4_FAILED(result)) {
+        m_Bits.SkipBytes(2);
+        goto fail;
+    }
+    
+    /* check if we have enough data to peek at the next header */
+    available = m_Bits.GetBytesAvailable();
+    if (available >= ac3_header.m_FrameSize + AP4_AC3_HEADER_SIZE) {
+        // enough to peek at the header of the next frame
+        unsigned char peek_raw_header[AP4_AC3_HEADER_SIZE];
+        
+        m_Bits.SkipBytes(ac3_header.m_FrameSize);
+        m_Bits.PeekBytes(peek_raw_header, AP4_AC3_HEADER_SIZE);
+        m_Bits.SkipBytes(-((int)ac3_header.m_FrameSize));
+        
+        if (m_LittleEndian) {
+            AP4_ByteSwap16(peek_raw_header, AP4_AC3_HEADER_SIZE);
+        }
+        /* check the header */
+        AP4_Ac3Header peek_ac3_header(peek_raw_header);
+        result = peek_ac3_header.Check();
+        if (AP4_FAILED(result)) {
+            m_Bits.SkipBytes(ac3_header.m_FrameSize + 2);
+            goto fail;
+        }
+        
+        /* check that the fixed part of this header is the same as the */
+        /* fixed part of the previous header                           */
+        else if (!AP4_Ac3Header::MatchFixed(ac3_header, peek_ac3_header)) {
+            m_Bits.SkipBytes(ac3_header.m_FrameSize + 2);
+            goto fail;
+        }
+    } else if (available < ac3_header.m_FrameSize || (m_Bits.m_Flags & AP4_BITSTREAM_FLAG_EOS) == 0) {
+        // not enough for a frame, or not at the end (in which case we'll want to peek at the next header)
+        return AP4_ERROR_NOT_ENOUGH_DATA;
+    }
+    frame.m_Info.m_ChannelCount                 = ac3_header.m_ChannelCount;
+    frame.m_Info.m_SampleRate                   = FSCOD_AC3[ac3_header.m_Fscod];
+    frame.m_Info.m_FrameSize                    = ac3_header.m_FrameSize;
+    frame.m_Info.m_Ac3StreamInfo.fscod          = ac3_header.m_Fscod;
+    frame.m_Info.m_Ac3StreamInfo.bsid           = ac3_header.m_Bsid;
+    frame.m_Info.m_Ac3StreamInfo.bsmod          = ac3_header.m_Bsmod;
+    frame.m_Info.m_Ac3StreamInfo.acmod          = ac3_header.m_Acmod;
+    frame.m_Info.m_Ac3StreamInfo.lfeon          = ac3_header.m_Lfeon;
+    frame.m_Info.m_Ac3StreamInfo.bit_rate_code  = ac3_header.m_Frmsizecod / 2;
+    
+    frame.m_LittleEndian = m_LittleEndian;
+    
+    /* set the frame source */
+    frame.m_Source = &m_Bits;
+    
+    return AP4_SUCCESS;
+    
+fail:
+    /* skip the header and return (only skip the first byte in  */
+    /* case this was a false header that hides one just after)  */
+    //m_Bits.SkipBytes(-(AP4_ADTS_HEADER_SIZE-1));
+    return AP4_ERROR_CORRUPTED_BITSTREAM;
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::GetBytesFree
+ +----------------------------------------------------------------------*/
+AP4_Size
+AP4_Ac3Parser::GetBytesFree()
+{
+    return (m_Bits.GetBytesFree());
+}
+
+/*----------------------------------------------------------------------+
+ |    AP4_Ac3Parser::GetBytesAvailable
+ +----------------------------------------------------------------------*/
+AP4_Size
+AP4_Ac3Parser::GetBytesAvailable()
+{
+    return (m_Bits.GetBytesAvailable());
+}

bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Ac3Parser.h Added

@@ -0,0 +1,124 @@
+/*****************************************************************
+ |
+ |    AP4 - AC-3 Sync Frame Parser
+ |
+ |    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_AC3_PARSER_H_
+#define _AP4_AC3_PARSER_H_
+
+/*----------------------------------------------------------------------
+ |   includes
+ +---------------------------------------------------------------------*/
+#include "Ap4Types.h"
+#include "Ap4BitStream.h"
+#include "Ap4Dac3Atom.h"
+#include "Ap4Eac3Parser.h"
+
+/*----------------------------------------------------------------------
+ |   constants
+ +---------------------------------------------------------------------*/
+#define AP4_AC3_HEADER_SIZE                32      /* The header size for AC-3 parser, syncinfo() + bsi() */
+#define AP4_AC3_SYNC_WORD_BIG_ENDIAN       0x0B77  /* Big endian, 16 sync bits */
+#define AP4_AC3_SYNC_WORD_LITTLE_ENDIAN    0x770B  /* Little endian, 16 sync bits */
+
+const AP4_UI32 FRAME_SIZE_CODE_ARY_AC3[3][38] = {
+    {64,64,80,80,96,96,112,112,128,128,160,160,192,192,224,224,256,256,320,320,384,384,448,448,512,512,640,640,768,768,896,896,1024,1024,1152,1152,1280,1280},
+    {69,70,87,88,104,105,121,122,139,140,174,175,208,209,243,244,278,279,348,349,417,418,487,488,557,558696,697,835,836,976,977,1114,1115,1253,1254,1393,1394},
+    {96,96,120,120,144,144,168,168,192,192,240,240,288,288,336,336,384,384,480,480,576,576,672,672,768,768,960,960,1152,1152,1344,1344,1536,1536,1728,1728,1920,1920}};
+const AP4_UI32 FSCOD_AC3[4] = {48000, 44100, 32000, 0};
+
+/*----------------------------------------------------------------------
+ |   types
+ +---------------------------------------------------------------------*/
+class AP4_Ac3Header {
+public:
+    // constructor
+    AP4_Ac3Header(const AP4_UI08* bytes);
+    
+    // methods
+    AP4_Result Check();
+    
+    AP4_UI32 m_HeadSize;
+    AP4_UI32 m_FrameSize;
+    AP4_UI32 m_ChannelCount;
+    
+    // AC-3 sysninfo()
+    AP4_UI32 m_Fscod;
+    AP4_UI32 m_Frmsizecod;
+    
+    // AC-3 bsi()
+    AP4_UI32 m_Bsid;
+    AP4_UI32 m_Bsmod;
+    AP4_UI32 m_Acmod;
+    AP4_UI32 m_Lfeon;
+    AP4_UI32 m_Addbsie;
+    AP4_UI32 m_Addbsil;         // 6 bits
+    AP4_UI08 m_addbsi[65];      // (addbsil+1)×8
+
+    // class methods
+    static bool MatchFixed(AP4_Ac3Header frame, AP4_Ac3Header next_frame);
+};
+
+typedef struct {
+    AP4_UI32  m_ChannelCount;
+    AP4_UI32  m_FrameSize;
+    AP4_UI32  m_SampleRate;
+    AP4_Dac3Atom::StreamInfo m_Ac3StreamInfo;
+} AP4_Ac3FrameInfo;
+
+typedef struct {
+    AP4_BitStream*   m_Source;
+    AP4_Ac3FrameInfo m_Info;
+    AP4_Flags m_LittleEndian;
+} AP4_Ac3Frame;
+
+class AP4_Ac3Parser {
+public:
+    // constructor and destructor
+    AP4_Ac3Parser();
+    virtual ~AP4_Ac3Parser();
+    
+    // methods
+    AP4_Result Reset();
+    AP4_Result Feed(const AP4_UI08* buffer,
+                    AP4_Size*       buffer_size,
+                    AP4_Flags       flags = 0);
+    AP4_Result FindFrame(AP4_Ac3Frame& frame);
+    AP4_Result Skip(AP4_Size size);
+    AP4_Size   GetBytesFree();
+    AP4_Size   GetBytesAvailable();
+    
+private:
+    // methods
+    AP4_Result FindHeader(AP4_UI08* header);
+    
+    // members
+    AP4_BitStream m_Bits;
+    AP4_Cardinal  m_FrameCount;
+    AP4_Flags     m_LittleEndian;
+};
+
+#endif // _AP4_AC3_PARSER_H_

bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Ac4Parser.cpp Added

@@ -0,0 +1,505 @@
+/*****************************************************************
+|
+|    AP4 - AC4 Sync Frame Parser
+|
+|    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 "Ap4BitStream.h"
+#include "Ap4Ac4Parser.h"
+
+bool AP4_Ac4Header::m_DeprecatedV0 = true;
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Header::AP4_Ac4Header
++----------------------------------------------------------------------*/
+AP4_Ac4Header::AP4_Ac4Header(const AP4_UI08* bytes, unsigned int size)
+{
+    /* Read the entire the frame */
+    AP4_BitReader bits(bytes, size);
+
+    m_SyncWord = bits.ReadBits(16);
+    m_HeaderSize = 2;
+    if (m_SyncWord == AP4_AC4_SYNC_WORD_CRC){
+        m_CrcSize = 2;
+    }else {
+        m_CrcSize = 0;
+    }
+    m_FrameSize = bits.ReadBits(16);
+    m_HeaderSize += 2;
+    if (m_FrameSize == 0xFFFF){
+        m_FrameSize = bits.ReadBits(24);
+        m_HeaderSize += 3; 
+    }
+
+    /* Begin to parse TOC */
+    m_BitstreamVersion = bits.ReadBits(2);
+    if (m_BitstreamVersion == 3) {
+        m_BitstreamVersion = AP4_Ac4VariableBits(bits, 2);
+    }
+    m_SequenceCounter  = bits.ReadBits(10);
+    m_BWaitFrames      = bits.ReadBit();
+    if (m_BWaitFrames) {
+        m_WaitFrames = bits.ReadBits(3);
+        if (m_WaitFrames > 0){ m_BrCode = bits.ReadBits(2);}
+    }else {
+        m_WaitFrames = -1;
+    }
+
+    m_FsIndex               = bits.ReadBit();
+    m_FrameRateIndex        = bits.ReadBits(4);
+    m_BIframeGlobal         = bits.ReadBit();
+    m_BSinglePresentation   = bits.ReadBit();
+    if (m_BSinglePresentation == 1){
+        m_NPresentations = 1;
+        m_BMorePresentations = 0;
+    }else{
+        m_BMorePresentations = bits.ReadBit();
+        if (m_BMorePresentations == 1){
+            m_NPresentations = AP4_Ac4VariableBits(bits, 2) + 2;
+        }else{
+            m_NPresentations = 0;
+        }
+    }
+    m_PayloadBase = 0;
+    m_BPayloadBase = bits.ReadBit();
+    if (m_BPayloadBase == 1){
+        m_PayloadBase = bits.ReadBits(5)  + 1;
+        if (m_PayloadBase == 0x20){
+            m_PayloadBase += AP4_Ac4VariableBits(bits, 3);
+        }
+    }
+    if (m_BitstreamVersion <= 1){
+        if (m_DeprecatedV0){
+            m_DeprecatedV0 = false;
+            printf("Warning: Bitstream version 0 is deprecated\n");
+        }
+    }else{
+        m_BProgramId = bits.ReadBit();
+        if (m_BProgramId == 1){
+            m_ShortProgramId = bits.ReadBits(16);
+            m_BProgramUuidPresent = bits.ReadBit();
+            if (m_BProgramUuidPresent == 1){
+                for (int cnt = 0; cnt < 16; cnt++){
+                    m_ProgramUuid[cnt] = bits.ReadBits(8);
+                }
+            }else {
+                memcpy(m_ProgramUuid,"ONDEL TEAM UUID\0", 16);
+            }
+        }else {
+            m_ShortProgramId = 0;
+            m_BProgramUuidPresent = 0;
+            memcpy(m_ProgramUuid, "ONDEL TEAM UUID\0", 16);
+        }
+        unsigned int maxGroupIndex = 0;
+        unsigned int *firstPresentationSubstreamGroupIndexes = NULL;
+        unsigned int firstPresentationNSubstreamGroups = 0;
+
+        if (m_NPresentations > 0){
+            m_PresentationV1= new AP4_Dac4Atom::Ac4Dsi::PresentationV1[m_NPresentations];
+            AP4_SetMemory(m_PresentationV1, 0, m_NPresentations * sizeof(m_PresentationV1[0]));
+        } else {
+            m_PresentationV1 = NULL;
+        }
+        // ac4_presentation_v1_info()
+        for (unsigned int pres_idx = 0; pres_idx < m_NPresentations; pres_idx++){
+            AP4_Dac4Atom::Ac4Dsi::PresentationV1& presentation = m_PresentationV1[pres_idx];
+            presentation.ParsePresentationV1Info(bits,
+                                                 m_BitstreamVersion,
+                                                 m_FrameRateIndex,
+                                                 pres_idx,
+                                                 maxGroupIndex,
+                                                 &firstPresentationSubstreamGroupIndexes,
+                                                 firstPresentationNSubstreamGroups);            
+        }
+        unsigned int bObjorAjoc = 0;
+        unsigned int channelCount = 0;
+        unsigned int speakerGroupIndexMask = 0;
+        AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 *substream_groups = new AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1[maxGroupIndex + 1];
+        AP4_SetMemory(substream_groups, 0, (maxGroupIndex + 1) * sizeof(substream_groups[0]));
+        for (unsigned int sg = 0 ; (sg < (maxGroupIndex + 1)) && (m_NPresentations > 0); sg ++) {
+            AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 &substream_group = substream_groups[sg];
+            AP4_Result pres_index = GetPresentationIndexBySGIndex(sg);
+            if (pres_index == AP4_FAILURE) {
+                break;
+            }
+            unsigned int localChannelCount = 0;
+            unsigned int frame_rate_factor = (m_PresentationV1[pres_index].d.v1.dsi_frame_rate_multiply_info == 0)? 1: (m_PresentationV1[pres_index].d.v1.dsi_frame_rate_multiply_info * 2);
+            substream_group.ParseSubstreamGroupInfo(bits,
+                                                    m_BitstreamVersion,
+                                                    GetPresentationVersionBySGIndex(sg),
+                                                    Ap4_Ac4SubstreamGroupPartOfDefaultPresentation(sg, firstPresentationSubstreamGroupIndexes, firstPresentationNSubstreamGroups),
+                                                    frame_rate_factor,
+                                                    m_FsIndex,
+                                                    localChannelCount,
+                                                    speakerGroupIndexMask,
+                                                    bObjorAjoc);
+            if (channelCount < localChannelCount) { channelCount = localChannelCount;}
+        }
+
+        for (unsigned int pres_idx = 0; pres_idx < m_NPresentations; pres_idx++){
+            m_PresentationV1[pres_idx].d.v1.substream_groups = new AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1[m_PresentationV1[pres_idx].d.v1.n_substream_groups];
+            for (unsigned int sg = 0; sg < m_PresentationV1[pres_idx].d.v1.n_substream_groups; sg++){
+                // TODO: Default Copy Construct Function
+                m_PresentationV1[pres_idx].d.v1.substream_groups[sg]   = substream_groups[m_PresentationV1[pres_idx].d.v1.substream_group_indexs[sg]];
+                m_PresentationV1[pres_idx].d.v1.dolby_atmos_indicator |= m_PresentationV1[pres_idx].d.v1.substream_groups[sg].d.v1.dolby_atmos_indicator;
+            }
+        }
+        delete[] substream_groups;
+
+        if (bObjorAjoc == 0){
+            m_ChannelCount = AP4_Ac4ChannelCountFromSpeakerGroupIndexMask(speakerGroupIndexMask);
+        }else {
+            m_ChannelCount = channelCount;
+        }
+    }
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Header::MatchFixed
+|
+|    Check that two fixed headers are the same
+|
++----------------------------------------------------------------------*/
+bool
+AP4_Ac4Header::MatchFixed(AP4_Ac4Header frame, AP4_Ac4Header next_frame)
+{
+    // Some parameter shall be const which defined in AC-4 in ISO-BMFF specs
+    // TODO: More constraints will be added
+    if ((frame.m_FsIndex == next_frame.m_FsIndex) &&
+        (frame.m_FrameRateIndex == next_frame.m_FrameRateIndex)){
+        return true;
+    }else {
+        return false;
+    }
+    
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Header::Check
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac4Header::Check()
+{
+    // Bitstream version
+    if (m_BitstreamVersion != 2) {
+        return AP4_FAILURE;
+    }
+    if ((m_FsIndex == 0  && m_FrameRateIndex != 13) || (m_FsIndex == 1 &&  m_FrameRateIndex >13)){
+        return AP4_FAILURE;
+    }
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Header::GetPresentationVersionBySGIndex
++----------------------------------------------------------------------*/
+AP4_Result 
+AP4_Ac4Header::GetPresentationVersionBySGIndex(unsigned int substream_group_index) 
+{
+    for (unsigned int idx = 0; idx < m_NPresentations; idx++){
+        for (unsigned int sg = 0; sg < m_PresentationV1[idx].d.v1.n_substream_groups; sg++){
+            if (substream_group_index ==  m_PresentationV1[idx].d.v1.substream_group_indexs[sg]) {
+                return m_PresentationV1[idx].presentation_version;
+            }
+        }
+    }
+    return AP4_FAILURE;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Header::GetPresentationIndexBySGIndex
++----------------------------------------------------------------------*/
+AP4_Result 
+AP4_Ac4Header::GetPresentationIndexBySGIndex(unsigned int substream_group_index) 
+{
+    for (unsigned int idx = 0; idx < m_NPresentations; idx++){
+        for (unsigned int sg = 0; sg < m_PresentationV1[idx].d.v1.n_substream_groups; sg++){
+            if (substream_group_index ==  m_PresentationV1[idx].d.v1.substream_group_indexs[sg]) {
+                return idx;
+            }
+        }
+    }
+    return AP4_FAILURE;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::AP4_Ac4Parser
++----------------------------------------------------------------------*/
+AP4_Ac4Parser::AP4_Ac4Parser() :
+    m_FrameCount(0)
+{
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::~AP4_Ac4Parser
++----------------------------------------------------------------------*/
+AP4_Ac4Parser::~AP4_Ac4Parser()
+{
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::Reset
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac4Parser::Reset()
+{
+    m_FrameCount = 0;
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::Feed
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac4Parser::Feed(const AP4_UI08* buffer, 
+                     AP4_Size*       buffer_size,
+                     AP4_Flags       flags)
+{
+    AP4_Size free_space;
+
+    /* update flags */
+    m_Bits.m_Flags = flags;
+
+    /* possible shortcut */
+    if (buffer == NULL ||
+        buffer_size == NULL || 
+        *buffer_size == 0) {
+        return AP4_SUCCESS;
+    }
+
+    /* see how much data we can write */
+    free_space = m_Bits.GetBytesFree();
+    if (*buffer_size > free_space) *buffer_size = free_space;
+    if (*buffer_size == 0) return AP4_SUCCESS;
+
+    /* write the data */
+    return m_Bits.WriteBytes(buffer, *buffer_size); 
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::FindHeader
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac4Parser::FindHeader(AP4_UI08* header)
+{
+    AP4_Size available = m_Bits.GetBytesAvailable();
+
+    /* look for the sync pattern */
+    while (available-- >= AP4_AC4_HEADER_SIZE) {
+        m_Bits.PeekBytes(header, 2);
+
+        if ((((header[0] << 8) | header[1]) == AP4_AC4_SYNC_WORD_CRC) || (((header[0] << 8) | header[1]) == AP4_AC4_SYNC_WORD)) {
+            /* found a sync pattern, read the entire the header */
+            m_Bits.PeekBytes(header, AP4_AC4_HEADER_SIZE);
+            
+           return AP4_SUCCESS;
+        } else {
+            m_Bits.SkipBytes(1); 
+        }
+    }
+
+    return AP4_ERROR_NOT_ENOUGH_DATA;
+}
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::GetSyncFrameSize
++----------------------------------------------------------------------*/
+AP4_UI32
+AP4_Ac4Parser::GetSyncFrameSize(AP4_BitReader &bits)
+{
+    unsigned int sync_word  = bits.ReadBits(16);
+    unsigned int frame_size = bits.ReadBits(16);
+    unsigned int head_size  = 4;
+    if (frame_size == 0xFFFF){
+        frame_size = bits.ReadBits(24);
+        head_size += 3; 
+    }
+    if (sync_word == AP4_AC4_SYNC_WORD_CRC) {
+        head_size += 2;
+    }
+    return (head_size + frame_size); 
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::FindFrame
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Ac4Parser::FindFrame(AP4_Ac4Frame& frame)
+{
+    unsigned int   available;
+    unsigned char  *raw_header = new unsigned char[AP4_AC4_HEADER_SIZE];
+    AP4_Result     result;
+
+    /* align to the start of the next byte */
+    m_Bits.ByteAlign();
+    
+    /* find a frame header */
+    result = FindHeader(raw_header);
+    if (AP4_FAILED(result)) return result;
+
+    // duplicated work, just to get the frame size
+    AP4_BitReader tmp_bits(raw_header, AP4_AC4_HEADER_SIZE);
+    unsigned int sync_frame_size = GetSyncFrameSize(tmp_bits);
+    if (sync_frame_size > (AP4_BITSTREAM_BUFFER_SIZE - 1)) {
+        return AP4_ERROR_NOT_ENOUGH_DATA;
+    }
+
+    delete[] raw_header;
+    raw_header = new unsigned char[sync_frame_size];
+    /*
+     * Error handling to skip the 'fake' sync word. 
+     * - the maximum sync frame size is about (AP4_BITSTREAM_BUFFER_SIZE - 1) bytes.
+     */
+    if (m_Bits.GetBytesAvailable() < sync_frame_size ) {
+        if (m_Bits.GetBytesAvailable() == (AP4_BITSTREAM_BUFFER_SIZE - 1)) {
+            // skip the sync word, assume it's 'fake' sync word
+            m_Bits.SkipBytes(2);
+        }
+        return AP4_ERROR_NOT_ENOUGH_DATA;
+    }
+    // copy the whole frame becasue toc size is unknown
+    m_Bits.PeekBytes(raw_header, sync_frame_size);
+    /* parse the header */
+    AP4_Ac4Header ac4_header(raw_header, sync_frame_size);
+
+    // Place before goto statement to resolve Xcode compiler issue
+    unsigned int bit_rate_mode = 0;
+
+    /* check the header */
+    result = ac4_header.Check();
+    if (AP4_FAILED(result)) {
+        m_Bits.SkipBytes(sync_frame_size);
+        goto fail;
+    }
+    
+    /* check if we have enough data to peek at the next header */
+    available = m_Bits.GetBytesAvailable();
+    // TODO: find the proper AP4_AC4_MAX_TOC_SIZE or just parse what this step need ?
+    if (available >= ac4_header.m_FrameSize + ac4_header.m_HeaderSize + ac4_header.m_CrcSize + AP4_AC4_HEADER_SIZE + AP4_AC4_MAX_TOC_SIZE) {
+        // enough to peek at the header of the next frame
+        unsigned char *peek_raw_header = new unsigned char[AP4_AC4_HEADER_SIZE];
+
+        m_Bits.SkipBytes(ac4_header.m_FrameSize + ac4_header.m_HeaderSize + ac4_header.m_CrcSize);
+        m_Bits.PeekBytes(peek_raw_header, AP4_AC4_HEADER_SIZE);
+
+        // duplicated work, just to get the frame size
+        AP4_BitReader peak_tmp_bits(peek_raw_header, AP4_AC4_HEADER_SIZE);
+        unsigned int peak_sync_frame_size = GetSyncFrameSize(peak_tmp_bits);
+
+        delete[] peek_raw_header;
+        peek_raw_header = new unsigned char[peak_sync_frame_size];
+        // copy the whole frame becasue toc size is unknown
+        if (m_Bits.GetBytesAvailable() < (peak_sync_frame_size)) {
+            peak_sync_frame_size = m_Bits.GetBytesAvailable();
+        }
+        m_Bits.PeekBytes(peek_raw_header, peak_sync_frame_size);
+
+        m_Bits.SkipBytes(-((int)(ac4_header.m_FrameSize + ac4_header.m_HeaderSize + ac4_header.m_CrcSize)));
+
+        /* check the header */
+        AP4_Ac4Header peek_ac4_header(peek_raw_header, peak_sync_frame_size);
+        result = peek_ac4_header.Check();
+        if (AP4_FAILED(result)) {
+            // TODO: need to reserve current sync frame ?
+            m_Bits.SkipBytes(sync_frame_size + peak_sync_frame_size);
+            goto fail;
+        }
+
+        /* check that the fixed part of this header is the same as the */
+        /* fixed part of the previous header                           */
+        if (!AP4_Ac4Header::MatchFixed(ac4_header, peek_ac4_header)) {
+            // TODO: need to reserve current sync frame ?
+            m_Bits.SkipBytes(sync_frame_size + peak_sync_frame_size);
+            goto fail;
+        }
+    } else if (available < (ac4_header.m_FrameSize + ac4_header.m_HeaderSize + ac4_header.m_CrcSize) || (m_Bits.m_Flags & AP4_BITSTREAM_FLAG_EOS) == 0) {
+        // not enough for a frame, or not at the end (in which case we'll want to peek at the next header)
+        return AP4_ERROR_NOT_ENOUGH_DATA;
+    }
+
+    m_Bits.SkipBytes(ac4_header.m_HeaderSize);
+
+    /* fill in the frame info */
+    frame.m_Info.m_HeaderSize     = ac4_header.m_HeaderSize;
+    frame.m_Info.m_FrameSize      = ac4_header.m_FrameSize;
+    frame.m_Info.m_CRCSize        = ac4_header.m_CrcSize;
+    frame.m_Info.m_ChannelCount   = ac4_header.m_ChannelCount; 
+    frame.m_Info.m_SampleDuration = (ac4_header.m_FsIndex == 0)? 2048 : AP4_Ac4SampleDeltaTable   [ac4_header.m_FrameRateIndex];
+    frame.m_Info.m_MediaTimeScale = (ac4_header.m_FsIndex == 0)? 44100: AP4_Ac4MediaTimeScaleTable[ac4_header.m_FrameRateIndex];
+    frame.m_Info.m_Iframe         = ac4_header.m_BIframeGlobal;
+  
+    /* fill the AC4 DSI info */
+    frame.m_Info.m_Ac4Dsi.ac4_dsi_version        = 1;
+    frame.m_Info.m_Ac4Dsi.d.v1.bitstream_version = ac4_header.m_BitstreamVersion;
+    frame.m_Info.m_Ac4Dsi.d.v1.fs_index          = ac4_header.m_FsIndex;
+    frame.m_Info.m_Ac4Dsi.d.v1.fs                = AP4_Ac4SamplingFrequencyTable[frame.m_Info.m_Ac4Dsi.d.v1.fs_index];
+    frame.m_Info.m_Ac4Dsi.d.v1.frame_rate_index  = ac4_header.m_FrameRateIndex;
+    frame.m_Info.m_Ac4Dsi.d.v1.b_program_id      = ac4_header.m_BProgramId;
+    frame.m_Info.m_Ac4Dsi.d.v1.short_program_id  = ac4_header.m_ShortProgramId;
+    frame.m_Info.m_Ac4Dsi.d.v1.b_uuid            = ac4_header.m_BProgramUuidPresent;
+    AP4_CopyMemory(frame.m_Info.m_Ac4Dsi.d.v1.program_uuid, ac4_header.m_ProgramUuid, 16);
+
+    // Calcuate the bit rate mode according to ETSI TS 103 190-2 V1.2.1 Annex B 
+    if (ac4_header.m_WaitFrames      == 0)                                 { bit_rate_mode = 1;}
+    else if (ac4_header.m_WaitFrames >= 1 && ac4_header.m_WaitFrames <= 6) { bit_rate_mode = 2;}
+    else if (ac4_header.m_WaitFrames >  6)                                 { bit_rate_mode = 3;}
+
+    frame.m_Info.m_Ac4Dsi.d.v1.ac4_bitrate_dsi.bit_rate_mode = bit_rate_mode;
+    frame.m_Info.m_Ac4Dsi.d.v1.ac4_bitrate_dsi.bit_rate = 0;                    // unknown, fixed value now
+    frame.m_Info.m_Ac4Dsi.d.v1.ac4_bitrate_dsi.bit_rate_precision = 0xffffffff; // unknown, fixed value now
+    frame.m_Info.m_Ac4Dsi.d.v1.n_presentations = ac4_header.m_NPresentations;
+    frame.m_Info.m_Ac4Dsi.d.v1.presentations   = ac4_header.m_PresentationV1;
+
+    /* set the frame source */
+    frame.m_Source = &m_Bits;
+
+    return AP4_SUCCESS;
+
+fail:
+    /* skip the header and return (only skip the first byte in  */
+    /* case this was a false header that hides one just after)  */
+    return AP4_ERROR_CORRUPTED_BITSTREAM;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::GetBytesFree
++----------------------------------------------------------------------*/
+AP4_Size
+AP4_Ac4Parser::GetBytesFree()
+{
+  return (m_Bits.GetBytesFree());
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Ac4Parser::GetBytesAvailable
++----------------------------------------------------------------------*/
+AP4_Size  
+AP4_Ac4Parser::GetBytesAvailable()
+{
+  return (m_Bits.GetBytesAvailable());
+}

bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Ac4Parser.h Added

@@ -0,0 +1,139 @@
+/*****************************************************************
+|
+|    AP4 - AC4 Sync Frame Parser
+|
+|    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_AC4_PARSER_H_
+#define _AP4_AC4_PARSER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Types.h"
+#include "Ap4BitStream.h"
+#include "Ap4Dac4Atom.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+#define AP4_AC4_HEADER_SIZE     7       /* The header size for AC-4 parser, only include (sync word + frame size) */
+#define AP4_AC4_MAX_TOC_SIZE    512     /* Ths assumption of max toc size */
+#define AP4_AC4_SYNC_WORD       0xAC40  /* 16 sync bits without CRC */
+#define AP4_AC4_SYNC_WORD_CRC   0xAC41  /* 16 sync bits with    CRC */
+
+/*----------------------------------------------------------------------
+|   types
++---------------------------------------------------------------------*/
+class AP4_Ac4Header {
+public:
+    // constructor
+    AP4_Ac4Header(const AP4_UI08* bytes, unsigned int size);
+    
+    // methods
+    AP4_Result Check();
+
+    // AC-4 Sync Frame Inforamtion
+    AP4_UI32 m_SyncWord;
+    AP4_UI32 m_HeaderSize;
+    AP4_UI32 m_FrameSize;
+    AP4_UI32 m_CrcSize;
+
+    // AC-4 Channel Count
+    AP4_UI32 m_ChannelCount;
+
+    // Ac-4 General/High Level TOC Information
+    AP4_UI32 m_BitstreamVersion;
+    AP4_UI32 m_SequenceCounter;
+    AP4_UI32 m_BWaitFrames;
+    AP4_UI32 m_WaitFrames;
+    AP4_UI32 m_BrCode;
+    AP4_UI32 m_FsIndex;
+    AP4_UI32 m_FrameRateIndex;
+    AP4_UI32 m_BIframeGlobal;
+    AP4_UI32 m_BSinglePresentation;
+    AP4_UI32 m_BMorePresentations;
+    AP4_UI32 m_NPresentations;
+    AP4_UI32 m_BPayloadBase;
+    AP4_UI32 m_PayloadBase;
+    AP4_UI32 m_BProgramId;
+    AP4_UI32 m_ShortProgramId;
+    AP4_UI32 m_BProgramUuidPresent;
+    AP4_Byte m_ProgramUuid[16];
+
+    static bool m_DeprecatedV0;
+
+    // AC-4 Presentation Information
+    AP4_Dac4Atom::Ac4Dsi::PresentationV1 *m_PresentationV1;
+    // class methods
+    static bool MatchFixed(AP4_Ac4Header frame, AP4_Ac4Header next_frame);
+private:
+    AP4_Result GetPresentationVersionBySGIndex(unsigned int substream_group_index);
+    AP4_Result GetPresentationIndexBySGIndex  (unsigned int substream_group_index);
+};
+
+typedef struct {
+    AP4_UI32  m_HeaderSize;
+    AP4_UI32  m_FrameSize;
+    AP4_UI32  m_CRCSize;
+    AP4_UI32  m_ChannelCount;
+    AP4_UI32  m_SampleDuration;
+    AP4_UI32  m_MediaTimeScale;
+    AP4_UI32  m_Iframe;
+    AP4_Dac4Atom::Ac4Dsi m_Ac4Dsi;
+} AP4_Ac4FrameInfo;
+
+typedef struct {
+    AP4_BitStream*   m_Source;
+    AP4_Ac4FrameInfo m_Info;
+} AP4_Ac4Frame;
+
+class AP4_Ac4Parser {
+public:
+    // constructor and destructor
+    AP4_Ac4Parser();
+    virtual ~AP4_Ac4Parser();
+
+    // methods
+    AP4_Result Reset();
+    AP4_Result Feed(const AP4_UI08* buffer, 
+                    AP4_Size*       buffer_size,
+                    AP4_Flags       flags = 0);
+    AP4_Result FindFrame(AP4_Ac4Frame& frame);
+    AP4_Result Skip(AP4_Size size);
+    AP4_Size   GetBytesFree();
+    AP4_Size   GetBytesAvailable();
+
+private:
+    // methods
+    AP4_Result FindHeader(AP4_UI08* header);
+    AP4_UI32   GetSyncFrameSize(AP4_BitReader &bits);
+
+    // members
+    AP4_BitStream m_Bits;
+    AP4_Cardinal  m_FrameCount;
+};
+
+#endif // _AP4_AC4_PARSER_H_

bento4-1.6.0r637.tar.gz/Source/C++/Codecs/Ap4AvcParser.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4AvcParser.cpp Changed

@@ -77,6 +77,8 @@
         case 15: return "Subset sequence parameter set";
         case 19: return "Coded slice of an auxiliary coded picture without partitioning";
         case 20: return "Coded slice in scalable extension";
+        case 28: return "Dolby Vision RPU NAL units";
+        case 30: return "Dolby Vision EL NAL units";
         default: return NULL;
     }
 }
@@ -1113,6 +1115,14 @@
         } else if (nal_unit_type >= 14 && nal_unit_type <= 18) {
             CheckIfAccessUnitIsCompleted(access_unit_info);
             DBG_PRINTF_0("\n");
+        } else if (nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_UNSPECIFIED28) {
+             AppendNalUnitData(nal_unit, nal_unit_size);
+             CheckIfAccessUnitIsCompleted(access_unit_info);
+             DBG_PRINTF_0("\n");
+        } else if (nal_unit_type == AP4_AVC_NAL_UNIT_TYPE_UNSPECIFIED30) {
+             AppendNalUnitData(nal_unit, nal_unit_size);
+             CheckIfAccessUnitIsCompleted(access_unit_info);
+             DBG_PRINTF_0("\n");
         } else {
             DBG_PRINTF_0("\n");
         }

bento4-1.6.0r637.tar.gz/Source/C++/Codecs/Ap4AvcParser.h -> bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4AvcParser.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Codecs/Ap4BitStream.h -> bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4BitStream.h Changed

bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Eac3Parser.cpp Added

@@ -0,0 +1,570 @@
+/*****************************************************************
+|
+|    AP4 - E-AC-3 Sync Frame Parser
+|
+|    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 "Ap4BitStream.h"
+#include "Ap4Eac3Parser.h"
+#include "Ap4Utils.h"
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Header::AP4_Eac3Header
++----------------------------------------------------------------------*/
+AP4_Eac3Header::AP4_Eac3Header(const AP4_UI08* bytes)
+{
+    AP4_BitReader bits(bytes, AP4_EAC3_HEADER_SIZE);
+    bits.SkipBits(16);                          // sync word
+
+    m_Strmtyp     = bits.ReadBits(2);
+    m_Substreamid = bits.ReadBits(3);
+    m_Frmsiz      = bits.ReadBits(11);
+    m_FrameSize   = (m_Frmsiz + 1) * 2;
+
+    m_Fscod       = bits.ReadBits(2);
+    unsigned char numblkscod   = 0;
+    unsigned int  blks_per_frm = 0;
+    if (m_Fscod == 0x3){
+       fprintf(stderr, "ERROR: Half sample rate unsupported\n");
+       return;
+    }else{
+        numblkscod = bits.ReadBits(2);
+        if (numblkscod == 0x3){
+            blks_per_frm = 6;
+        }else {
+            blks_per_frm = numblkscod + 1;
+        }
+    }
+
+    m_Acmod = bits.ReadBits(3);
+    m_Lfeon = bits.ReadBits(1);
+    m_ChannelCount = GLOBAL_CHANNEL_ARY[m_Acmod]  + m_Lfeon;
+
+    m_Bsid  = bits.ReadBits(5);
+    if (!((m_Bsid > 10) && (m_Bsid <=16))){
+        fprintf(stderr, "ERROR: Unsupported bitstream id\n");
+        return;
+    }
+
+    /* unsigned char dialnorm = */ bits.ReadBits(5);  // dialnorm
+    // unsigned char compr;
+    if (bits.ReadBit()) {                       // compre
+        /* compr = */ bits.ReadBits(8);
+    }
+    
+    if (m_Acmod == 0x0){                        // if 1+1 mode (dual mono, so some items need a second value)
+        bits.SkipBits(5);                       // dialnorm2
+        if (bits.ReadBit()) {                   // compr2e
+            bits.SkipBits(8);                   // compr2
+        } 
+    }
+
+    if (m_Strmtyp == 0x1) {                     // if dependent stream
+        m_Chanmape = bits.ReadBit();
+        if (m_Chanmape) {
+            m_Chanmap  = bits.ReadBits(16);
+        }else {
+            //TODO: Derive chanmap from the acmod and lfeon parameters
+            m_Chanmap = 0;
+        }
+    }else {
+        m_Chanmape = 0;
+        m_Chanmap  = 0;
+    }
+    
+    // Extract mixing metadata 
+    // unsigned char dmixmod, ltrtcmixlev, lorocmixlev, ltrtsurmixlev, lorosurmixlev, lfemixlevcod;
+    if (bits.ReadBit()){                        // mixmdate
+        if (m_Acmod  > 0x2) {
+            /* dmixmod = */ bits.ReadBits(2);
+        }
+        if ((m_Acmod & 0x1) && (m_Acmod > 0x2)) {
+            /* ltrtcmixlev = */ bits.ReadBits(3);
+            /* lorocmixlev = */ bits.ReadBits(3);
+        }
+        if (m_Acmod & 0x4) {
+            /* ltrtsurmixlev = */ bits.ReadBits(3);
+            /* lorosurmixlev = */ bits.ReadBits(3);
+        }
+        if (m_Lfeon) { 
+            if (bits.ReadBit()) {               // lfemixlevcode
+                /* lfemixlevcod = */ bits.ReadBits(5);
+            }
+        } 
+        if (m_Strmtyp == 0x0) {                 // if independent stream
+            // unsigned char pgmscl, extpgmscl;
+            if (bits.ReadBit()) {               // pgmscle
+                /* pgmscl = */ bits.ReadBits(6);
+            }
+
+            if (m_Acmod == 0x0){                // if 1+1 mode (dual mono, so some items need a second value)
+                if(bits.ReadBit()) {            // pgmscl2e
+                    bits.SkipBits(6);           // pgmscl2
+                } 
+            }
+
+            if(bits.ReadBit()) {                // extpgmscle
+                /* extpgmscl = */ bits.ReadBits(6);
+            }
+
+            char mixdef = bits.ReadBits(2);
+            if(mixdef == 0x1)       { bits.SkipBits(5) ;}   // premixcmpsel, drcsrc, premixcmpscl
+            else if (mixdef == 0x2) { bits.SkipBits(12);}   // mixdata
+            else if (mixdef == 0x3) {
+                char mixdeflen = bits.ReadBits(5);
+                unsigned int mixdefbits = 1;                // the initial value represents mixdata2e
+                if(bits.ReadBit()){                         // mixdata2e
+                    bits.SkipBits(5);                       // premixcmpsel, drcsrc, premixcmpscl
+                    mixdefbits += 5; 
+
+                    mixdefbits += 1;                        // extpgmlscle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // extpgmlscl
+                        mixdefbits += 4;
+                    }
+
+                    mixdefbits += 1;                        // extpgmcscle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // extpgmcscl
+                        mixdefbits += 4;
+                    } 
+
+                    mixdefbits += 1;                        // extpgmrscle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // extpgmrscl
+                        mixdefbits += 4;
+                    }
+
+                    mixdefbits += 1;                        // extpgmlsscle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // extpgmlsscl
+                        mixdefbits += 4;
+                    } 
+
+                    mixdefbits += 1;                        // extpgmrsscle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // extpgmrsscl
+                        mixdefbits += 4;
+                    } 
+
+                    mixdefbits += 1;                        // extpgmlfescle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // extpgmlfescl
+                        mixdefbits += 4;
+                    } 
+
+                    mixdefbits += 1;                        // dmixscle
+                    if(bits.ReadBit()) { 
+                        bits.SkipBits(4);                   // dmixscl
+                        mixdefbits += 4;
+                    } 
+
+                    mixdefbits += 1;
+                    if(bits.ReadBit()){                     // addche
+                        mixdefbits += 1;
+                        if(bits.ReadBit()) {                // extpgmaux1scle
+                            bits.SkipBits(4);               // extpgmaux1scl
+                            mixdefbits += 4;
+                        } 
+
+                        mixdefbits += 1;
+                        if(bits.ReadBit()) {                // extpgmaux2scle
+                            bits.SkipBits(4);               // extpgmaux2scl
+                            mixdefbits += 4;
+                        } 
+                    }
+                } //  if(bits.ReadBit()){   // mixdata2e
+
+                mixdefbits += 1;
+                if(bits.ReadBit()){                         // mixdata3e
+                    bits.SkipBits(5);                       // spchdat
+                    mixdefbits += 5;
+
+                    mixdefbits += 1;
+                    if(bits.ReadBit()){                     // addspchdate
+                        bits.SkipBits(7);                   // spchdat1, spchan1att
+                        mixdefbits += 7;
+
+                        mixdefbits += 1;
+                        if(bits.ReadBit()){                 // addspdat1e
+                            bits.SkipBits(8);               // spchdat2, spchan2att
+                            mixdefbits += 8;
+                        }
+                    }
+                } //  if(bits.ReadBit()){   // mixdata3e
+
+                bits.SkipBits(8 * (mixdeflen + 2) - mixdefbits); // mixdatafill
+            }
+
+            if (m_Acmod < 0x2) {                                // if mono or dual mono source 
+                if(bits.ReadBit()){                             // paninfoe
+                    bits.SkipBits(8 + 6);                       // panmean, paninfo
+                }
+                if (m_Acmod == 0x0) {                           // if 1+1 mode (dual mono - some items need a second value) 
+                    if(bits.ReadBit()){                         // paninfo2e
+                        bits.SkipBits(8 + 6);                   // panmean2, paninfo2
+                    }
+                }
+            }
+
+            if (bits.ReadBit()){                            // frmmixcfginfoe
+                if (blks_per_frm == 1) {
+                    bits.SkipBits(5);                       // blkmixcfginfo[0]
+                }else{
+                    for (unsigned int idx = 0; idx < blks_per_frm; idx++){
+                        if(bits.ReadBit()){                 // blkmixcfginfoe
+                            bits.SkipBits(5);               // blkmixcfginfo[blk]
+                        }
+                    }
+                }
+            }
+        } // if (m_Strmtyp == 0x0)
+    }
+
+    m_Infomdate = bits.ReadBit();
+    if (m_Infomdate){
+        m_Bsmod = bits.ReadBits(3);
+        // unsigned char copyrightb, origbs, dsurexmod;
+        /* copyrightb = */ bits.ReadBits(1);
+        /* origbs     = */ bits.ReadBits(1);
+
+        if (m_Acmod == 0x2) {                               // if in 2/0 mode
+            bits.SkipBits(4);                               // dsurmod, dheadphonmod
+        }
+        if (m_Acmod >= 0x6) {                               // if both surround channels exist
+            /* dsurexmod = */ bits.ReadBits(2);
+        }
+        if(bits.ReadBit()){                                 // audprodie
+            bits.SkipBits(8);                               // mixlevel, roomtyp, adconvtyp
+        }
+        if (m_Acmod == 0x0) {                               //if 1+1 mode (dual mono, so some items need a second value)
+            if(bits.ReadBit()){                             // audprodi2e
+                bits.SkipBits(8);                           // mixlevel2, roomtyp2, adconvtyp2
+            }
+        }
+        if (m_Fscod < 0x3) {                                // if not half sample rate
+            bits.SkipBits(1);                               // sourcefscod
+        }
+    } else { // if (m_Infomdate)
+        m_Bsmod = 0;
+    }
+    
+    m_Convsync = 1;
+    if ((m_Strmtyp == 0x0) && (numblkscod != 0x3)){
+        m_Convsync = bits.ReadBits(1); 
+    }
+
+    if (m_Strmtyp == 0x2) {                                 // if bit stream converted from AC-3
+        unsigned char blkid = 0;
+        if (numblkscod == 0x3) {
+            blkid = 1;
+        }else {
+            blkid = bits.ReadBits(1);
+        }
+        if (blkid) {bits.SkipBits(6); }                     // frmsizecod
+    } 
+
+    m_Addbsie = bits.ReadBit();
+    if (m_Addbsie){ 
+        m_Addbsil = bits.ReadBits(6);
+        for (unsigned int idx = 0 ; idx < (m_Addbsil + 1); idx ++){
+            m_Addbsi[idx] = bits.ReadBits(8);
+        }
+    } else {
+        m_Addbsil = 0;
+        AP4_SetMemory(m_Addbsi, 0, sizeof (m_Addbsi));
+    }
+    m_HeadSize = (bits.GetBitsRead() / 8) + ((bits.GetBitsRead() % 8 == 0) ? 0: 1); 
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Header::MatchFixed
+|
+|    Check that two fixed headers are the same
+|
++----------------------------------------------------------------------*/
+bool
+AP4_Eac3Header::MatchFixed(AP4_Eac3Header frame, AP4_Eac3Header next_frame)
+{
+    if (frame.m_Acmod ==  next_frame.m_Acmod &&
+        frame.m_Bsid  ==  next_frame.m_Bsid  &&
+        frame.m_Bsmod ==  next_frame.m_Bsmod &&
+        frame.m_Lfeon ==  next_frame.m_Lfeon &&
+        frame.m_Fscod ==  next_frame.m_Fscod ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Header::Check
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Eac3Header::Check()
+{
+    if (m_Fscod == 1 || m_Fscod == 2) {
+        fprintf(stderr, "WARN: The sample rate is NOT 48 kHz\n");
+    } else if (m_Fscod == 3) {
+        return AP4_FAILURE;
+    }
+    if (m_Bsid < 10 || m_Bsid > 16) {
+        return AP4_FAILURE;
+    }
+    if (m_Substreamid != 0) {
+        fprintf(stderr, "ERROR: Only single independent substream (I0) or single depenpent substream (D0) is allowed in a DD+ stream\n");
+        return AP4_FAILURE;
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::AP4_Eac3Parser
++----------------------------------------------------------------------*/
+AP4_Eac3Parser::AP4_Eac3Parser() :
+    m_FrameCount(0)
+{
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::~AP4_Eac3Parser
++----------------------------------------------------------------------*/
+AP4_Eac3Parser::~AP4_Eac3Parser()
+{
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::Reset
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Eac3Parser::Reset()
+{
+    m_FrameCount = 0;
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::Feed
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Eac3Parser::Feed(const AP4_UI08* buffer, 
+                     AP4_Size*       buffer_size,
+                     AP4_Flags       flags)
+{
+    AP4_Size free_space;
+
+    /* update flags */
+    m_Bits.m_Flags = flags;
+
+    /* possible shortcut */
+    if (buffer == NULL ||
+        buffer_size == NULL || 
+        *buffer_size == 0) {
+        return AP4_SUCCESS;
+    }
+
+    /* see how much data we can write */
+    free_space = m_Bits.GetBytesFree();
+    if (*buffer_size > free_space) *buffer_size = free_space;
+    if (*buffer_size == 0) return AP4_SUCCESS;
+
+    /* write the data */
+    return m_Bits.WriteBytes(buffer, *buffer_size); 
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::FindHeader
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Eac3Parser::FindHeader(AP4_UI08* header, AP4_Size& skip_size)
+{
+    AP4_Size available = m_Bits.GetBytesAvailable();
+
+    /* look for the sync pattern */
+    while (available-- >= AP4_EAC3_HEADER_SIZE) {
+        m_Bits.PeekBytes(header, 2);
+
+        if( (((header[0] << 8) | header[1]) == AP4_EAC3_SYNC_WORD_BIG_ENDIAN) || 
+            (((header[0] << 8) | header[1]) == AP4_EAC3_SYNC_WORD_LITTLE_ENDIAN) ){
+            if (((header[0] << 8) | header[1]) == AP4_EAC3_SYNC_WORD_LITTLE_ENDIAN) {
+                m_LittleEndian = true;
+            } else {
+                m_LittleEndian = false;
+            }
+            /* found a sync pattern, read the entire the header */
+            m_Bits.PeekBytes(header, AP4_EAC3_HEADER_SIZE);
+            
+           return AP4_SUCCESS;
+        } else {
+            m_Bits.ReadByte(); // skip
+            skip_size++;
+        }
+    }
+
+    return AP4_ERROR_NOT_ENOUGH_DATA;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::FindFrame
++----------------------------------------------------------------------*/
+AP4_Result
+AP4_Eac3Parser::FindFrame(AP4_Eac3Frame& frame)
+{
+    bool           dependent_stream_exist    = false;
+    unsigned int   dependent_stream_chan_loc = 0;
+    unsigned int   dependent_stream_length   = 0;
+    unsigned int   skip_size = 0;
+    unsigned int   available;
+    unsigned char  raw_header[AP4_EAC3_HEADER_SIZE];
+    AP4_Result     result;
+
+    /* align to the start of the next byte */
+    m_Bits.ByteAlign();
+    
+    /* find a frame header */
+    result = FindHeader(raw_header, skip_size);
+    if (AP4_FAILED(result)) return result;
+
+    if (m_LittleEndian) {
+        AP4_ByteSwap16(raw_header, AP4_EAC3_HEADER_SIZE);
+    }
+
+    /* parse the header */
+    AP4_Eac3Header eac3_header(raw_header);
+
+    /* check the header */
+    result = eac3_header.Check();
+    if (AP4_FAILED(result)) {
+        goto fail;
+    }
+    
+    /* check if we have enough data to peek at the next header */
+    available = m_Bits.GetBytesAvailable();
+    if (available >= eac3_header.m_FrameSize + AP4_EAC3_HEADER_SIZE) {
+        // enough to peek at the header of the next frame
+        unsigned char peek_raw_header[AP4_EAC3_HEADER_SIZE];
+
+        m_Bits.SkipBytes(eac3_header.m_FrameSize);
+        skip_size = 0;
+        result = FindHeader(peek_raw_header, skip_size);
+        if (AP4_FAILED(result)) return result;
+        m_Bits.SkipBytes(-((int)(eac3_header.m_FrameSize + skip_size)));
+
+        if (m_LittleEndian) {
+            AP4_ByteSwap16(peek_raw_header, AP4_EAC3_HEADER_SIZE);
+        }
+        /* check the header */
+        AP4_Eac3Header peek_eac3_header(peek_raw_header);
+        result = peek_eac3_header.Check();
+        if (AP4_FAILED(result)) {
+            goto fail;
+        }
+
+        // TODO: Only support 7.1-channel now
+        if (peek_eac3_header.m_Strmtyp  == 1) {
+            dependent_stream_exist = true;
+            if (peek_eac3_header.m_Chanmape == 0){
+                goto fail;
+            }else {
+                if (peek_eac3_header.m_Chanmap & 0x200) {
+                    dependent_stream_chan_loc  |= 0x2;
+                    dependent_stream_length     = peek_eac3_header.m_FrameSize;
+                    eac3_header.m_ChannelCount += 2;
+                } else {
+                    fprintf(stderr, "ERROR: Only support 7.1-channel (I0 + D0). For other D0, the tool doesn't support yet.\n");
+                    goto fail;
+                }
+            }
+        }
+
+        /* check that the fixed part of this header is the same as the */
+        /* fixed part of the previous header                           */
+        else if (!AP4_Eac3Header::MatchFixed(eac3_header, peek_eac3_header)) {
+            goto fail;
+        }
+    } else if (available < eac3_header.m_FrameSize || (m_Bits.m_Flags & AP4_BITSTREAM_FLAG_EOS) == 0) {
+        // not enough for a frame, or not at the end (in which case we'll want to peek at the next header)
+        return AP4_ERROR_NOT_ENOUGH_DATA;
+    }
+
+    /* fill in the frame info */
+    frame.m_Info.m_ChannelCount   = eac3_header.m_ChannelCount;
+    if (dependent_stream_exist) {
+        frame.m_Info.m_FrameSize  = eac3_header.m_FrameSize + dependent_stream_length;
+    }else {
+        frame.m_Info.m_FrameSize  = eac3_header.m_FrameSize;
+    }
+    frame.m_Info.m_SampleRate                = EAC3_SAMPLE_RATE_ARY[eac3_header.m_Fscod];
+    frame.m_Info.m_Eac3SubStream.fscod       = eac3_header.m_Fscod;
+    frame.m_Info.m_Eac3SubStream.bsid        = eac3_header.m_Bsid;
+    frame.m_Info.m_Eac3SubStream.bsmod       = eac3_header.m_Bsmod;
+    frame.m_Info.m_Eac3SubStream.acmod       = eac3_header.m_Acmod;
+    frame.m_Info.m_Eac3SubStream.lfeon       = eac3_header.m_Lfeon;
+    if (dependent_stream_exist) {
+        frame.m_Info.m_Eac3SubStream.num_dep_sub = 1;    
+        frame.m_Info.m_Eac3SubStream.chan_loc    = dependent_stream_chan_loc;
+    }else {
+        frame.m_Info.m_Eac3SubStream.num_dep_sub = 0;    
+        frame.m_Info.m_Eac3SubStream.chan_loc    = 0;
+    }
+
+    frame.m_Info.complexity_index_type_a = 0;
+    if (eac3_header.m_Addbsie && (eac3_header.m_Addbsil == 1) && (eac3_header.m_Addbsi[0] == 0x1)){
+        frame.m_Info.complexity_index_type_a = eac3_header.m_Addbsi[1];
+    }   
+
+    /* set the little endian flag */
+    frame.m_LittleEndian = m_LittleEndian;
+
+    /* set the frame source */
+    frame.m_Source = &m_Bits;
+
+    return AP4_SUCCESS;
+
+fail:
+    return AP4_ERROR_CORRUPTED_BITSTREAM;
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::GetBytesFree
++----------------------------------------------------------------------*/
+AP4_Size
+AP4_Eac3Parser::GetBytesFree()
+{
+    return (m_Bits.GetBytesFree());
+}
+
+/*----------------------------------------------------------------------+
+|    AP4_Eac3Parser::GetBytesAvailable
++----------------------------------------------------------------------*/
+AP4_Size    
+AP4_Eac3Parser::GetBytesAvailable()
+{
+    return (m_Bits.GetBytesAvailable());
+}

bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Eac3Parser.h Added

@@ -0,0 +1,125 @@
+/*****************************************************************
+|
+|    AP4 - E-AC-3 Sync Frame Parser
+|
+|    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_EAC3_PARSER_H_
+#define _AP4_EAC3_PARSER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Types.h"
+#include "Ap4BitStream.h"
+#include "Ap4Dec3Atom.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+#define AP4_EAC3_HEADER_SIZE                64      /* The header size for E-AC-3 parser, syncinfo() + bsi() */
+#define AP4_EAC3_SYNC_WORD_BIG_ENDIAN       0x0B77  /* Big endian, 16 sync bits */
+#define AP4_EAC3_SYNC_WORD_LITTLE_ENDIAN    0x770B  /* Little endian, 16 sync bits */
+
+const AP4_UI08 GLOBAL_CHANNEL_ARY[]   = {2, 1, 2, 3, 3, 4, 4, 5};   /* Channel count number from acmod value */
+const AP4_UI32 EAC3_SAMPLE_RATE_ARY[] = {48000, 44100, 32000};      /* Sample rate from fscode vale */
+
+/*----------------------------------------------------------------------
+|   types
++---------------------------------------------------------------------*/
+class AP4_Eac3Header {
+public:
+    // constructor
+    AP4_Eac3Header(const AP4_UI08* bytes);
+    
+    // methods
+    AP4_Result Check();
+
+    AP4_UI32 m_HeadSize;
+    AP4_UI32 m_ChannelCount;
+    AP4_UI32 m_FrameSize;
+
+    // E-AC-3 bsi()
+    AP4_UI32 m_Strmtyp;
+    AP4_UI32 m_Substreamid;
+    AP4_UI32 m_Frmsiz;
+    AP4_UI32 m_Fscod;
+    AP4_UI32 m_Acmod;
+    AP4_UI32 m_Lfeon;
+    AP4_UI32 m_Bsid;
+    AP4_UI32 m_Chanmape;
+    AP4_UI32 m_Chanmap;
+    AP4_UI32 m_Infomdate;
+    AP4_UI32 m_Bsmod;
+    AP4_UI32 m_Convsync;
+    AP4_UI32 m_Addbsie;
+    AP4_UI32 m_Addbsil;         // 6 bits
+    AP4_UI08 m_Addbsi[65];      // (addbsil + 1)* 8
+
+    // class methods
+    static bool MatchFixed(AP4_Eac3Header frame, AP4_Eac3Header next_frame);
+};
+
+typedef struct {
+    AP4_UI32  m_ChannelCount;
+    AP4_UI32  m_FrameSize;
+    AP4_UI32  m_SampleRate;
+    AP4_Dec3Atom::SubStream m_Eac3SubStream;
+    AP4_UI32  complexity_index_type_a;
+} AP4_Eac3FrameInfo;
+
+typedef struct {
+    AP4_BitStream*   m_Source;
+    AP4_Eac3FrameInfo m_Info;
+    AP4_Flags m_LittleEndian;
+} AP4_Eac3Frame;
+
+class AP4_Eac3Parser {
+public:
+    // constructor and destructor
+    AP4_Eac3Parser();
+    virtual ~AP4_Eac3Parser();
+
+    // methods
+    AP4_Result Reset();
+    AP4_Result Feed(const AP4_UI08* buffer, 
+                    AP4_Size*       buffer_size,
+                    AP4_Flags       flags = 0);
+    AP4_Result FindFrame(AP4_Eac3Frame& frame);
+    AP4_Result Skip(AP4_Size size);
+    AP4_Size   GetBytesFree();
+    AP4_Size   GetBytesAvailable();
+
+private:
+    // methods
+    AP4_Result FindHeader(AP4_UI08* header, AP4_Size& skip_size);
+
+    // members
+    AP4_BitStream m_Bits;
+    AP4_Cardinal  m_FrameCount;
+    AP4_Flags     m_LittleEndian;
+};
+
+#endif // _AP4_EAC3_PARSER_H_

bento4-1.6.0r637.tar.gz/Source/C++/Codecs/Ap4HevcParser.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4HevcParser.cpp Changed

@@ -105,6 +105,8 @@
         case 38: return "FD_NUT - Filler data";
         case 39: return "PREFIX_SEI_NUT - Supplemental enhancement information";
         case 40: return "SUFFIX_SEI_NUT - Supplemental enhancement information";
+        case 62: return "Dolby Vision RPU NAL units";
+        case 63: return "Dolby Vision EL NAL units";
         default: return NULL;
     }
 }
@@ -973,6 +975,16 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_HevcVideoParameterSet::GetInfo
++---------------------------------------------------------------------*/
+void
+AP4_HevcVideoParameterSet::GetInfo(unsigned int& time_scale, unsigned int& num_units)
+{
+    time_scale = vps_time_scale;
+    num_units  = vps_num_units_in_tick;
+}
+
+/*----------------------------------------------------------------------
 |   AP4_HevcVideoParameterSet::Parse
 +---------------------------------------------------------------------*/
 AP4_Result
@@ -1325,6 +1337,10 @@
             AppendNalUnitData(nal_unit, nal_unit_size);
         } else if (nal_unit_type == AP4_HEVC_NALU_TYPE_SUFFIX_SEI_NUT){
             AppendNalUnitData(nal_unit, nal_unit_size);
+        } else if (nal_unit_type == AP4_HEVC_NALU_TYPE_UNSPEC62) {
+            AppendNalUnitData(nal_unit, nal_unit_size);
+        } else if (nal_unit_type == AP4_HEVC_NALU_TYPE_UNSPEC63) {
+            AppendNalUnitData(nal_unit, nal_unit_size);
         }
         DBG_PRINTF_0("\n");
         m_TotalNalUnitCount++;

bento4-1.6.0r637.tar.gz/Source/C++/Codecs/Ap4HevcParser.h -> bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4HevcParser.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Codecs/Ap4Mp4AudioInfo.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Codecs/Ap4Mp4AudioInfo.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4.h Changed

bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Ac4Utils.cpp Added

@@ -0,0 +1,113 @@
+/*****************************************************************
+|
+|    AP4 - AC-4 Utilities
+|
+|    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 "Ap4Ac4Utils.h"
+
+AP4_UI32
+AP4_Ac4VariableBits(AP4_BitReader &data, int nBits)
+{
+    AP4_UI32 value = 0;
+    AP4_UI32 b_moreBits;
+    do{
+        value += data.ReadBits(nBits);
+        b_moreBits = data.ReadBit();
+        if (b_moreBits == 1) {
+            value <<= nBits;
+            value += (1<<nBits);
+      }
+    } while (b_moreBits == 1);
+    return value;
+}
+
+AP4_Result
+AP4_Ac4ChannelCountFromSpeakerGroupIndexMask(unsigned int speakerGroupIndexMask)
+{
+
+    unsigned int channelCount= 0;
+    if ((speakerGroupIndexMask & 1) != 0) { // 0: L,R 0b1
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 2) != 0) { // 1: C 0b10
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 4) != 0) { // 2: Ls,Rs 0b100
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 8) != 0) { // 3: Lb,Rb 0b1000
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 16) != 0) { // 4: Tfl,Tfr 0b10000
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 32) != 0) { // 5: Tbl,Tbr 0b100000
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 64) != 0) { // 6: LFE 0b1000000
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 128) != 0) { // 7: TL,TR 0b10000000
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 256) != 0) { // 8: Tsl,Tsr 0b100000000
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 512) != 0) { // 9: Tfc 
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 1024) != 0) { // 10: Tbc 
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 2048) != 0) { // 11: Tc 
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 4096) != 0) { // 12: LFE2 
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 8192) != 0) { // 13: Bfl,Bfr 
+        channelCount += 2;
+    }
+    if ((speakerGroupIndexMask & 16384) != 0) { // 14: Bfc 
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 32768) != 0) { // 15: Cb 
+        channelCount += 1;
+    }
+    if ((speakerGroupIndexMask & 65536) != 0) { // 16: Lscr,Rscr 
+        channelCount += 2; 
+    }
+    if ((speakerGroupIndexMask & 131072) != 0) { // 17: Lw,Rw 
+        channelCount += 2;
+    } 
+    if ((speakerGroupIndexMask & 262144) != 0) { // 18: Vhl,Vhr 
+        channelCount += 2;
+    }
+    return channelCount;
+}

bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Ac4Utils.h Added

@@ -0,0 +1,216 @@
+/*****************************************************************
+|
+|    AP4 - AC-4 Utilities
+|
+|    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_AC4_UTILS_H_
+#define _AP4_AC4_UTILS_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Utils.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+const unsigned int AP4_CH_MODE_LENGTH           = 16;   /* AC-4 ch_mode length  */
+const unsigned int AP4_AC4_FRAME_RATE_NUM       = 14;   /* AC-4 frame rate number  */
+const unsigned int AP4_AC4_SUBSTREAM_GROUP_NUM  = 3;    /* AC-4 Maximum substream group if presentation_config < 5 */
+
+const unsigned char 
+SUPER_SET_CH_MODE[AP4_CH_MODE_LENGTH][AP4_CH_MODE_LENGTH] =
+{
+    {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15},
+    {1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15},
+    {2, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15},
+    {3, 3, 3, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15},
+    {4, 4, 4, 4, 4, 6, 6, 8, 8, 10,10,12,12,14,14,15},
+    {5, 5, 5, 5, 6, 5, 6, 7, 8, 9, 10,11,12,13,14,15},
+    {6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 10,12,12,14,14,15},
+    {7, 7, 7, 7, 8, 7, 6, 7, 8, 9, 10,12,12,13,14,15},
+    {8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 10,11,12,14,14,15},
+    {9, 9, 9, 9, 10,9, 10,9, 9, 9, 10,11,12,13,14,15},
+    {10,10,10,10,10,10,10,10,10,10,10,10,12,13,14,15},
+    {11,11,11,11,12,11,12,11,12,11,12,11,13,13,14,15},
+    {12,12,12,12,12,12,12,12,12,12,12,12,12,13,14,15},
+    {13,13,13,13,14,13,14,13,14,13,14,13,14,13,14,15},
+    {14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,15},
+    {15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15}
+};
+
+// ch_mode - TS 103 190-2 table 78 
+const int CH_MODE_MONO      = 0;
+const int CH_MODE_STEREO    = 1;
+const int CH_MODE_3_0       = 2;
+const int CH_MODE_5_0       = 3;
+const int CH_MODE_5_1       = 4;
+const int CH_MODE_70_34     = 5;
+const int CH_MODE_71_34     = 6;
+const int CH_MODE_70_52     = 7;
+const int CH_MODE_71_52     = 8;
+const int CH_MODE_70_322    = 9;
+const int CH_MODE_71_322    = 10;
+const int CH_MODE_7_0_4     = 11;
+const int CH_MODE_7_1_4     = 12;
+const int CH_MODE_9_0_4     = 13;
+const int CH_MODE_9_1_4     = 14;
+const int CH_MODE_22_2      = 15;
+const int CH_MODE_RESERVED  = 16;
+
+// speaker group index mask, indexed by ch_mode - TS 103 190-2 A.27 
+const int 
+AC4_SPEAKER_GROUP_INDEX_MASK_BY_CH_MODE[] =
+{
+    2,        // 0b10 - 1.0
+    1,        // 0b01 - 2.0
+    3,        // 0b11 - 3.0
+    7,        // 0b0000111 - 5.0
+    71,       // 0b1000111 - 5.1
+    15,       // 0b0001111 - 7.0: 3/4/0
+    79,       // 0b1001111 - 7.1: 3/4/0.1
+    131079,   // 0b100000000000000111 - 7.0: 5/2/0
+    131143,   // 0b100000000001000111 - 7.1: 5/2/0.1
+    262151,   // 0b1000000000000000111 - 7.0: 3/2/2
+    262215,   // 0b1000000000001000111 - 7.1: 3/2/2.1
+    63,       // 0b0111111 - 7.0.4
+    127,      // 0b1111111 - 7.1.4
+    65599,    // 0b10000000000111111 - 9.0.4
+    65663,    // 0b10000000001111111 - 9.1.4
+    196479,   // 0b101111111101111111 - 22.2
+    0         // reserved
+};
+
+const AP4_UI32
+AP4_Ac4SamplingFrequencyTable[] =
+{
+    44100,  // 44.1 kHz
+    48000   // 48 kHz
+};
+
+const AP4_UI32
+AP4_Ac4SampleDeltaTable[AP4_AC4_FRAME_RATE_NUM] =
+{
+    2002,
+    2000,
+    1920,
+    8008,  // 29.97 fps, using 240 000 media time scale
+    1600,
+    1001,
+    1000,
+    960,
+    4004,  // 59.97 fps
+    800,
+    480,
+    2002,  // 119.88 fps
+    400,
+    2048  // 23.44 fps, AC-4 native frame rate
+};
+
+const AP4_UI32
+AP4_Ac4MediaTimeScaleTable[AP4_AC4_FRAME_RATE_NUM] =
+{
+    48000,
+    48000,
+    48000,
+    240000,  //29.97 fps
+    48000,
+    48000,
+    48000,
+    48000,
+    240000,  // 59.97 fps
+    48000,
+    48000,
+    240000,  // 119.88 fps
+    48000,
+    48000,
+};
+
+/*----------------------------------------------------------------------
+|   struct
++---------------------------------------------------------------------*/
+struct AP4_Ac4EmdfInfo{
+    AP4_UI08 emdf_version;
+    AP4_UI16 key_id;
+    AP4_UI08 b_emdf_payloads_substream_info;
+    AP4_UI16 substream_index;
+    AP4_UI08 protectionLengthPrimary;
+    AP4_UI08 protectionLengthSecondary;
+    AP4_UI08 protection_bits_primary[16];
+    AP4_UI08 protection_bits_Secondary[16];
+};
+
+/*----------------------------------------------------------------------
+|   non-inline functions
++---------------------------------------------------------------------*/
+AP4_UI32
+AP4_Ac4VariableBits(AP4_BitReader &data, int nBits);
+
+AP4_Result
+AP4_Ac4ChannelCountFromSpeakerGroupIndexMask(unsigned int speakerGroupIndexMask);
+
+/*----------------------------------------------------------------------
+|   inline functions
++---------------------------------------------------------------------*/
+inline AP4_Result
+AP4_Ac4SuperSet(int lvalue, int rvalue)
+{
+    if ((lvalue == -1) || (lvalue > 15)) return rvalue;
+    if ((rvalue == -1) || (rvalue > 15)) return lvalue;
+    return SUPER_SET_CH_MODE[lvalue][rvalue];
+}
+
+inline AP4_Result 
+Ap4_Ac4SubstreamGroupPartOfDefaultPresentation(unsigned int substreamGroupIndex, unsigned int presSubstreamGroupIndexes[], unsigned int presNSubstreamGroups) 
+{
+    int partOf = false;
+    for (unsigned int idx = 0; idx < presNSubstreamGroups; idx ++) {
+        if (presSubstreamGroupIndexes[idx] == substreamGroupIndex) { partOf = true; }
+    }
+    return partOf;
+}
+
+inline AP4_UI32
+AP4_SetMaxGroupIndex(unsigned int groupIndex, unsigned int maxGroupIndex) 
+{
+    if (groupIndex > maxGroupIndex) { maxGroupIndex = groupIndex; }
+    return maxGroupIndex;
+}
+
+inline void
+AP4_ByteAlign(AP4_BitWriter &bits)
+{
+    unsigned int byte_align_nums = 8 - (bits.GetBitCount() % 8 == 0 ? 8: bits.GetBitCount() % 8);
+    if (byte_align_nums){ bits.Write(0, byte_align_nums); }
+}
+
+inline void 
+Ap4_Ac4UpdatePresBytes(const unsigned char* buffer, unsigned int idx, unsigned char value)
+{    unsigned char *data = const_cast<unsigned char*>(buffer);
+    *(data + idx) = value; 
+}
+
+#endif // _AP4_AC4_UTILS_H_

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Atom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Atom.cpp Changed

@@ -795,10 +795,10 @@
 |   AP4_PrintInspector::AP4_PrintInspector
 +---------------------------------------------------------------------*/
     AP4_PrintInspector::AP4_PrintInspector(AP4_ByteStream& stream, AP4_Cardinal indent) :
-    m_Stream(&stream),
-    m_Indent(indent)
+    m_Stream(&stream)
 {
     m_Stream->AddReference();
+    PushContext(Context::TOP_LEVEL);
 }
 
 /*----------------------------------------------------------------------
@@ -810,6 +810,62 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_PrintInspector::PushContext
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::PushContext(Context::Type type)
+{
+    m_Contexts.Append(Context(type));
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::PopContext
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::PopContext()
+{
+    m_Contexts.RemoveLast();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::PrintPrefix
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::PrintPrefix()
+{
+    if (LastContext().m_Type == Context::COMPACT_OBJECT) {
+        if (LastContext().m_ArrayIndex++) {
+            m_Stream->WriteString(", ");
+        }
+        return;
+    }
+
+    if (m_Contexts.ItemCount() >= 1) {
+        char prefix[256];
+        AP4_MakePrefixString((m_Contexts.ItemCount() - 1) * 2, prefix, sizeof(prefix));
+        m_Stream->WriteString(prefix);
+
+        if (LastContext().m_Type == Context::ARRAY) {
+            char index[32];
+            AP4_FormatString(index, sizeof(index), "(%8d) ", (int)LastContext().m_ArrayIndex);
+            m_Stream->WriteString(index);
+            ++LastContext().m_ArrayIndex;
+        }
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::PrintSuffix
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::PrintSuffix()
+{
+    if (LastContext().m_Type != Context::COMPACT_OBJECT) {
+        m_Stream->WriteString("\n");
+    }
+}
+
+/*----------------------------------------------------------------------
 |   AP4_PrintInspector::StartAtom
 +---------------------------------------------------------------------*/
 void
@@ -819,6 +875,9 @@
                               AP4_Size    header_size,
                               AP4_UI64    size)
 {
+    PrintPrefix();
+    PushContext(Context::ATOM);
+
     // write atom name
     char info[128];
     char extra[32] = "";
@@ -844,16 +903,12 @@
                      size-header_size,
                      extra);
 
-    char prefix[256];
-    AP4_MakePrefixString(m_Indent, prefix, sizeof(prefix));
-    m_Stream->WriteString(prefix);
     m_Stream->WriteString("[");
     m_Stream->WriteString(name);
     m_Stream->Write("] ", 2);
     m_Stream->WriteString(info);
-    m_Stream->Write("\n", 1);
 
-    m_Indent += 2;
+    PrintSuffix();
 }
 
 /*----------------------------------------------------------------------
@@ -862,7 +917,7 @@
 void
 AP4_PrintInspector::EndAtom()
 {
-    m_Indent -= 2;
+    PopContext();
 }
 
 /*----------------------------------------------------------------------
@@ -873,6 +928,9 @@
                                     AP4_Size    header_size,
                                     AP4_UI64    size)
 {
+    PrintPrefix();
+    PushContext(Context::ATOM);
+
     // write atom name
     char info[128];
     AP4_FormatString(info, sizeof(info),
@@ -880,16 +938,12 @@
                      header_size,
                      size-header_size);
 
-    char prefix[256];
-    AP4_MakePrefixString(m_Indent, prefix, sizeof(prefix));
-    m_Stream->WriteString(prefix);
     m_Stream->Write("[", 1);
     m_Stream->WriteString(name);
     m_Stream->Write("] ", 2);
     m_Stream->WriteString(info);
-    m_Stream->Write("\n", 1);
 
-    m_Indent += 2;
+    PrintSuffix();
 }
 
 /*----------------------------------------------------------------------
@@ -898,7 +952,62 @@
 void
 AP4_PrintInspector::EndDescriptor()
 {
-    m_Indent -= 2;
+    EndAtom();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::StartArray
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::StartArray(const char* name, unsigned int /* element_count */)
+{
+    PrintPrefix();
+    PushContext(Context::ARRAY);
+
+    if (name) {
+        m_Stream->WriteString(name);
+        m_Stream->WriteString(":");
+    }
+
+    PrintSuffix();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::EndArray
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::EndArray()
+{
+    PopContext();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::StartObject
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::StartObject(const char* name, unsigned int /* field_count */, bool compact)
+{
+    PrintPrefix();
+    PushContext(compact ? Context::COMPACT_OBJECT : Context::OBJECT);
+
+    if (name) {
+        m_Stream->WriteString(name);
+        m_Stream->WriteString(": ");
+    }
+
+    PrintSuffix();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_PrintInspector::EndObject
++---------------------------------------------------------------------*/
+void
+AP4_PrintInspector::EndObject()
+{
+    if (LastContext().m_Type == Context::COMPACT_OBJECT) {
+        m_Stream->WriteString("\n");
+    }
+    PopContext();
 }
 
 /*----------------------------------------------------------------------
@@ -907,14 +1016,15 @@
 void
 AP4_PrintInspector::AddField(const char* name, const char* value, FormatHint)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Indent, prefix, sizeof(prefix));
-    m_Stream->WriteString(prefix);
+    PrintPrefix();
 
-    m_Stream->WriteString(name);
-    m_Stream->WriteString(" = ");
+    if (name) {
+        m_Stream->WriteString(name);
+        m_Stream->WriteString(" = ");
+    }
     m_Stream->WriteString(value);
-    m_Stream->Write("\n", 1);
+
+    PrintSuffix();
 }
 
 /*----------------------------------------------------------------------
@@ -923,18 +1033,19 @@
 void
 AP4_PrintInspector::AddField(const char* name, AP4_UI64 value, FormatHint hint)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Indent, prefix, sizeof(prefix));
-    m_Stream->WriteString(prefix);
+    PrintPrefix();
 
+    if (name) {
+        m_Stream->WriteString(name);
+        m_Stream->WriteString(" = ");
+    }
     char str[32];
     AP4_FormatString(str, sizeof(str),
                      hint == HINT_HEX ? "%llx":"%lld",
                      value);
-    m_Stream->WriteString(name);
-    m_Stream->WriteString(" = ");
     m_Stream->WriteString(str);
-    m_Stream->Write("\n", 1);
+
+    PrintSuffix();
 }
 
 /*----------------------------------------------------------------------
@@ -943,18 +1054,19 @@
 void
 AP4_PrintInspector::AddFieldF(const char* name, float value, FormatHint /*hint*/)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Indent, prefix, sizeof(prefix));
-    m_Stream->WriteString(prefix);
+    PrintPrefix();
 
+    if (name) {
+        m_Stream->WriteString(name);
+        m_Stream->WriteString(" = ");
+    }
     char str[32];
     AP4_FormatString(str, sizeof(str),
                      "%f",
                      value);
-    m_Stream->WriteString(name);
-    m_Stream->WriteString(" = ");
     m_Stream->WriteString(str);
-    m_Stream->Write("\n", 1);
+
+    PrintSuffix();
 }
 
 /*----------------------------------------------------------------------
@@ -966,12 +1078,13 @@
                              AP4_Size             byte_count,
                              FormatHint           /* hint */)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Indent, prefix, sizeof(prefix));
-    m_Stream->WriteString(prefix);
+    PrintPrefix();
 
-    m_Stream->WriteString(name);
-    m_Stream->WriteString(" = [");
+    if (name) {
+        m_Stream->WriteString(name);
+        m_Stream->WriteString(" = ");
+    }
+    m_Stream->WriteString("[");
     unsigned int offset = 1;
     char byte[4];
     for (unsigned int i=0; i<byte_count; i++) {
@@ -979,20 +1092,20 @@
         m_Stream->Write(&byte[offset], 3-offset);
         offset = 0;
     }
-    m_Stream->Write("]\n", 2);
+    m_Stream->WriteString("]");
+
+    PrintSuffix();
 }
 
 /*----------------------------------------------------------------------
 |   AP4_JsonInspector::AP4_JsonInspector
 +---------------------------------------------------------------------*/
 AP4_JsonInspector::AP4_JsonInspector(AP4_ByteStream& stream) :
-    m_Stream(&stream),
-    m_Depth(0)
+    m_Stream(&stream)
 {
-    m_Items.SetItemCount(1);
-    m_Items[0] = 0;
     m_Stream->AddReference();
     m_Stream->WriteString("[\n");
+    PushContext(Context::TOP_LEVEL);
 }
 
 /*----------------------------------------------------------------------
@@ -1005,6 +1118,50 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_JsonInspector::PushContext
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::PushContext(Context::Type type)
+{
+    m_Contexts.Append(Context(type));
+    AP4_MakePrefixString(m_Contexts.ItemCount() * 2, m_Prefix, sizeof(m_Prefix));
+}
+
+/*----------------------------------------------------------------------
+|   AP4_JsonInspector::PopContext
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::PopContext()
+{
+    m_Contexts.RemoveLast();
+    AP4_MakePrefixString(m_Contexts.ItemCount() * 2, m_Prefix, sizeof(m_Prefix));
+}
+
+/*----------------------------------------------------------------------
+|   AP4_JsonInspector::OnFieldAdded
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::OnFieldAdded()
+{
+    if (LastContext().m_FieldCount) {
+        m_Stream->WriteString(",\n");
+    }
+    ++LastContext().m_FieldCount;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_JsonInspector::PrintFieldName
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::PrintFieldName(const char* name)
+{
+    if (!name) return;
+    m_Stream->WriteString("\"");
+    m_Stream->WriteString(EscapeString(name).GetChars());
+    m_Stream->WriteString("\": ");
+}
+
+/*----------------------------------------------------------------------
 |   Read one code point from a UTF-8 string
 +---------------------------------------------------------------------*/
 static AP4_Result
@@ -1151,44 +1308,59 @@
 +---------------------------------------------------------------------*/
 void
 AP4_JsonInspector::StartAtom(const char* name,
-                             AP4_UI08    /*version*/,
-                             AP4_UI32    /*flags*/,
+                             AP4_UI08    version,
+                             AP4_UI32    flags,
                              AP4_Size    header_size,
                              AP4_UI64    size)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Depth*2, prefix, sizeof(prefix));
+    OnFieldAdded();
+    ++LastContext().m_ChildrenCount;
 
-    if (m_Items[m_Depth]) {
-        m_Stream->WriteString(",\n");
-    } else {
-        if (m_Depth != 0 || m_Items[0] != 0) {
-            m_Stream->WriteString(",\n");
-            m_Stream->WriteString(prefix);
-            m_Stream->WriteString("\"children\":[\n");
-        }
+    // Starting the first atom within an atom means staring a childen array
+    if (LastContext().m_Type == Context::ATOM && LastContext().m_ChildrenCount == 1) {
+        m_Stream->WriteString(m_Prefix);
+        m_Stream->WriteString("\"children\":[ \n");
     }
-    m_Stream->WriteString(prefix);
+
+    m_Stream->WriteString(m_Prefix);
     m_Stream->WriteString("{\n");
-    m_Stream->WriteString(prefix);
-    m_Stream->WriteString("  \"name\":\"");
+    PushContext(Context::ATOM);
+
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName("name");
+    m_Stream->WriteString("\"");
     m_Stream->WriteString(EscapeString(name).GetChars());
-    m_Stream->Write("\"", 1);
-    m_Stream->WriteString(",\n");
-    m_Stream->WriteString(prefix);
-    m_Stream->WriteString("  \"header_size\":");
+    m_Stream->WriteString("\"");
+
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName("header_size");
     char val[32];
     AP4_FormatString(val, sizeof(val), "%d", header_size);
     m_Stream->WriteString(val);
-    m_Stream->WriteString(",\n");
-    m_Stream->WriteString(prefix);
-    m_Stream->WriteString("  \"size\":");
+
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName("size");
     AP4_FormatString(val, sizeof(val), "%lld", size);
     m_Stream->WriteString(val);
 
-    ++m_Depth;
-    m_Items.SetItemCount(m_Depth+1);
-    m_Items[m_Depth] = 0;
+    if (version) {
+        OnFieldAdded();
+        m_Stream->WriteString(m_Prefix);
+        PrintFieldName("version");
+        AP4_FormatString(val, sizeof(val), "%d", version);
+        m_Stream->WriteString(val);
+    }
+
+    if (flags) {
+        OnFieldAdded();
+        m_Stream->WriteString(m_Prefix);
+        PrintFieldName("flags");
+        AP4_FormatString(val, sizeof(val), "%d", flags);
+        m_Stream->WriteString(val);
+    }
 }
 
 /*----------------------------------------------------------------------
@@ -1197,15 +1369,15 @@
 void
 AP4_JsonInspector::EndAtom()
 {
-    if (m_Items[m_Depth]) {
-        m_Stream->Write("]",1);
+    // Ending an atom with children means we need to close the children array
+    if (LastContext().m_ChildrenCount) {
+        m_Stream->WriteString("]");
     }
-    --m_Depth;
-    ++m_Items[m_Depth];
-    char prefix[256];
-    AP4_MakePrefixString(m_Depth*2, prefix, sizeof(prefix));
+
+    PopContext();
+
     m_Stream->WriteString("\n");
-    m_Stream->WriteString(prefix);
+    m_Stream->WriteString(m_Prefix);
     m_Stream->WriteString("}");
 }
 
@@ -1230,20 +1402,73 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_JsonInspector::StartArray
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::StartArray(const char* name, unsigned int /* element_count */)
+{
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    if (name) {
+        PrintFieldName(name);
+    }
+
+    m_Stream->WriteString("[\n");
+    PushContext(Context::ARRAY);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_JsonInspector::EndArray
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::EndArray()
+{
+    PopContext();
+    m_Stream->WriteString("\n");
+    m_Stream->WriteString(m_Prefix);
+    m_Stream->WriteString("]");
+}
+
+/*----------------------------------------------------------------------
+|   AP4_JsonInspector::StartObject
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::StartObject(const char* name, unsigned int /* field_count */, bool /* compact */)
+{
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    if (name) {
+        PrintFieldName(name);
+    }
+
+    m_Stream->WriteString("{\n");
+    PushContext(Context::ARRAY);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_JsonInspector::EndObject
++---------------------------------------------------------------------*/
+void
+AP4_JsonInspector::EndObject()
+{
+    PopContext();
+    m_Stream->WriteString("\n");
+    m_Stream->WriteString(m_Prefix);
+    m_Stream->WriteString("}");
+}
+
+/*----------------------------------------------------------------------
 |   AP4_JsonInspector::AddField
 +---------------------------------------------------------------------*/
 void
 AP4_JsonInspector::AddField(const char* name, const char* value, FormatHint)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Depth*2, prefix, sizeof(prefix));
-    m_Stream->WriteString(",\n");
-    m_Stream->WriteString(prefix);
-    m_Stream->Write("\"", 1);
-    m_Stream->WriteString(EscapeString(name).GetChars());
-    m_Stream->Write("\":\"", 3);
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName(name);
+    m_Stream->WriteString("\"");
     m_Stream->WriteString(EscapeString(value).GetChars());
-    m_Stream->Write("\"", 1);
+    m_Stream->WriteString("\"");
 }
 
 /*----------------------------------------------------------------------
@@ -1252,18 +1477,13 @@
 void
 AP4_JsonInspector::AddField(const char* name, AP4_UI64 value, FormatHint /* hint */)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Depth*2, prefix, sizeof(prefix));
-    m_Stream->WriteString(",\n");
-    m_Stream->WriteString(prefix);
-
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName(name);
     char str[32];
     AP4_FormatString(str, sizeof(str),
                      "%lld",
                      value);
-    m_Stream->Write("\"", 1);
-    m_Stream->WriteString(name);
-    m_Stream->Write("\":", 2);
     m_Stream->WriteString(str);
 }
 
@@ -1273,18 +1493,13 @@
 void
 AP4_JsonInspector::AddFieldF(const char* name, float value, FormatHint /*hint*/)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Depth*2, prefix, sizeof(prefix));
-    m_Stream->WriteString(",\n");
-    m_Stream->WriteString(prefix);
-
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName(name);
     char str[32];
     AP4_FormatString(str, sizeof(str),
                      "%f",
                      value);
-    m_Stream->Write("\"", 1);
-    m_Stream->WriteString(EscapeString(name).GetChars());
-    m_Stream->Write("\":", 2);
     m_Stream->WriteString(str);
 }
 
@@ -1297,24 +1512,18 @@
                             AP4_Size             byte_count,
                             FormatHint           /* hint */)
 {
-    char prefix[256];
-    AP4_MakePrefixString(m_Depth*2, prefix, sizeof(prefix));
-    m_Stream->WriteString(",\n");
-    m_Stream->WriteString(prefix);
-
-    m_Stream->Write("\"", 1);
-    m_Stream->WriteString(EscapeString(name).GetChars());
-    m_Stream->Write("\":\"", 3);
-    m_Stream->WriteString("[");
+    OnFieldAdded();
+    m_Stream->WriteString(m_Prefix);
+    PrintFieldName(name);
+    m_Stream->WriteString("\"[");
     unsigned int offset = 1;
     char byte[4];
-    for (unsigned int i=0; i<byte_count; i++) {
+    for (unsigned int i = 0; i < byte_count; i++) {
         AP4_FormatString(byte, 4, " %02x", bytes[i]);
-        m_Stream->Write(&byte[offset], 3-offset);
+        m_Stream->Write(&byte[offset], 3 - offset);
         offset = 0;
     }
-    m_Stream->Write("]", 1);
-    m_Stream->Write("\"", 1);
+    m_Stream->WriteString("]\"");
 }

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Atom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Atom.h Changed

@@ -79,9 +79,9 @@
 public:
     // types
     typedef enum {
-        HINT_NONE       = 0,
-        HINT_HEX        = 1,
-        HINT_BOOLEAN    = 2
+        HINT_NONE    = 0,
+        HINT_HEX     = 1,
+        HINT_BOOLEAN = 2
     } FormatHint;
 
     // constructor and destructor
@@ -103,7 +103,11 @@
                                  AP4_Size    /* header_size */,
                                  AP4_UI64    /*size         */) {}
     virtual void EndDescriptor() {}
-    virtual void AddField(const char* /* name */, 
+    virtual void StartArray(const char* /* name */, unsigned int element_count = 0) {}
+    virtual void EndArray() {}
+    virtual void StartObject(const char* /* name */, unsigned int field_count = 0, bool compact = false) {}
+    virtual void EndObject() {}
+    virtual void AddField(const char* /* name */,
                           AP4_UI64    /* value */, 
                           FormatHint  hint = HINT_NONE) {
         (void)hint; // gcc warning
@@ -148,15 +152,42 @@
                          AP4_Size    header_size,
                          AP4_UI64    size);
     void EndDescriptor();
+    void StartArray(const char* name, unsigned int element_count);
+    void EndArray();
+    void StartObject(const char* name, unsigned int field_count, bool compact);
+    void EndObject();
     void AddField(const char* name, AP4_UI64 value, FormatHint hint);
     void AddFieldF(const char* name, float value, FormatHint hint);
     void AddField(const char* name, const char* value, FormatHint hint);
     void AddField(const char* name, const unsigned char* bytes, AP4_Size size, FormatHint hint);
 
 private:
+    // types
+    struct Context {
+        typedef enum {
+            TOP_LEVEL,
+            ATOM,
+            ARRAY,
+            OBJECT,
+            COMPACT_OBJECT
+        } Type;
+
+        Context(Type type) : m_Type(type), m_ArrayIndex(0) {}
+
+        Type         m_Type;
+        AP4_Cardinal m_ArrayIndex;
+     };
+
+    // methods
+    void     PushContext(Context::Type type);
+    void     PopContext();
+    Context& LastContext() { return m_Contexts[m_Contexts.ItemCount() - 1]; }
+    void     PrintPrefix();
+    void     PrintSuffix();
+
     // members
-    AP4_ByteStream* m_Stream;
-    AP4_Cardinal    m_Indent;
+    AP4_ByteStream*    m_Stream;
+    AP4_Array<Context> m_Contexts;
 };
 
 /*----------------------------------------------------------------------
@@ -178,19 +209,44 @@
                          AP4_Size    header_size,
                          AP4_UI64    size);
     void EndDescriptor();
+    void StartArray(const char* name, unsigned int element_count);
+    void EndArray();
+    void StartObject(const char* name, unsigned int field_count, bool compact);
+    void EndObject();
     void AddField(const char* name, AP4_UI64 value, FormatHint hint);
     void AddFieldF(const char* name, float value, FormatHint hint);
     void AddField(const char* name, const char* value, FormatHint hint);
     void AddField(const char* name, const unsigned char* bytes, AP4_Size size, FormatHint hint);
 
 private:
+    // types
+    struct Context {
+        typedef enum {
+            TOP_LEVEL,
+            ATOM,
+            ARRAY,
+            OBJECT
+        } Type;
+
+        Context(Type type) : m_Type(type), m_FieldCount(0), m_ChildrenCount(0) {}
+
+        Type         m_Type;
+        AP4_Cardinal m_FieldCount;
+        AP4_Cardinal m_ChildrenCount; // to count atoms within atoms
+     };
+
     // methods
     static AP4_String EscapeString(const char* string);
+    void              PushContext(Context::Type type);
+    void              PopContext();
+    Context&          LastContext() { return m_Contexts[m_Contexts.ItemCount() - 1]; }
+    void              OnFieldAdded();
+    void              PrintFieldName(const char* name);
     
     // members
-    AP4_ByteStream*         m_Stream;
-    AP4_Cardinal            m_Depth;
-    AP4_Array<AP4_Cardinal> m_Items;
+    AP4_ByteStream*    m_Stream;
+    AP4_Array<Context> m_Contexts;
+    char               m_Prefix[256];
 };
 
 /*----------------------------------------------------------------------
@@ -246,6 +302,8 @@
     // methods
     AP4_UI32           GetFlags() const { return m_Flags; }
     void               SetFlags(AP4_UI32 flags) { m_Flags = flags; }
+    AP4_UI08           GetVersion() const {return m_Version;}
+    void               SetVersion(AP4_UI08 version) { m_Version = version; }
     Type               GetType() const { return m_Type; }
     void               SetType(Type type) { m_Type = type; }
     virtual AP4_Size   GetHeaderSize() const;
@@ -427,6 +485,7 @@
 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_AV01 = AP4_ATOM_TYPE('a','v','0','1');
 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');
@@ -488,8 +547,10 @@
 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_DVVC = AP4_ATOM_TYPE('d','v','v','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_AV1C = AP4_ATOM_TYPE('a','v','1','C');
 const AP4_Atom::Type AP4_ATOM_TYPE_WAVE = AP4_ATOM_TYPE('w','a','v','e');
 const AP4_Atom::Type AP4_ATOM_TYPE_WIDE = AP4_ATOM_TYPE('w','i','d','e');
 const AP4_Atom::Type AP4_ATOM_TYPE_UUID = AP4_ATOM_TYPE('u','u','i','d');

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4AtomFactory.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4AtomFactory.cpp Changed

@@ -87,6 +87,7 @@
 #include "Ap4HvccAtom.h"
 #include "Ap4DvccAtom.h"
 #include "Ap4VpccAtom.h"
+#include "Ap4Av1cAtom.h"
 #include "Ap4Marlin.h"
 #include "Ap48bdlAtom.h"
 #include "Ap4Piff.h"
@@ -325,10 +326,23 @@
             atom = new AP4_HevcSampleEntry(type, size_32, stream, *this);
             break;
 
-          case AP4_ATOM_TYPE_ALAC:
+          case AP4_ATOM_TYPE_AV01:
+            atom = new AP4_Av1SampleEntry(type, size_32, stream, *this);
+            break;
+
           case AP4_ATOM_TYPE_AC_3:
+            atom = new AP4_Ac3SampleEntry(type, size_32, stream, *this);
+            break;
+
           case AP4_ATOM_TYPE_EC_3:
+            atom = new AP4_Eac3SampleEntry(type, size_32, stream, *this);
+            break;
+
           case AP4_ATOM_TYPE_AC_4:
+            atom = new AP4_Ac4SampleEntry(type, size_32, stream, *this);
+            break;
+
+          case AP4_ATOM_TYPE_ALAC:
           case AP4_ATOM_TYPE_DTSC:
           case AP4_ATOM_TYPE_DTSH:
           case AP4_ATOM_TYPE_DTSL:
@@ -505,6 +519,7 @@
             break;
 
           case AP4_ATOM_TYPE_DVCC:
+          case AP4_ATOM_TYPE_DVVC:
             if (atom_is_large) return AP4_ERROR_INVALID_FORMAT;
             atom = AP4_DvccAtom::Create(size_32, stream);
             break;
@@ -514,6 +529,11 @@
             atom = AP4_VpccAtom::Create(size_32, stream);
             break;
 
+          case AP4_ATOM_TYPE_AV1C:
+            if (atom_is_large) return AP4_ERROR_INVALID_FORMAT;
+            atom = AP4_Av1cAtom::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);

bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Av1cAtom.cpp Added

@@ -0,0 +1,216 @@
+/*****************************************************************
+|
+|    AP4 - avcC Atoms 
+|
+|    Copyright 2002-2008 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 "Ap4Av1cAtom.h"
+#include "Ap4AtomFactory.h"
+#include "Ap4Utils.h"
+#include "Ap4Types.h"
+
+/*----------------------------------------------------------------------
+|   dynamic cast support
++---------------------------------------------------------------------*/
+AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_Av1cAtom)
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom::GetProfileName
++---------------------------------------------------------------------*/
+const char*
+AP4_Av1cAtom::GetProfileName(AP4_UI08 profile)
+{
+    switch (profile) {
+        case AP4_AV1_PROFILE_MAIN:         return "Main";
+        case AP4_AV1_PROFILE_HIGH:         return "High";
+        case AP4_AV1_PROFILE_PROFESSIONAL: return "Professional";
+        default:                           return NULL;
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom::Create
++---------------------------------------------------------------------*/
+AP4_Av1cAtom*
+AP4_Av1cAtom::Create(AP4_Size size, AP4_ByteStream& stream)
+{
+    unsigned int payload_size = size-AP4_ATOM_HEADER_SIZE;
+    if (payload_size < 4) {
+        return NULL;
+    }
+    AP4_UI08 bits[4];
+    AP4_Result result = stream.Read(bits, 4);
+    if (AP4_FAILED(result)) {
+        return NULL;
+    }
+    AP4_UI08 version                            = bits[0] & 0x7F;
+    AP4_UI08 seq_profile                        = bits[1] >> 5;
+    AP4_UI08 seq_level_idx_0                    = bits[1] & 0x1F;
+    AP4_UI08 seq_tier_0                         = (bits[2] >> 7) & 1;
+    AP4_UI08 high_bitdepth                      = (bits[2] >> 6) & 1;
+    AP4_UI08 twelve_bit                         = (bits[2] >> 5) & 1;
+    AP4_UI08 monochrome                         = (bits[2] >> 4) & 1;
+    AP4_UI08 chroma_subsampling_x               = (bits[2] >> 3) & 1;
+    AP4_UI08 chroma_subsampling_y               = (bits[2] >> 2) & 1;
+    AP4_UI08 chroma_sample_position             = (bits[2]     ) & 3;
+    AP4_UI08 initial_presentation_delay_present = (bits[3] >> 4) & 1;
+    AP4_UI08 initial_presentation_delay_minus_one;
+    if (initial_presentation_delay_present) {
+        initial_presentation_delay_minus_one = (bits[3] >> 4) & 0x0F;
+    } else {
+        initial_presentation_delay_minus_one = 0;
+    }
+    
+    AP4_DataBuffer config_obus;
+    if (payload_size > 4) {
+        config_obus.SetDataSize(payload_size - 4);
+        result = stream.Read(config_obus.UseData(), payload_size - 4);
+        if (AP4_FAILED(result)) {
+            return NULL;
+        }
+    }
+    return new AP4_Av1cAtom(version,
+                            seq_profile,
+                            seq_level_idx_0,
+                            seq_tier_0,
+                            high_bitdepth,
+                            twelve_bit,
+                            monochrome,
+                            chroma_subsampling_x,
+                            chroma_subsampling_y,
+                            chroma_sample_position,
+                            initial_presentation_delay_present,
+                            initial_presentation_delay_minus_one,
+                            config_obus.GetData(),
+                            config_obus.GetDataSize());
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom::AP4_Av1cAtom
++---------------------------------------------------------------------*/
+AP4_Av1cAtom::AP4_Av1cAtom() :
+    AP4_Atom(AP4_ATOM_TYPE_AV1C, AP4_ATOM_HEADER_SIZE),
+    m_Version(1),
+    m_SeqProfile(0),
+    m_SeqLevelIdx0(0),
+    m_SeqTier0(0),
+    m_HighBitDepth(0),
+    m_TwelveBit(0),
+    m_Monochrome(0),
+    m_ChromaSubsamplingX(0),
+    m_ChromaSubsamplingY(0),
+    m_ChromaSamplePosition(0),
+    m_InitialPresentationDelayPresent(0),
+    m_InitialPresentationDelayMinusOne(0)
+{
+    m_Size32 += 4;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom::AP4_Av1cAtom
++---------------------------------------------------------------------*/
+AP4_Av1cAtom::AP4_Av1cAtom(AP4_UI08        version,
+                           AP4_UI08        seq_profile,
+                           AP4_UI08        seq_level_idx_0,
+                           AP4_UI08        seq_tier_0,
+                           AP4_UI08        high_bitdepth,
+                           AP4_UI08        twelve_bit,
+                           AP4_UI08        monochrome,
+                           AP4_UI08        chroma_subsampling_x,
+                           AP4_UI08        chroma_subsampling_y,
+                           AP4_UI08        chroma_sample_position,
+                           AP4_UI08        initial_presentation_delay_present,
+                           AP4_UI08        initial_presentation_delay_minus_one,
+                           const AP4_UI08* config_obus,
+                           AP4_Size        config_obus_size) :
+    AP4_Atom(AP4_ATOM_TYPE_AV1C, AP4_ATOM_HEADER_SIZE),
+    m_Version(version),
+    m_SeqProfile(seq_profile),
+    m_SeqLevelIdx0(seq_level_idx_0),
+    m_SeqTier0(seq_tier_0),
+    m_HighBitDepth(high_bitdepth),
+    m_TwelveBit(twelve_bit),
+    m_Monochrome(monochrome),
+    m_ChromaSubsamplingX(chroma_subsampling_x),
+    m_ChromaSubsamplingY(chroma_subsampling_y),
+    m_ChromaSamplePosition(chroma_sample_position),
+    m_InitialPresentationDelayPresent(initial_presentation_delay_present),
+    m_InitialPresentationDelayMinusOne(initial_presentation_delay_minus_one)
+{
+    m_Size32 += 4 + config_obus_size;
+    if (config_obus && config_obus_size) {
+        m_ConfigObus.SetData(config_obus, config_obus_size);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom::WriteFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Av1cAtom::WriteFields(AP4_ByteStream& stream)
+{
+    AP4_UI08 bits[4];
+    bits[0] = (1 << 7) | m_Version;
+    bits[1] = (m_SeqProfile << 5) | m_SeqLevelIdx0;
+    bits[2] = (m_SeqTier0           << 7) |
+              (m_HighBitDepth       << 6) |
+              (m_TwelveBit          << 5) |
+              (m_Monochrome         << 4) |
+              (m_ChromaSubsamplingX << 3) |
+              (m_ChromaSubsamplingY << 2) |
+              (m_ChromaSamplePosition   );
+    bits[3] = (m_InitialPresentationDelayPresent << 4) | m_InitialPresentationDelayMinusOne;
+    AP4_Result result = stream.Write(bits, 4);
+    if (AP4_FAILED(result)) return result;
+    if (m_ConfigObus.GetDataSize()) {
+        result = stream.Write(m_ConfigObus.GetData(), m_ConfigObus.GetDataSize());
+        if (AP4_FAILED(result)) return result;
+    }
+    
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom::InspectFields
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Av1cAtom::InspectFields(AP4_AtomInspector& inspector)
+{
+    inspector.AddField("version",                    m_Version);
+    inspector.AddField("seq_profile",                m_SeqProfile);
+    inspector.AddField("seq_level_idx_0",            m_SeqLevelIdx0);
+    inspector.AddField("seq_tier_0",                 m_SeqTier0);
+    inspector.AddField("high_bitdepth",              m_HighBitDepth);
+    inspector.AddField("twelve_bit",                 m_TwelveBit);
+    inspector.AddField("monochrome",                 m_Monochrome);
+    inspector.AddField("chroma_subsampling_x",       m_ChromaSubsamplingX);
+    inspector.AddField("chroma_subsampling_y",       m_ChromaSubsamplingY);
+    inspector.AddField("chroma_sample_position",     m_ChromaSamplePosition);
+    inspector.AddField("initial_presentation_delay", m_InitialPresentationDelayPresent ? m_InitialPresentationDelayMinusOne + 1 : 0);
+    return AP4_SUCCESS;
+}

bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Av1cAtom.h Added

@@ -0,0 +1,112 @@
+/*****************************************************************
+|
+|    AP4 - av1C Atoms
+|
+|    Copyright 2002-2008 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_AV1C_ATOM_H_
+#define _AP4_AV1C_ATOM_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Ap4Atom.h"
+#include "Ap4Array.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+const AP4_UI08 AP4_AV1_PROFILE_MAIN         = 0;
+const AP4_UI08 AP4_AV1_PROFILE_HIGH         = 1;
+const AP4_UI08 AP4_AV1_PROFILE_PROFESSIONAL = 2;
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cAtom
++---------------------------------------------------------------------*/
+class AP4_Av1cAtom : public AP4_Atom
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D(AP4_Av1cAtom, AP4_Atom)
+
+    // class methods
+    static AP4_Av1cAtom* Create(AP4_Size size, AP4_ByteStream& stream);
+    static const char*   GetProfileName(AP4_UI08 profile);
+
+    // constructors
+    AP4_Av1cAtom(AP4_UI08        version,
+                 AP4_UI08        seq_profile,
+                 AP4_UI08        seq_level_idx_0,
+                 AP4_UI08        seq_tier_0,
+                 AP4_UI08        high_bitdepth,
+                 AP4_UI08        twelve_bit,
+                 AP4_UI08        monochrome,
+                 AP4_UI08        chroma_subsampling_x,
+                 AP4_UI08        chroma_subsampling_y,
+                 AP4_UI08        chroma_sample_position,
+                 AP4_UI08        initial_presentation_delay_present,
+                 AP4_UI08        initial_presentation_delay_minus_one,
+                 const AP4_UI08* config_obus,
+                 AP4_Size        config_obus_size);
+    AP4_Av1cAtom();
+    
+    // methods
+    virtual AP4_Result InspectFields(AP4_AtomInspector& inspector);
+    virtual AP4_Result WriteFields(AP4_ByteStream& stream);
+
+    // accessors
+    AP4_UI08 GetSeqProfile()                       const { return m_SeqProfile; }
+    AP4_UI08 GetSeqLevelIdx0()                     const { return m_SeqLevelIdx0; }
+    AP4_UI08 GetSeqTier0()                         const { return m_SeqTier0; }
+    AP4_UI08 GetHighBitDepth()                     const { return m_HighBitDepth; }
+    AP4_UI08 GetTwelveBit()                        const { return m_TwelveBit; }
+    AP4_UI08 GetMonochrome()                       const { return m_Monochrome; }
+    AP4_UI08 GetChromaSubsamplingX()               const { return m_ChromaSubsamplingX; }
+    AP4_UI08 GetChromaSubsamplingY()               const { return m_ChromaSubsamplingY; }
+    AP4_UI08 GetChromaSamplePosition()             const { return m_ChromaSamplePosition; }
+    AP4_UI08 GetInitialPresentationDelayPresent()  const { return m_InitialPresentationDelayPresent; }
+    AP4_UI08 GetInitialPresentationDelayMinusOne() const { return m_InitialPresentationDelayMinusOne; }
+    const AP4_DataBuffer& GetConfigObus()          const { return m_ConfigObus; }
+    
+private:
+    // methods
+    AP4_Av1cAtom(AP4_UI32 size, const AP4_UI08* payload);
+    
+    // members
+    AP4_UI08       m_Version;
+    AP4_UI08       m_SeqProfile;
+    AP4_UI08       m_SeqLevelIdx0;
+    AP4_UI08       m_SeqTier0;
+    AP4_UI08       m_HighBitDepth;
+    AP4_UI08       m_TwelveBit;
+    AP4_UI08       m_Monochrome;
+    AP4_UI08       m_ChromaSubsamplingX;
+    AP4_UI08       m_ChromaSubsamplingY;
+    AP4_UI08       m_ChromaSamplePosition;
+    AP4_UI08       m_InitialPresentationDelayPresent;
+    AP4_UI08       m_InitialPresentationDelayMinusOne;
+    AP4_DataBuffer m_ConfigObus;
+};
+
+#endif // _AP4_AV1C_ATOM_H_

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4AvccAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4AvccAtom.cpp Changed

@@ -104,7 +104,10 @@
     m_Profile(0),
     m_Level(0),
     m_ProfileCompatibility(0),
-    m_NaluLengthSize(0)
+    m_NaluLengthSize(0),
+    m_ChromaFormat(0),
+    m_BitDepthLumaMinus8(0),
+    m_BitDepthChromaMinus8(0)
 {
     UpdateRawBytes();
     m_Size32 += m_RawBytes.GetDataSize();
@@ -184,7 +187,10 @@
 AP4_AvccAtom::AP4_AvccAtom(AP4_UI08                         profile, 
                            AP4_UI08                         level, 
                            AP4_UI08                         profile_compatibility, 
-                           AP4_UI08                         length_size, 
+                           AP4_UI08                         length_size,
+                           AP4_UI08                         chroma_format,
+                           AP4_UI08                         bit_depth_luma_minus8,
+                           AP4_UI08                         bit_depth_chroma_minus8,
                            const AP4_Array<AP4_DataBuffer>& sequence_parameters, 
                            const AP4_Array<AP4_DataBuffer>& picture_parameters) :
     AP4_Atom(AP4_ATOM_TYPE_AVCC, AP4_ATOM_HEADER_SIZE),
@@ -192,7 +198,10 @@
     m_Profile(profile),
     m_Level(level),
     m_ProfileCompatibility(profile_compatibility),
-    m_NaluLengthSize(length_size)
+    m_NaluLengthSize(length_size),
+    m_ChromaFormat(chroma_format),
+    m_BitDepthLumaMinus8(bit_depth_luma_minus8),
+    m_BitDepthChromaMinus8(bit_depth_chroma_minus8)
 {
     // deep copy of the parameters
     unsigned int i = 0;
@@ -225,6 +234,12 @@
     for (unsigned int i=0; i<m_PictureParameters.ItemCount(); i++) {
         payload_size += 2+m_PictureParameters[i].GetDataSize();
     }
+
+    if ((m_Profile == AP4_AVC_PROFILE_HIGH) || (m_Profile == AP4_AVC_PROFILE_HIGH_10) || 
+        (m_Profile == AP4_AVC_PROFILE_HIGH_422) || (m_Profile == AP4_AVC_PROFILE_HIGH_444)) {
+            payload_size += 4;
+    }
+
     m_RawBytes.SetDataSize(payload_size);
     AP4_UI08* payload = m_RawBytes.UseData();
 
@@ -250,6 +265,13 @@
         AP4_CopyMemory(&payload[cursor], m_PictureParameters[i].GetData(), param_length);
         cursor += param_length;
     }
+    if ((m_Profile == AP4_AVC_PROFILE_HIGH) || (m_Profile == AP4_AVC_PROFILE_HIGH_10) || 
+        (m_Profile == AP4_AVC_PROFILE_HIGH_422) || (m_Profile == AP4_AVC_PROFILE_HIGH_444)) {
+        payload[cursor++] = 0xfc | (0x03 & m_ChromaFormat);
+        payload[cursor++] = 0xf8 | (0x07 & m_BitDepthLumaMinus8);
+        payload[cursor++] = 0xf8 | (0x07 & m_BitDepthChromaMinus8);
+        payload[cursor] = 0;
+    }
 }
 
 /*----------------------------------------------------------------------

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4AvccAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4AvccAtom.h Changed

@@ -65,6 +65,9 @@
                  AP4_UI08 level,
                  AP4_UI08 profile_compatibility,
                  AP4_UI08 length_size,
+                 AP4_UI08 chroma_format,
+                 AP4_UI08 bit_depth_luma_minus8,
+                 AP4_UI08 bit_depth_chroma_minus8,
                  const AP4_Array<AP4_DataBuffer>& sequence_parameters,
                  const AP4_Array<AP4_DataBuffer>& picture_parameters);
     AP4_AvccAtom(const AP4_AvccAtom& other); // copy construtor
@@ -82,6 +85,9 @@
     AP4_Array<AP4_DataBuffer>& GetSequenceParameters() { return m_SequenceParameters; }
     AP4_Array<AP4_DataBuffer>& GetPictureParameters()  { return m_PictureParameters; }
     const AP4_DataBuffer& GetRawBytes() const { return m_RawBytes; }
+    AP4_UI08 GetChromaFormat() const         { return m_ChromaFormat; }
+    AP4_UI08 GetBitDepthLumaMinus8() const   { return m_BitDepthLumaMinus8; }
+    AP4_UI08 GetBitDepthChromaMinus8() const { return m_BitDepthChromaMinus8; }
 
 private:
     // methods
@@ -94,6 +100,9 @@
     AP4_UI08                  m_Level;
     AP4_UI08                  m_ProfileCompatibility;
     AP4_UI08                  m_NaluLengthSize;
+    AP4_UI08                  m_ChromaFormat;
+    AP4_UI08                  m_BitDepthLumaMinus8;
+    AP4_UI08                  m_BitDepthChromaMinus8;
     AP4_Array<AP4_DataBuffer> m_SequenceParameters;
     AP4_Array<AP4_DataBuffer> m_PictureParameters;
     AP4_DataBuffer            m_RawBytes;

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4ByteStream.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4ByteStream.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Co64Atom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Co64Atom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4CommonEncryption.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4CommonEncryption.cpp Changed

@@ -3465,27 +3465,31 @@
         }
     }
     inspector.AddField("IV Size (inferred)", iv_size);
-    
+
+    inspector.StartArray("sample info entries", m_SampleInfoCount);
     const AP4_UI08* info = m_SampleInfos.GetData();
     for (unsigned int i=0; i<m_SampleInfoCount; i++) {
-        char header[64];
-        AP4_FormatString(header, sizeof(header), "entry %04d", i);
-        inspector.AddField(header, info, iv_size);
+        inspector.StartObject(NULL);
+        inspector.AddField("info", info, iv_size);
         info += iv_size;
         if (m_Outer.GetFlags() & AP4_CENC_SAMPLE_ENCRYPTION_FLAG_USE_SUB_SAMPLE_ENCRYPTION) {
             unsigned int num_entries = AP4_BytesToInt16BE(info);
             info += 2;
+            inspector.StartArray("sub entries", num_entries);
             for (unsigned int j=0; j<num_entries; j++) {
+                inspector.StartObject(NULL, 2, true);
                 unsigned int bocd = AP4_BytesToUInt16BE(info);
-                AP4_FormatString(header, sizeof(header), "sub-entry %04d.%d bytes of clear data", i, j);
-                inspector.AddField(header, bocd);
+                inspector.AddField("bytes_of_clear_data", bocd);
                 unsigned int boed = AP4_BytesToUInt32BE(info+2);
-                AP4_FormatString(header, sizeof(header), "sub-entry %04d.%d bytes of encrypted data", i, j);
-                inspector.AddField(header, boed);
+                inspector.AddField("bytes_of_encrypted_data", boed);
                 info += 6;
+                inspector.EndObject();
             }
-        }        
+            inspector.EndArray();
+        }
+        inspector.EndObject();
     }
+    inspector.EndArray();
 
     return AP4_SUCCESS;
 }

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4CttsAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4CttsAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Dac3Atom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Dac3Atom.cpp Changed

@@ -59,6 +59,36 @@
 /*----------------------------------------------------------------------
 |   AP4_Dac3Atom::AP4_Dac3Atom
 +---------------------------------------------------------------------*/
+AP4_Dac3Atom::AP4_Dac3Atom(const AP4_Dac3Atom& other):
+    AP4_Atom(AP4_ATOM_TYPE_DAC3, other.m_Size32),
+    m_DataRate(other.m_DataRate),
+    m_StreamInfo(other.m_StreamInfo),
+    m_RawBytes(other.m_RawBytes)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac3Atom::AP4_Dac3Atom
++---------------------------------------------------------------------*/
+AP4_Dac3Atom::AP4_Dac3Atom(const StreamInfo* m_StreamInfo):
+    AP4_Atom(AP4_ATOM_TYPE_DAC3, AP4_ATOM_HEADER_SIZE){
+    AP4_BitWriter bits(3);
+    
+    bits.Write(m_StreamInfo->fscod, 2);
+    bits.Write(m_StreamInfo->bsid, 5);
+    bits.Write(m_StreamInfo->bsmod, 3);
+    bits.Write(m_StreamInfo->acmod, 3);
+    bits.Write(m_StreamInfo->lfeon, 1);
+    bits.Write(m_StreamInfo->bit_rate_code, 5);
+    bits.Write(0, 5);  // reserved 
+    
+    m_RawBytes.SetData(bits.GetData(), bits.GetBitCount() / 8);
+    m_Size32 += m_RawBytes.GetDataSize();
+}
+
+/*----------------------------------------------------------------------
+|   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)

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Dac3Atom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Dac3Atom.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Dac4Atom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Dac4Atom.cpp Changed

@@ -34,6 +34,8 @@
 #include "Ap4Utils.h"
 #include "Ap4Types.h"
 
+#include <cmath>
+
 /*----------------------------------------------------------------------
 |   dynamic cast support
 +---------------------------------------------------------------------*/
@@ -59,6 +61,89 @@
 /*----------------------------------------------------------------------
 |   AP4_Dac4Atom::AP4_Dac4Atom
 +---------------------------------------------------------------------*/
+AP4_Dac4Atom::AP4_Dac4Atom(AP4_UI32 size, const Ac4Dsi* ac4Dsi):
+    AP4_Atom(AP4_ATOM_TYPE_DAC4, AP4_ATOM_HEADER_SIZE){
+    AP4_BitWriter bits(size);
+    bits.Write(ac4Dsi->ac4_dsi_version, 3);
+    bits.Write(ac4Dsi->d.v1.bitstream_version, 7);
+    bits.Write(ac4Dsi->d.v1.fs_index, 1);
+    bits.Write(ac4Dsi->d.v1.frame_rate_index, 4);
+
+    // IMS presentation shall has the legacy presentation
+    unsigned int add_n_presentations = 0;
+    for (unsigned int idx = 0; idx < ac4Dsi->d.v1.n_presentations; idx++){
+        if (ac4Dsi->d.v1.presentations[idx].presentation_version == 2) { 
+            add_n_presentations++; 
+        }
+    }
+    
+    // Assume the total presentation numbers is less than 512 after adding legacy presentation
+    bits.Write(ac4Dsi->d.v1.n_presentations + add_n_presentations, 9);
+
+    if (ac4Dsi->d.v1.bitstream_version > 1){
+        bits.Write(ac4Dsi->d.v1.b_program_id, 1);
+        if (ac4Dsi->d.v1.b_program_id == 1){
+            bits.Write(ac4Dsi->d.v1.short_program_id, 16);
+            bits.Write(ac4Dsi->d.v1.b_uuid, 1);
+            if (ac4Dsi->d.v1.b_uuid == 1) {
+                for (unsigned int idx = 0; idx < 16; idx ++) {
+                    bits.Write(ac4Dsi->d.v1.program_uuid[idx], 8);
+                }
+            }
+        }
+    }
+    // ac4_bitrate_dsi()
+    AP4_Dac4Atom::Ac4Dsi::Ac4BitrateDsi ac4_bitrate_dsi = ac4Dsi->d.v1.ac4_bitrate_dsi;
+    ac4_bitrate_dsi.WriteBitrateDsi(bits);
+
+    AP4_ByteAlign(bits);
+    for (unsigned int idx = 0; idx < ac4Dsi->d.v1.n_presentations; idx ++) {
+        unsigned int default_pres_bytes = 36;   // random value
+        AP4_Dac4Atom::Ac4Dsi::PresentationV1 &presentation = ac4Dsi->d.v1.presentations[idx];
+        bits.Write(presentation.presentation_version, 8);
+        bits.Write(default_pres_bytes, 8);      // pres_bytes, need to be updated later
+        //TODO: if (pres_bytes == 255), shall not happen now. Need the memory move function for bits
+        unsigned int pres_bytes_idx = bits.GetBitCount() / 8 - 1;
+        if (ac4Dsi->d.v1.n_presentations != 1 && presentation.d.v1.b_presentation_id == 0 && presentation.d.v1.b_extended_presentation_id == 0) {
+            fprintf(stderr, "WARN: Need presentation_id for multiple presnetaion signal. The presentation of Presentation Index (PI) is %d miss presentation_id.\n", idx + 1);
+        }
+        if (presentation.presentation_version == 0){
+            // TODO: support presentation version = 0
+        }else if (presentation.presentation_version == 1 || presentation.presentation_version == 2){
+            presentation.WritePresentationV1Dsi(bits);
+            Ap4_Ac4UpdatePresBytes(bits.GetData(), pres_bytes_idx, bits.GetBitCount()/8 - pres_bytes_idx - 1);
+        } else {
+            Ap4_Ac4UpdatePresBytes(bits.GetData(), pres_bytes_idx, 0);
+        }
+
+        //legacy presentation for IMS
+        if (presentation.presentation_version == 2) {
+            AP4_Dac4Atom::Ac4Dsi::PresentationV1 legacy_presentation = presentation;
+            if (legacy_presentation.d.v1.b_presentation_id == 0 && legacy_presentation.d.v1.b_extended_presentation_id == 0) {
+                fprintf(stderr, "WARN: Need presentation_id for IMS signal.\n");
+            }
+            legacy_presentation.presentation_version = 1;
+            legacy_presentation.d.v1.b_pre_virtualized = 0;
+            legacy_presentation.d.v1.dolby_atmos_indicator = 0;
+
+            bits.Write(legacy_presentation.presentation_version, 8);
+            bits.Write(default_pres_bytes, 8);    // pres_bytes, need to be updated later
+            //TODO: if (pres_bytes == 255), shall not happen now
+            unsigned int pres_bytes_idx = bits.GetBitCount() / 8 - 1;
+            legacy_presentation.WritePresentationV1Dsi(bits);
+            Ap4_Ac4UpdatePresBytes(bits.GetData(), pres_bytes_idx, bits.GetBitCount()/8 - pres_bytes_idx - 1);
+        }
+    }
+    m_RawBytes.SetData(bits.GetData(), bits.GetBitCount() / 8);
+    m_Size32 += m_RawBytes.GetDataSize();
+    // clear the DSI
+    AP4_SetMemory(&m_Dsi, 0, sizeof(m_Dsi));
+    m_Dsi.ac4_dsi_version = -1;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::AP4_Dac4Atom
++---------------------------------------------------------------------*/
 AP4_Dac4Atom::AP4_Dac4Atom(AP4_UI32 size, const AP4_UI08* payload) :
     AP4_Atom(AP4_ATOM_TYPE_DAC4, size)
 {
@@ -112,13 +197,13 @@
         AP4_SetMemory(m_Dsi.d.v1.presentations, 0, m_Dsi.d.v1.n_presentations * sizeof(m_Dsi.d.v1.presentations[0]));
         for (unsigned int i = 0; i < m_Dsi.d.v1.n_presentations; i++) {
             Ac4Dsi::PresentationV1& presentation = m_Dsi.d.v1.presentations[i];
-            unsigned int bits_read_before_presentation = bits.GetBitsRead();
             
             presentation.presentation_version = bits.ReadBits(8);
             unsigned int pres_bytes           = bits.ReadBits(8);
             if (pres_bytes == 255) {
                 pres_bytes += bits.ReadBits(16);
             }
+            unsigned int bits_read_before_presentation = bits.GetBitsRead();
             if (presentation.presentation_version == 0) {
                 presentation.d.v0.presentation_config = bits.ReadBits(5);
                 //bool b_add_emdf_substreams = false;
@@ -126,8 +211,8 @@
                     //b_add_emdf_substreams = true;
                 } else {
                     presentation.d.v0.mdcompat = bits.ReadBits(3);
-                    if (bits.ReadBit()) { // b_presentation_group_index
-                        presentation.d.v0.presentation_group_index = bits.ReadBits(5);
+                    if (bits.ReadBit()) { // b_presentation_id
+                        presentation.d.v0.presentation_id = bits.ReadBits(5);
                     }
                     presentation.d.v0.dsi_frame_rate_multiply_info = bits.ReadBits(2);
                     presentation.d.v0.presentation_emdf_version    = bits.ReadBits(5);
@@ -135,15 +220,18 @@
                     presentation.d.v0.presentation_channel_mask    = bits.ReadBits(24);
                 }
                 // some fields skipped
-            } else if (presentation.presentation_version == 1) {
+                if (bits.GetBitsRead() % 8) {
+                    bits.SkipBits(8 - (bits.GetBitsRead() % 8));
+                }
+            } else if (presentation.presentation_version == 1 || presentation.presentation_version == 2) {
                 presentation.d.v1.presentation_config_v1 = bits.ReadBits(5);
-                //bool b_add_emdf_substreams = false;
                 if (presentation.d.v1.presentation_config_v1 == 0x06) {
-                    //b_add_emdf_substreams = true;
+                    presentation.d.v1.b_add_emdf_substreams = 1;
                 } else {
                     presentation.d.v1.mdcompat = bits.ReadBits(3);
-                    if (bits.ReadBit()) { // b_presentation_group_index
-                        presentation.d.v1.presentation_group_index = bits.ReadBits(5);
+                    presentation.d.v1.b_presentation_id = bits.ReadBit();
+                    if (presentation.d.v1.b_presentation_id) { 
+                        presentation.d.v1.presentation_id = bits.ReadBits(5);
                     }
                     presentation.d.v1.dsi_frame_rate_multiply_info = bits.ReadBits(2);
                     presentation.d.v1.dsi_frame_rate_fraction_info = bits.ReadBits(2);
@@ -160,12 +248,146 @@
                             presentation.d.v1.pres_top_channel_pairs         = bits.ReadBits(2);
                         }
                         presentation.d.v1.presentation_channel_mask_v1 = bits.ReadBits(24);
+                    }else {
+                        presentation.d.v1.presentation_channel_mask_v1 = 0x800000;
+                    }
+                    presentation.d.v1.b_presentation_core_differs = bits.ReadBit();
+                    if (presentation.d.v1.b_presentation_core_differs) {
+                        presentation.d.v1.b_presentation_core_channel_coded = bits.ReadBit();
+                        if (presentation.d.v1.b_presentation_core_channel_coded) {
+                            presentation.d.v1.dsi_presentation_channel_mode_core = bits.ReadBits(2);
+                        }
                     }
+                    presentation.d.v1.b_presentation_filter = bits.ReadBit();
+                    if (presentation.d.v1.b_presentation_filter) {
+                        presentation.d.v1.b_enable_presentation = bits.ReadBit();
+                        presentation.d.v1.n_filter_bytes = bits.ReadBits(8);
+                        for (int idx = 0; idx < presentation.d.v1.n_filter_bytes; idx ++) { bits.SkipBits(8); }
+                    }
+                    bool parse_substream_groups = true;
+                    if (presentation.d.v1.presentation_config_v1 == 0x1f){
+                        presentation.d.v1.n_substream_groups = 1;
+                    } else {
+                        presentation.d.v1.b_multi_pid = bits.ReadBit();
+                        switch (presentation.d.v1.presentation_config_v1){
+                            case 0:
+                            case 1:
+                            case 2:
+                                presentation.d.v1.n_substream_groups = 2;
+                                break;
+                            case 3:
+                            case 4:
+                                presentation.d.v1.n_substream_groups = 3;
+                                break;
+                            case 5:
+                                presentation.d.v1.n_substream_groups =  bits.ReadBits(3) + 2;
+                                break;
+                            default:
+                                parse_substream_groups = false;
+                                presentation.d.v1.n_skip_bytes = bits.ReadBits(7);
+                                for (int idx = 0; idx < presentation.d.v1.n_skip_bytes; idx ++) { bits.SkipBits(8); }
+                        }
+                        
+                    }
+                    // Start to parse substream_groups
+                    if (parse_substream_groups) {
+                        presentation.d.v1.substream_groups = new Ac4Dsi::SubStreamGroupV1[presentation.d.v1.n_substream_groups];
+                        AP4_SetMemory(presentation.d.v1.substream_groups, 0, presentation.d.v1.n_substream_groups * sizeof(presentation.d.v1.substream_groups[0]));
+                        for (int cnt = 0; cnt < presentation.d.v1.n_substream_groups; cnt ++){
+                             Ac4Dsi::SubStreamGroupV1& substreamgroup = presentation.d.v1.substream_groups[cnt];
+                             substreamgroup.d.v1.b_substreams_present = bits.ReadBit();
+                             substreamgroup.d.v1.b_hsf_ext            = bits.ReadBit();
+                             substreamgroup.d.v1.b_channel_coded      = bits.ReadBit();
+                             substreamgroup.d.v1.n_substreams         = bits.ReadBits(8);
+
+                             substreamgroup.d.v1.substreams = new Ac4Dsi::SubStream[substreamgroup.d.v1.n_substreams];
+                             AP4_SetMemory(substreamgroup.d.v1.substreams, 0, substreamgroup.d.v1.n_substreams * sizeof(substreamgroup.d.v1.substreams[0]));
+                             for (int sus = 0; sus < substreamgroup.d.v1.n_substreams; sus ++){
+                                 Ac4Dsi::SubStream& substream = substreamgroup.d.v1.substreams[sus];
+                                 substream.dsi_sf_multiplier = bits.ReadBits(2);
+                                 substream.b_substream_bitrate_indicator = bits.ReadBit();
+                                 if (substream.b_substream_bitrate_indicator) {
+                                    substream.substream_bitrate_indicator = bits.ReadBits(5);
+                                 }
+                                 if (substreamgroup.d.v1.b_channel_coded){
+                                    substream.dsi_substream_channel_mask = bits.ReadBits(24);
+                                 } else {
+                                    substream.b_ajoc = bits.ReadBit();
+                                    if (substream.b_ajoc) {
+                                        substream.b_static_dmx = bits.ReadBit();
+                                        if (substream.b_static_dmx == 0) {
+                                            substream.n_dmx_objects_minus1 = bits.ReadBits(4);
+                                        }
+                                        substream.n_umx_objects_minus1 = bits.ReadBits(6);
+                                    }
+                                    substream.b_substream_contains_bed_objects = bits.ReadBit();
+                                    substream.b_substream_contains_dynamic_objects = bits.ReadBit();
+                                    substream.b_substream_contains_ISF_objects = bits.ReadBit();
+                                    bits.SkipBit(); // reserved
+                                }
+                             }
+                             substreamgroup.d.v1.b_content_type = bits.ReadBit();
+                             if (substreamgroup.d.v1.b_content_type) {
+                                 substreamgroup.d.v1.content_classifier = bits.ReadBits(3);
+                                 substreamgroup.d.v1.b_language_indicator = bits.ReadBit();
+                                 if (substreamgroup.d.v1.b_language_indicator) {
+                                     substreamgroup.d.v1.n_language_tag_bytes = bits.ReadBits(6);
+                                     for (int l = 0; l < substreamgroup.d.v1.n_language_tag_bytes; l++) {
+                                         substreamgroup.d.v1.language_tag_bytes[l] = bits.ReadBits(8);
+                                     }
+                                 }
+                             }
+                        }
+                    }
+                    presentation.d.v1.b_pre_virtualized = bits.ReadBit();
+                    presentation.d.v1.b_add_emdf_substreams = bits.ReadBit();
+                }
+                if (presentation.d.v1.b_add_emdf_substreams) {
+                    presentation.d.v1.n_add_emdf_substreams = bits.ReadBits(7);
+                    for (int j = 0; j < presentation.d.v1.n_add_emdf_substreams; j ++) {
+                        presentation.d.v1.substream_emdf_version[j] = bits.ReadBits(5);
+                        presentation.d.v1.substream_key_id[j] = bits.ReadBits(10);
+                    }
+                }
+                presentation.d.v1.b_presentation_bitrate_info = bits.ReadBit();
+                if (presentation.d.v1.b_presentation_bitrate_info) {
+                    presentation.d.v1.ac4_bitrate_dsi.bit_rate_mode      = bits.ReadBits(2);
+                    presentation.d.v1.ac4_bitrate_dsi.bit_rate           = bits.ReadBits(32);
+                    presentation.d.v1.ac4_bitrate_dsi.bit_rate_precision = bits.ReadBits(32);
+                }
+                presentation.d.v1.b_alternative = bits.ReadBit();
+                if (presentation.d.v1.b_alternative) {
+                    // byte align
+                    if (bits.GetBitsRead() % 8) {
+                        bits.SkipBits(8 - (bits.GetBitsRead() % 8));
+                    }
+
+                    presentation.d.v1.alternative_info.name_len = bits.ReadBits(16);
+                    for (int n = 0; n < presentation.d.v1.alternative_info.name_len; n++) { 
+                        presentation.d.v1.alternative_info.presentation_name[n] = bits.ReadBits(8);
+                    }
+                    presentation.d.v1.alternative_info.n_targets = bits.ReadBits(5);
+                    for (int t = 0; t < presentation.d.v1.alternative_info.n_targets; t++ ){
+                        presentation.d.v1.alternative_info.target_md_compat[t] = bits.ReadBits(3);
+                        presentation.d.v1.alternative_info.target_device_category[t] = bits.ReadBits(8); 
+                    }
+                }
+                // byte align
+                if (bits.GetBitsRead() % 8) {
+                    bits.SkipBits(8 - (bits.GetBitsRead() % 8));
+                }
+                presentation.d.v1.de_indicator = bits.ReadBit();
+                presentation.d.v1.dolby_atmos_indicator = bits.ReadBit();
+                bits.SkipBits(4);
+                presentation.d.v1.b_extended_presentation_id = bits.ReadBit();
+                if (presentation.d.v1.b_extended_presentation_id){
+                    presentation.d.v1.extended_presentation_id = bits.ReadBits(9);
+                } else {
+                    bits.SkipBit();
                 }
-                // some fields skipped
             }
             unsigned int bits_read_after_presentation = bits.GetBitsRead();
-            unsigned int presentation_bytes = (bits_read_after_presentation - bits_read_before_presentation + 7) / 8;
+            unsigned int presentation_bytes = (bits_read_after_presentation - bits_read_before_presentation) / 8;
             if (pres_bytes < presentation_bytes) {
                 break;
             }
@@ -191,6 +413,12 @@
     if (m_Dsi.ac4_dsi_version == 0) {
         //delete[] m_Dsi.d.v0.presentations;
     } else if (m_Dsi.ac4_dsi_version == 1) {
+        for (int i = 0; i < m_Dsi.d.v1.n_presentations; i++) {
+            for (int j = 0; j < m_Dsi.d.v1.presentations[i].d.v1.n_substream_groups; j++) {
+                delete[] m_Dsi.d.v1.presentations[i].d.v1.substream_groups[j].d.v1.substreams;
+            }
+            delete[] m_Dsi.d.v1.presentations[i].d.v1.substream_groups;
+        }
         delete[] m_Dsi.d.v1.presentations;
     }
 }
@@ -221,8 +449,13 @@
             presentation_version = m_Dsi.d.v1.presentations[0].presentation_version;
             if (presentation_version == 0) {
                 mdcompat = m_Dsi.d.v1.presentations[0].d.v0.mdcompat;
-            } else if (presentation_version == 1) {
+            } else if (presentation_version == 1 || presentation_version == 2) {
                 mdcompat = m_Dsi.d.v1.presentations[0].d.v1.mdcompat;
+                for (int idx = 0; idx < m_Dsi.d.v1.n_presentations; idx ++){
+                    if (mdcompat > m_Dsi.d.v1.presentations[idx].d.v1.mdcompat) {
+                        mdcompat = m_Dsi.d.v1.presentations[idx].d.v1.mdcompat;
+                    }
+                }   
             }
         }
     }
@@ -271,8 +504,8 @@
                 inspector.AddField(field_name, presentation.d.v0.presentation_config);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].mdcompat", i);
                 inspector.AddField(field_name, presentation.d.v0.mdcompat);
-                AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_group_index", i);
-                inspector.AddField(field_name, presentation.d.v0.presentation_group_index);
+                AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_id", i);
+                inspector.AddField(field_name, presentation.d.v0.presentation_id);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].dsi_frame_rate_multiply_info", i);
                 inspector.AddField(field_name, presentation.d.v0.dsi_frame_rate_multiply_info);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_emdf_version", i);
@@ -281,13 +514,13 @@
                 inspector.AddField(field_name, presentation.d.v0.presentation_key_id);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_channel_mask", i);
                 inspector.AddField(field_name, presentation.d.v0.presentation_channel_mask, AP4_AtomInspector::HINT_HEX);
-            } else if (presentation.presentation_version == 1) {
+            } else if (presentation.presentation_version == 1 || presentation.presentation_version == 2) {
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_config_v1", i);
                 inspector.AddField(field_name, presentation.d.v1.presentation_config_v1);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].mdcompat", i);
                 inspector.AddField(field_name, presentation.d.v1.mdcompat);
-                AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_group_index", i);
-                inspector.AddField(field_name, presentation.d.v1.presentation_group_index);
+                AP4_FormatString(field_name, sizeof(field_name), "[%02d].presentation_id", i);
+                inspector.AddField(field_name, presentation.d.v1.presentation_id);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].dsi_frame_rate_multiply_info", i);
                 inspector.AddField(field_name, presentation.d.v1.dsi_frame_rate_multiply_info);
                 AP4_FormatString(field_name, sizeof(field_name), "[%02d].dsi_frame_rate_fraction_info", i);
@@ -311,3 +544,1374 @@
     }
     return AP4_SUCCESS;
 }
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::Ac4BitrateDsi::WriteBitrateDsi
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::Ac4BitrateDsi::WriteBitrateDsi(AP4_BitWriter &bits)
+{
+    bits.Write(bit_rate_mode, 2);
+    bits.Write(bit_rate, 32);
+    bits.Write(bit_rate_precision, 32);
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::Ac4AlternativeInfo::WriteAlternativeInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::Ac4AlternativeInfo::WriteAlternativeInfo(AP4_BitWriter &bits)
+{
+    bits.Write(name_len, 16);
+    for (unsigned int l = 0; l < name_len; l ++) {
+        bits.Write(presentation_name[l], 8);
+    }
+    bits.Write(n_targets, 5);
+    for (unsigned int t = 0; t < n_targets; t ++) {
+        bits.Write(target_md_compat[t], 3);
+        bits.Write(target_device_category[t], 8);
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubstreamInfoChan
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubstreamInfoChan(AP4_BitReader &bits, 
+                                                        unsigned int  presentation_version, 
+                                                        unsigned char defalut_presentation_flag,
+                                                        unsigned int  fs_idx,
+                                                        unsigned int  &speaker_index_mask,
+                                                        unsigned int  frame_rate_factor,
+                                                        unsigned int  b_substreams_present,
+                                                        unsigned char &dolby_atmos_indicator)
+{
+    ch_mode = ParseChMode(bits, presentation_version, dolby_atmos_indicator); 
+    int substreamSpeakerGroupIndexMask = AC4_SPEAKER_GROUP_INDEX_MASK_BY_CH_MODE[ch_mode];
+    if ((ch_mode >= CH_MODE_7_0_4) && (ch_mode <= CH_MODE_9_1_4)) {
+        if (!(b_4_back_channels_present = bits.ReadBit())) {    // b_4_back_channels_present false
+            substreamSpeakerGroupIndexMask &= ~0x8;             // Remove back channels (Lb,Rb) from mask
+        }
+        if (!(b_centre_present = bits.ReadBit())) {             // b_centre_present false
+            substreamSpeakerGroupIndexMask &= ~0x2;             // Remove centre channel (C) from mask
+        }
+        switch (top_channels_present = bits.ReadBits(2)) {      // top_channels_present
+            case 0:
+                substreamSpeakerGroupIndexMask &= ~0x30;        // Remove top channels (Tfl,Tfr,Tbl,Tbr) from mask
+                break;
+            case 1:
+            case 2:
+                substreamSpeakerGroupIndexMask &= ~0x30;        // Remove top channels (Tfl,Tfr,Tbl,Tbr) from mask
+                substreamSpeakerGroupIndexMask |=  0x80;        // Add top channels (Tl, Tr) from mask;
+                break;
+        }
+    }
+    dsi_substream_channel_mask = substreamSpeakerGroupIndexMask;
+    // Only combine channel masks of substream groups that are part of the first/default presentation
+    if (defalut_presentation_flag) {
+        speaker_index_mask |= substreamSpeakerGroupIndexMask;
+    }
+
+    ParseDsiSfMutiplier(bits, fs_idx);
+
+    b_substream_bitrate_indicator = bits.ReadBit();
+    if (b_substream_bitrate_indicator) {    // b_bitrate_info
+        // bitrate_indicator()
+        ParseBitrateIndicator(bits);
+    }
+
+    if (ch_mode >= CH_MODE_70_52 && ch_mode <= CH_MODE_71_322) {
+        bits.ReadBit();                     // add_ch_base
+    }
+    for (unsigned int i = 0; i < frame_rate_factor; i++) {
+        bits.ReadBit();                     // b_audio_ndot
+    }
+
+    ParseSubstreamIdxInfo(bits, b_substreams_present);
+
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubStreamInfoAjoc
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubStreamInfoAjoc(AP4_BitReader &bits, 
+                                                        unsigned int  &channel_count,
+                                                        unsigned char defalut_presentation_flag,
+                                                        unsigned int  fs_idx,
+                                                        unsigned int  frame_rate_factor,
+                                                        unsigned int  b_substreams_present)
+{
+    b_lfe = bits.ReadBit();     // b_lfe
+    b_static_dmx = bits.ReadBit();
+    if (b_static_dmx) {         // b_static_dmx
+        if (defalut_presentation_flag) {
+            channel_count += 5;
+        }
+    } else {
+        n_dmx_objects_minus1 = bits.ReadBits(4);
+        unsigned int nFullbandDmxSignals = n_dmx_objects_minus1 + 1;
+        BedDynObjAssignment(bits, nFullbandDmxSignals, false);
+        if (defalut_presentation_flag) {
+            channel_count += nFullbandDmxSignals;
+        }
+    }
+    if (bits.ReadBit()) {       // b_oamd_common_data_present
+        // oamd_common_data()
+        ParseOamdCommonData(bits);
+    }
+    n_umx_objects_minus1 = bits.ReadBits(4);
+    int nFullbandUpmixSignals = n_umx_objects_minus1 + 1;
+    if (nFullbandUpmixSignals == 16) {
+        nFullbandUpmixSignals += AP4_Ac4VariableBits(bits, 3);
+    }
+
+    BedDynObjAssignment(bits, nFullbandUpmixSignals, true);
+    ParseDsiSfMutiplier(bits, fs_idx);
+
+    b_substream_bitrate_indicator = bits.ReadBit();
+    if (b_substream_bitrate_indicator) {    // b_bitrate_info
+        ParseBitrateIndicator(bits);
+    }
+    for (unsigned int i = 0; i< frame_rate_factor; i++) {
+        bits.ReadBit();                     // b_audio_ndot
+    }
+    ParseSubstreamIdxInfo(bits, b_substreams_present);
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubstreamInfoObj
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubstreamInfoObj(AP4_BitReader &bits,
+                                                       unsigned int  &channel_count,
+                                                       unsigned char defalut_presentation_flag,
+                                                       unsigned int  fs_idx,
+                                                       unsigned int  frame_rate_factor,
+                                                       unsigned int  b_substreams_present)
+{
+    int nObjectsCode = bits.ReadBits(3);
+    if (defalut_presentation_flag) {
+        switch (nObjectsCode) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+                channel_count += nObjectsCode;
+                break;
+            case 4:
+                channel_count += 5;
+                break;
+            default:
+                break;
+                //TODO: Error
+        }
+    }
+    if (bits.ReadBit()) {                       // b_dynamic_objects
+        b_substream_contains_dynamic_objects = 1;
+        unsigned int b_lfe = bits.ReadBit();    // b_lfe
+        if (defalut_presentation_flag && b_lfe) { channel_count += 1; }
+    }else {
+        if (bits.ReadBit()) {                   // b_bed_objects
+            b_substream_contains_bed_objects = 1;
+            if (bits.ReadBit()) {               // b_bed_start
+                if (bits.ReadBit()) {           // b_ch_assign_code
+                    bits.ReadBits(3);           // bed_chan_assign_code
+                }
+                else {
+                    if (bits.ReadBit()) {       // b_nonstd_bed_channel_assignment
+                        bits.ReadBits(17);      // nonstd_bed_channel_assignment_mask
+                    }
+                    else {
+                        bits.ReadBits(10);      // std_bed_channel_assignment_mask
+                    }
+                }
+            }
+        }else {
+            if (bits.ReadBit()) {               // b_isf
+                b_substream_contains_ISF_objects = 1;
+                if (bits.ReadBit()) {           // b_isf_start
+                    bits.ReadBits(3);           // isf_config
+                }
+            }else {
+                int resBytes = bits.ReadBits(4);
+                bits.ReadBits(resBytes * 8);
+            }
+        }
+    }
+
+    ParseDsiSfMutiplier(bits, fs_idx);
+
+    b_substream_bitrate_indicator = bits.ReadBit();
+    if (b_substream_bitrate_indicator) {        // b_bitrate_info
+        ParseBitrateIndicator(bits);
+    }
+    for (unsigned int i = 0; i< frame_rate_factor; i++) {
+        bits.ReadBit();                         // b_audio_ndot
+    }
+    ParseSubstreamIdxInfo(bits, b_substreams_present);
+    return AP4_SUCCESS; 
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::WriteSubstreamDsi
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStream::WriteSubstreamDsi(AP4_BitWriter &bits, unsigned char b_channel_coded)
+{
+    bits.Write(dsi_sf_multiplier, 2);
+    bits.Write(b_substream_bitrate_indicator, 1);
+    if (b_substream_bitrate_indicator == 1) {
+        bits.Write(substream_bitrate_indicator, 5);
+    }
+    if (b_channel_coded == 1) {
+        bits.Write(dsi_substream_channel_mask, 24);
+    }else {
+        bits.Write(b_ajoc, 1);
+        if (b_ajoc == 1) {
+            bits.Write(b_static_dmx, 1);
+            if (b_static_dmx == 0) {
+                bits.Write(n_dmx_objects_minus1, 4);
+            }
+            bits.Write(n_umx_objects_minus1, 6);
+        }
+        // substream composition information
+        bits.Write(b_substream_contains_bed_objects, 1);
+        bits.Write(b_substream_contains_dynamic_objects, 1);
+        bits.Write(b_substream_contains_ISF_objects, 1);
+        bits.Write(0, 1); //reserved bit
+    }
+    return AP4_SUCCESS; 
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseChMode
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseChMode(AP4_BitReader &bits, int presentationVersion, unsigned char &dolby_atmos_indicator) 
+{
+    int channel_mode_code = 0;
+
+    channel_mode_code = bits.ReadBit();
+    if (channel_mode_code == 0) {   // Mono 0b0
+        return CH_MODE_MONO;
+    }
+    channel_mode_code = (channel_mode_code << 1) | bits.ReadBit();
+    if (channel_mode_code == 2) {   // Stereo  0b10
+        return CH_MODE_STEREO;
+    }
+    channel_mode_code = (channel_mode_code << 2) | bits.ReadBits(2);
+    switch (channel_mode_code) {
+        case 12:                    // 3.0 0b1100
+            return CH_MODE_3_0;
+        case 13:                    // 5.0 0b1101
+            return CH_MODE_5_0;
+        case 14:                    // 5.1 0b1110
+            return CH_MODE_5_1;
+    }
+    channel_mode_code = (channel_mode_code << 3) | bits.ReadBits(3);
+    switch (channel_mode_code) {
+        case 120:                   // 0b1111000
+            if (presentationVersion == 2) { // IMS (all content)
+                return CH_MODE_STEREO;
+            }
+            else {                  // 7.0: 3/4/0
+                return CH_MODE_70_34;
+            }
+        case 121:                   // 0b1111001
+            if (presentationVersion == 2) { // IMS (Atmos content)
+                dolby_atmos_indicator |= 1;
+                return CH_MODE_STEREO;
+            }
+            else {                  // 7.1: 3/4/0.1
+                return CH_MODE_71_34;
+            }
+        case 122:                   // 7.0: 5/2/0   0b1111010
+            return CH_MODE_70_52;
+        case 123:                   // 7.1: 5/2/0.1 0b1111011
+            return CH_MODE_71_52;
+        case 124:                   // 7.0: 3/2/2   0b1111100
+            return CH_MODE_70_322; 
+        case 125:                   // 7.1: 3/2/2.1 0b1111101
+            return CH_MODE_71_322;
+    }
+    channel_mode_code = (channel_mode_code << 1) | bits.ReadBit();
+    switch (channel_mode_code) {
+        case 252:                   // 7.0.4 0b11111100
+            return CH_MODE_7_0_4;
+        case 253:                   // 7.1.4 0b11111101
+            return CH_MODE_7_1_4;
+    }
+    channel_mode_code = (channel_mode_code << 1) | bits.ReadBit();
+    switch (channel_mode_code) {
+        case 508:                   // 9.0.4 0b111111100
+            return CH_MODE_9_0_4;
+        case 509:                   // 9.1.4 0b111111101
+            return CH_MODE_9_1_4;
+        case 510:                   // 22.2 0b111111110
+            return CH_MODE_22_2;
+        case 511:                   // Reserved, escape value 0b111111111
+        default:
+            AP4_Ac4VariableBits(bits, 2);
+            return CH_MODE_RESERVED;
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseDsiSfMutiplier
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseDsiSfMutiplier(AP4_BitReader &bits,  
+                                                     unsigned int  fs_idx)
+{
+    if (fs_idx == 1) {
+        if (bits.ReadBit()) {                       // b_sf_miultiplier
+            // 96 kHz or 192 kHz
+            dsi_sf_multiplier = bits.ReadBit() + 1; // sf_multiplier
+        }else{
+            // 48 kHz
+            dsi_sf_multiplier = 0; 
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::BedDynObjAssignment
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::BedDynObjAssignment(AP4_BitReader &bits, 
+                                                     unsigned int  nSignals,
+                                                     bool          is_upmix) 
+{
+    if (!bits.ReadBit()) {      // b_dyn_objects_only
+        if (bits.ReadBit()) {   // b_isf
+            unsigned char isf_config = bits.ReadBits(3); 
+            if (is_upmix) {
+                b_substream_contains_ISF_objects |= 1;
+                if (nSignals > ObjNumFromIsfConfig(isf_config)) {
+                    b_substream_contains_dynamic_objects |= 1;
+                }
+            }
+        }else {
+            if (bits.ReadBit()) {           // b_ch_assign_code
+                unsigned char bed_chan_assign_code = bits.ReadBits(3); 
+                if (is_upmix) {
+                    b_substream_contains_bed_objects |= 1;
+                    if (nSignals > BedNumFromAssignCode(bed_chan_assign_code)) {
+                        b_substream_contains_dynamic_objects |= 1;
+                    }
+                }
+            }else {
+                if (bits.ReadBit()) {       // b_chan_assign_mask
+                    if (bits.ReadBit()) {   // b_nonstd_bed_channel_assignment
+                        unsigned int nonstd_bed_channel_assignment_mask = bits.ReadBits(17); 
+                        if (is_upmix) {
+                            unsigned int bed_num = BedNumFromNonStdMask(nonstd_bed_channel_assignment_mask);
+                            if (bed_num > 0) { b_substream_contains_bed_objects |= 1; }
+                            if (nSignals > bed_num) {
+                                b_substream_contains_dynamic_objects |= 1;
+                            }
+                        }
+                    }
+                    else {
+                        unsigned int std_bed_channel_assignment_mask = bits.ReadBits(10);
+                        if (is_upmix) {
+                            unsigned int bed_num = BedNumFromStdMask(std_bed_channel_assignment_mask);
+                            if (bed_num > 0) { b_substream_contains_bed_objects |= 1; }
+                            if (nSignals > bed_num) {
+                                b_substream_contains_dynamic_objects |= 1;
+                            }
+                        }
+                    }
+                }else {
+                    unsigned int nBedSignals = 0;
+                    if (nSignals > 1) {
+                        int bedChBits = (int) ceil(log((float)nSignals)/log((float)2));
+                        nBedSignals = bits.ReadBits(bedChBits) + 1;
+                    }
+                    else {
+                        nBedSignals = 1;
+                    }
+                    for (unsigned int b = 0; b < nBedSignals; b++) {
+                        bits.ReadBits(4);   // nonstd_bed_channel_assignment
+                    }
+                    if (is_upmix) {
+                        b_substream_contains_bed_objects |= 1;
+                        if (nSignals > nBedSignals){ b_substream_contains_dynamic_objects |= 1; }
+                    }
+                }
+            }
+        }
+    }else {
+        if (is_upmix) {
+            b_substream_contains_dynamic_objects |= 1;
+            b_substream_contains_bed_objects     |= 0;
+            b_substream_contains_ISF_objects     |= 0;
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubstreamIdxInfo
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseSubstreamIdxInfo(AP4_BitReader &bits, unsigned int b_substreams_present)
+{
+    if (b_substreams_present == 1) {
+        if (bits.ReadBits(2) == 3) {    // substream_index
+            AP4_Ac4VariableBits(bits, 2);
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseBitrateIndicator
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseBitrateIndicator(AP4_BitReader &bits)
+{
+    substream_bitrate_indicator = bits.ReadBits(3);
+    if ((substream_bitrate_indicator & 0x1) == 1) { // bitrate_indicator
+        substream_bitrate_indicator = (substream_bitrate_indicator << 2) + bits.ReadBits(2);
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ParseOamdCommonData
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::ParseOamdCommonData(AP4_BitReader &bits)
+{
+    if (bits.ReadBit() == 0) {  // b_default_screen_size_ratio
+        bits.ReadBits(5);       // master_screen_size_ratio_code
+    }
+    bits.ReadBit();             // b_bed_object_chan_distribute
+    if (bits.ReadBit()) {       // b_additional_data
+        int addDataBytes = bits.ReadBit() + 1;
+        if (addDataBytes == 2) {
+            addDataBytes += AP4_Ac4VariableBits(bits, 2);
+        }
+        unsigned int bits_used = Trim(bits);
+        bits_used += BedRendeInfo(bits);
+        bits.ReadBits(addDataBytes * 8 - bits_used);
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::Trim
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::Trim(AP4_BitReader &bits)
+{
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::BedRendeInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::BedRendeInfo(AP4_BitReader &bits)
+{
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::ObjNumFromIsfConfig
++---------------------------------------------------------------------*/
+AP4_UI32
+AP4_Dac4Atom::Ac4Dsi::SubStream::ObjNumFromIsfConfig(unsigned char isf_config)
+{
+    unsigned int obj_num = 0;
+    switch (isf_config){
+        case 0: obj_num = 4 ; break;
+        case 1: obj_num = 8 ; break;
+        case 2: obj_num = 10; break;
+        case 3: obj_num = 14; break;
+        case 4: obj_num = 15; break;
+        case 5: obj_num = 30; break;
+        default: obj_num = 0;
+    }
+    return obj_num;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::BedNumFromAssignCode
++---------------------------------------------------------------------*/
+AP4_UI32
+AP4_Dac4Atom::Ac4Dsi::SubStream::BedNumFromAssignCode(unsigned char assign_code)
+{
+    unsigned int bed_num = 0;
+    switch (assign_code){
+        case 0: bed_num = 2 ; break;
+        case 1: bed_num = 3 ; break;
+        case 2: bed_num = 6 ; break;
+        case 3: bed_num = 8 ; break;
+        case 4: bed_num = 10; break;
+        case 5: bed_num = 8 ; break;
+        case 6: bed_num = 10; break;
+        case 7: bed_num = 12; break;
+        default: bed_num = 0;
+    }
+    return bed_num;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::BedNumFromNonStdMask
++---------------------------------------------------------------------*/
+AP4_UI32
+AP4_Dac4Atom::Ac4Dsi::SubStream::BedNumFromNonStdMask(unsigned int non_std_mask)
+{
+    unsigned int bed_num = 0;
+    // Table 85: nonstd_bed_channel_assignment AC-4 part-2 v1.2.1
+    for (unsigned int idx = 0; idx < 17; idx ++) {
+        if ((non_std_mask >> idx) & 0x1){
+            bed_num ++;
+        }
+    }
+    return bed_num;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::BedNumFromStdMask
++---------------------------------------------------------------------*/
+AP4_UI32
+AP4_Dac4Atom::Ac4Dsi::SubStream::BedNumFromStdMask(unsigned int std_mask)
+{
+    unsigned int bed_num = 0;
+    // Table 86 std_bed_channel_assignment_flag[] AC-4 part-2 v1.2.1
+    for (unsigned int idx = 0; idx < 10; idx ++) {
+        if ((std_mask >> idx) & 0x1){
+            if ((idx == 1) || (idx == 2) || (idx == 9)) { bed_num ++;}
+            else { bed_num += 2; }
+        }
+    }
+    return bed_num;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStream::GetChModeCore
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStream::GetChModeCore(unsigned char b_channel_coded)
+{
+    int ch_mode_core = -1;
+    if (b_channel_coded == 0 && 
+        b_ajoc          == 1 && 
+        b_static_dmx    == 1 && 
+        b_lfe           == 0){
+        ch_mode_core = 3 ;
+    }else if (b_channel_coded == 0 && 
+              b_ajoc          == 1 && 
+              b_static_dmx    == 1 && 
+              b_lfe           == 1){
+              ch_mode_core = 4 ;
+    }else if ((b_channel_coded == 1) && 
+              (ch_mode == 11 || ch_mode == 13)){
+              ch_mode_core = 5 ;
+    }else if ((b_channel_coded == 1) && 
+              (ch_mode == 12 || ch_mode == 14)){
+              ch_mode_core = 6 ;
+    }
+    return ch_mode_core;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseSubstreamGroupInfo
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseSubstreamGroupInfo(AP4_BitReader& bits,
+                                                                unsigned int   bitstream_version,
+                                                                unsigned int   presentation_version,
+                                                                unsigned char  defalut_presentation_flag,
+                                                                unsigned int   frame_rate_factor,
+                                                                unsigned int   fs_idx,
+                                                                unsigned int&  channel_count,
+                                                                unsigned int&  speaker_index_mask,
+                                                                unsigned int&  b_obj_or_Ajoc)
+{
+    d.v1.b_substreams_present = bits.ReadBit();
+    d.v1.b_hsf_ext = bits.ReadBit();
+    if (bits.ReadBit()) {
+        d.v1.n_substreams = 1;
+    } else{
+        d.v1.n_substreams = bits.ReadBits(2) + 2;
+        if (d.v1.n_substreams == 5) {
+            d.v1.n_substreams += AP4_Ac4VariableBits(bits, 2);
+        }  
+    }
+    d.v1.substreams = new AP4_Dac4Atom::Ac4Dsi::SubStream[d.v1.n_substreams];
+    AP4_SetMemory(d.v1.substreams, 0, d.v1.n_substreams * sizeof(d.v1.substreams[0]));
+    d.v1.b_channel_coded = bits.ReadBit();
+    if (d.v1.b_channel_coded) {
+        for (unsigned int sus = 0; sus < d.v1.n_substreams; sus++) {
+            AP4_Dac4Atom::Ac4Dsi::SubStream& substream = d.v1.substreams[sus];
+            if (bitstream_version == 1) { 
+                bits.ReadBit(); // sus_ver
+            }
+
+            // ac4_substream_info_chan()
+            substream.ParseSubstreamInfoChan(bits,
+                                             presentation_version, 
+                                             defalut_presentation_flag,
+                                             fs_idx,
+                                             speaker_index_mask,
+                                             frame_rate_factor,
+                                             d.v1.b_substreams_present,
+                                             d.v1.dolby_atmos_indicator);
+            
+            if (d.v1.b_hsf_ext) {
+                // ac4_hsf_ext_substream_info()
+                ParseHsfExtSubstreamInfo(bits);
+            }
+        }
+    } else {     // b_channel_coded == 0
+        b_obj_or_Ajoc = 1;
+        if (bits.ReadBit()) {       // b_oamd_substream
+                //oamd_substream_info()
+            ParseOamdSubstreamInfo(bits);
+        }
+        for (int sus = 0; sus < d.v1.n_substreams; sus++) {
+            AP4_Dac4Atom::Ac4Dsi::SubStream& substream = d.v1.substreams[sus];
+            substream.b_ajoc = bits.ReadBit();
+            unsigned int local_channel_count = 0;
+            if (substream.b_ajoc) { // b_ajoc
+                // ac4_substream_info_ajoc()
+                substream.ParseSubStreamInfoAjoc(bits,
+                                                 local_channel_count,
+                                                 defalut_presentation_flag,
+                                                 fs_idx,
+                                                 frame_rate_factor,
+                                                 d.v1.b_substreams_present);
+
+                if (d.v1.b_hsf_ext) {
+                    // ac4_hsf_ext_substream_info()
+                    ParseHsfExtSubstreamInfo(bits);
+                }
+            }else {
+                // ac4_substream_info_obj()
+                substream.ParseSubstreamInfoObj(bits,
+                                                local_channel_count,
+                                                defalut_presentation_flag,
+                                                fs_idx,
+                                                frame_rate_factor,
+                                                d.v1.b_substreams_present);
+
+                if (d.v1.b_hsf_ext) {
+                    // ac4_hsf_ext_substream_info()
+                    ParseHsfExtSubstreamInfo(bits);
+                }
+            }
+            if (channel_count < local_channel_count) { channel_count = local_channel_count;}
+        }
+    }
+
+    d.v1.b_content_type = bits.ReadBit();
+    if (d.v1.b_content_type) { 
+        // content_type()
+        ParseContentType(bits);
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::WriteSubstreamGroupDsi
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::WriteSubstreamGroupDsi(AP4_BitWriter &bits)
+{
+    bits.Write(d.v1.b_substreams_present, 1);
+    bits.Write(d.v1.b_hsf_ext, 1);
+    bits.Write(d.v1.b_channel_coded, 1);
+    bits.Write(d.v1.n_substreams, 8);
+    for (unsigned int sg = 0; sg < d.v1.n_substreams; sg++ ){
+        d.v1.substreams[sg].WriteSubstreamDsi(bits, d.v1.b_channel_coded);
+    }
+    WriteContentType(bits);
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseOamdSubstreamInfo
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseOamdSubstreamInfo(AP4_BitReader &bits)
+{
+    bits.ReadBit();                     // b_oamd_ndot
+    if (d.v1.b_substreams_present == 1) {
+        if (bits.ReadBits(2) == 3) {    // substream_index
+            AP4_Ac4VariableBits(bits, 2);
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseHsfExtSubstreamInfo
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseHsfExtSubstreamInfo(AP4_BitReader &bits)
+{
+    if (d.v1.b_substreams_present == 1) {
+        if (bits.ReadBits(2) == 3) {    // substream_index
+            AP4_Ac4VariableBits(bits, 2);
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseContentType
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::ParseContentType(AP4_BitReader &bits)
+{
+    d.v1.content_classifier = bits.ReadBits(3); // content_classifier
+    d.v1.b_language_indicator = bits.ReadBit();
+    if (d.v1.b_language_indicator == 1) {       // b_language_indicator
+        if (bits.ReadBit()) {                   // b_serialized_language_tag
+            bits.ReadBits(17);                  // b_start_tag, language_tag_chunk
+        }
+        else {
+            d.v1.n_language_tag_bytes= bits.ReadBits(6);
+            for (unsigned int l = 0; l < d.v1.n_language_tag_bytes; l++){
+                d.v1.language_tag_bytes[l] = bits.ReadBits(8);
+            }
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::WriteContentType
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1::WriteContentType(AP4_BitWriter &bits)
+{
+    bits.Write(d.v1.b_content_type, 1);
+    if (d.v1.b_content_type == 1){
+        bits.Write(d.v1.content_classifier, 3);
+        bits.Write(d.v1.b_language_indicator, 1);
+        if (d.v1.b_language_indicator == 1){
+            bits.Write(d.v1.n_language_tag_bytes, 6);
+            for (unsigned int idx = 0; idx < d.v1.n_language_tag_bytes; idx++ ){
+                bits.Write(d.v1.language_tag_bytes[idx], 8);
+            }
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::Parse
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationV1Info(AP4_BitReader &bits, 
+                                                              unsigned int  bitstream_version,
+                                                              unsigned int  frame_rate_idx,
+                                                              unsigned int  pres_idx,
+                                                              unsigned int  &max_group_index,
+                                                              unsigned int  **first_pres_sg_index,
+                                                              unsigned int  &first_pres_sg_num)
+{
+    unsigned int *substreamGroupIndexes = new unsigned int[AP4_AC4_SUBSTREAM_GROUP_NUM];
+    unsigned int b_single_substream_group = bits.ReadBit();
+    if (b_single_substream_group != 1){
+        d.v1.presentation_config_v1 = bits.ReadBits(3);
+        if (d.v1.presentation_config_v1 == 7) {
+            d.v1.presentation_config_v1 += AP4_Ac4VariableBits(bits, 2);
+        }
+    }else {
+        d.v1.presentation_config_v1 = 0x1f;
+    }
+
+    // presentation_version()
+    ParsePresentationVersion(bits, bitstream_version);
+
+    AP4_Ac4EmdfInfo tmp_emdf_info;
+    if (b_single_substream_group != 1 && d.v1.presentation_config_v1 == 6){
+        d.v1.b_add_emdf_substreams = 1;
+    }else{
+        if (bitstream_version != 1){
+            d.v1.mdcompat = bits.ReadBits(3);
+        }
+        d.v1.b_presentation_id = bits.ReadBit();
+        if (d.v1.b_presentation_id) {
+            d.v1.presentation_id = AP4_Ac4VariableBits(bits, 2);
+        }
+        // frame_rate_multiply_info()
+        ParseDSIFrameRateMultiplyInfo(bits, frame_rate_idx);
+
+        // frame_rate_fractions_info()
+        ParseDSIFrameRateFractionsInfo(bits, frame_rate_idx);
+
+        // emdf_info()
+        ParseEmdInfo(bits, tmp_emdf_info);
+        d.v1.presentation_emdf_version = tmp_emdf_info.emdf_version;
+        d.v1.presentation_key_id = tmp_emdf_info.key_id;
+           
+        // b_presentation_filter
+        d.v1.b_presentation_filter = bits.ReadBit();
+        if (d.v1.b_presentation_filter == 1){
+            d.v1.b_enable_presentation = bits.ReadBit();
+        }
+        if (b_single_substream_group == 1){
+            substreamGroupIndexes[0] = ParseAc4SgiSpecifier(bits, bitstream_version);
+            max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[0], max_group_index);
+            d.v1.n_substream_groups = 1;
+            d.v1.substream_group_indexs = substreamGroupIndexes;
+        }else {
+            d.v1.b_multi_pid = bits.ReadBit();
+            switch (d.v1.presentation_config_v1){
+                case 0: // M&E + D
+                case 2: // Main + Assoc
+                    substreamGroupIndexes[0] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    substreamGroupIndexes[1] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[0], max_group_index);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[1], max_group_index);
+                    d.v1.n_substream_groups = 2;
+                    d.v1.substream_group_indexs = substreamGroupIndexes;
+                    break;
+                case 1: // Main + DE
+                    // shall return same substream group index, need stream to verify
+                    substreamGroupIndexes[0] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    substreamGroupIndexes[1] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[0], max_group_index);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[1], max_group_index);
+                    d.v1.n_substream_groups = 2;
+                    d.v1.substream_group_indexs = substreamGroupIndexes;
+                    break;
+                case 3: // M&E + D + Assoc
+                    substreamGroupIndexes[0] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    substreamGroupIndexes[1] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    substreamGroupIndexes[2] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[0], max_group_index);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[1], max_group_index);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[2], max_group_index);
+                    d.v1.n_substream_groups = 3;
+                    d.v1.substream_group_indexs = substreamGroupIndexes;
+                    break;
+                case 4: // Main + DE + Assoc
+                    // shall return only two substream group index, need stream to verify
+                    substreamGroupIndexes[0] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    substreamGroupIndexes[1] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    substreamGroupIndexes[2] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[0], max_group_index);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[1], max_group_index);
+                    max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[2], max_group_index);
+                    d.v1.n_substream_groups = 3;
+                    d.v1.substream_group_indexs = substreamGroupIndexes;
+                    break;
+                case 5:
+                    d.v1.n_substream_groups = bits.ReadBits(2) + 2;
+                    if (d.v1.n_substream_groups == 5) {
+                        d.v1.n_substream_groups += AP4_Ac4VariableBits(bits, 2);
+                    }
+                    delete[] substreamGroupIndexes;
+                    substreamGroupIndexes = new unsigned int[d.v1.n_substream_groups];
+                    for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg ++){
+                        substreamGroupIndexes[sg] = ParseAc4SgiSpecifier(bits, bitstream_version);
+                        max_group_index = AP4_SetMaxGroupIndex(substreamGroupIndexes[sg], max_group_index);
+                    }
+                    d.v1.substream_group_indexs = substreamGroupIndexes;
+                    break;
+                default:
+                    // presentation_config_ext_info()
+                    ParsePresentationConfigExtInfo(bits, bitstream_version);
+                    break;
+            }
+        }
+        // b_pre_virtualized
+        d.v1.b_pre_virtualized     = bits.ReadBit();
+        d.v1.b_add_emdf_substreams = bits.ReadBit();
+        // ac4_presentation_substream_info()
+        ParsePresentationSubstreamInfo(bits);
+    }
+
+    if (d.v1.b_add_emdf_substreams){
+        d.v1.n_add_emdf_substreams = bits.ReadBits(2);
+        if (d.v1.n_add_emdf_substreams == 0){
+            d.v1.n_add_emdf_substreams = AP4_Ac4VariableBits(bits, 2) + 4;
+        }
+        for (unsigned int cnt = 0; cnt < d.v1.n_add_emdf_substreams; cnt ++){
+            ParseEmdInfo(bits, tmp_emdf_info);
+            d.v1.substream_emdf_version[cnt] = tmp_emdf_info.emdf_version;
+            d.v1.substream_key_id[cnt]       = tmp_emdf_info.key_id;
+        }
+    }
+    if (pres_idx == 0){
+        *first_pres_sg_index = substreamGroupIndexes;
+        first_pres_sg_num = d.v1.n_substream_groups;
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::WritePresentationV1Dsi
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::WritePresentationV1Dsi(AP4_BitWriter &bits)
+{
+    bits.Write(d.v1.presentation_config_v1, 5);
+    if (d.v1.presentation_config_v1 == 0x06) {
+        d.v1.b_add_emdf_substreams = 1;
+    }else {
+        bits.Write(d.v1.mdcompat, 3);
+        bits.Write(d.v1.b_presentation_id, 1);
+        if (d.v1.b_presentation_id == 1){
+            bits.Write(d.v1.presentation_id, 5);
+        }
+        bits.Write(d.v1.dsi_frame_rate_multiply_info, 2);
+        bits.Write(d.v1.dsi_frame_rate_fraction_info, 2);
+        bits.Write(d.v1.presentation_emdf_version, 5);
+        bits.Write(d.v1.presentation_key_id, 10);
+        d.v1.b_presentation_channel_coded = ((GetPresentationChMode() == -1) ? 0: 1);
+        bits.Write(d.v1.b_presentation_channel_coded, 1);
+        if (d.v1.b_presentation_channel_coded == 1) {
+            d.v1.dsi_presentation_ch_mode = GetPresentationChMode();
+            bits.Write(d.v1.dsi_presentation_ch_mode, 5);
+            if (d.v1.dsi_presentation_ch_mode >= 11 && d.v1.dsi_presentation_ch_mode <= 14){
+                GetPresB4BackChannelsPresent();
+                GetPresTopChannelPairs();
+                bits.Write(d.v1.pres_b_4_back_channels_present, 1);
+                bits.Write(d.v1.pres_top_channel_pairs, 2);
+                if (d.v1.pres_top_channel_pairs) {
+                    d.v1.dolby_atmos_indicator = 1;
+                }
+            }
+            d.v1.presentation_channel_mask_v1 = GetPresentationChannelMask();
+            bits.Write(d.v1.presentation_channel_mask_v1, 24);
+        }
+        int pres_ch_mode_core = GetBPresentationCoreDiffers();
+        bits.Write(d.v1.b_presentation_core_differs = ((pres_ch_mode_core == -1) ? 0: 1), 1);
+        if (d.v1.b_presentation_core_differs == 1) {
+            bits.Write(d.v1.b_presentation_core_channel_coded = ((pres_ch_mode_core == -1) ? 0: 1), 1);
+            if (d.v1.b_presentation_core_channel_coded == 1) {
+                bits.Write(d.v1.dsi_presentation_channel_mode_core = (pres_ch_mode_core - 3), 2);
+            }
+        }
+        bits.Write(d.v1.b_presentation_filter, 1);
+        if (d.v1.b_presentation_filter == 1) {
+            bits.Write(d.v1.b_enable_presentation, 1);
+            // Encoders implemented according to the present document shall write the value 0
+            d.v1.n_filter_bytes = 0; 
+            bits.Write(d.v1.n_filter_bytes, 8);
+            //TODO: filter_data if n_filter_bytes > 0
+        }
+
+        if (d.v1.presentation_config_v1 == 0x1f){
+            d.v1.substream_groups[0].WriteSubstreamGroupDsi(bits);
+        }else {
+            bits.Write(d.v1.b_multi_pid, 1);
+            if (d.v1.presentation_config_v1 <= 2){
+                d.v1.substream_groups[0].WriteSubstreamGroupDsi(bits);
+                d.v1.substream_groups[1].WriteSubstreamGroupDsi(bits);
+            }
+            if (d.v1.presentation_config_v1 >= 3 && d.v1.presentation_config_v1 <= 4){
+                d.v1.substream_groups[0].WriteSubstreamGroupDsi(bits);
+                d.v1.substream_groups[1].WriteSubstreamGroupDsi(bits);
+                d.v1.substream_groups[2].WriteSubstreamGroupDsi(bits);
+            }
+            if (d.v1.presentation_config_v1 == 5) {
+                bits.Write(d.v1.n_substream_groups - 2, 3);
+                for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg ++) {
+                    d.v1.substream_groups[sg].WriteSubstreamGroupDsi(bits);
+                }
+            }
+            if (d.v1.presentation_config_v1 > 5) {
+                d.v1.n_skip_bytes = 0;
+                bits.Write(d.v1.n_skip_bytes, 7);
+                //TODO: skip_data if n_skip_bytes > 0
+            }
+        }
+        
+        // IMS shall set the b_pre_virtualized = 1
+        if (presentation_version == 2) {
+            d.v1.b_pre_virtualized = 1;
+        }
+        bits.Write(d.v1.b_pre_virtualized, 1);
+        bits.Write(d.v1.b_add_emdf_substreams, 1);
+    }
+    if (d.v1.b_add_emdf_substreams == 1){
+        bits.Write(d.v1.n_add_emdf_substreams, 7);
+        for (unsigned int j = 0; j < d.v1.n_add_emdf_substreams; j++){
+            bits.Write(d.v1.substream_emdf_version[j], 5);
+            bits.Write(d.v1.substream_key_id[j], 10);
+        }
+    }
+    // TODO: Not implement, can't get the informaiton from TOC, need calcuate by the muxer
+    bits.Write(d.v1.b_presentation_bitrate_info, 1);
+    if (d.v1.b_presentation_bitrate_info == 1) {
+        d.v1.ac4_bitrate_dsi.WriteBitrateDsi(bits);
+    }
+
+    bits.Write(d.v1.b_alternative, 1);
+    if (d.v1.b_alternative == 1) {
+        AP4_ByteAlign(bits);
+        // TODO: Not implement, need the information from ac4_presentation_substream
+        d.v1.alternative_info.WriteAlternativeInfo(bits);        
+    }
+    AP4_ByteAlign(bits);
+
+    /*
+     * TODO: Not implement, need the information from ac4_substream.
+     * Currently just set the value to 1 according to Dolby's internal discussion.
+     */
+    d.v1.de_indicator = 1;
+    bits.Write(d.v1.de_indicator, 1);
+
+    bits.Write(d.v1.dolby_atmos_indicator, 1);
+    bits.Write(0, 4);       //reserved bits
+
+    if (d.v1.presentation_id > 31) {
+        d.v1.b_extended_presentation_id = 1;
+        d.v1.extended_presentation_id = d.v1.presentation_id;
+    }
+    bits.Write(d.v1.b_extended_presentation_id, 1);
+    if (d.v1.b_extended_presentation_id == 1) {
+        bits.Write(d.v1.extended_presentation_id, 9);
+    }else {
+        bits.Write(0, 1);   //reserved bit
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationVersion
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationVersion(AP4_BitReader& bits, unsigned int bitstream_version)
+{
+    presentation_version = 0;
+    if (bitstream_version != 1){
+        while(bits.ReadBit() == 1){
+            presentation_version ++;
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationConfigExtInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationConfigExtInfo(AP4_BitReader &bits, unsigned int bitstream_version)
+{
+    unsigned int nSkipBytes = bits.ReadBits(5);
+    if (bits.ReadBit()) {  // b_more_skip_bytes
+        nSkipBytes += (AP4_Ac4VariableBits(bits, 2) << 5);
+    }
+    if (bitstream_version == 1 && d.v1.presentation_config_v1 == 7) {
+        // TODO: refer to chapte 6.2.1.5 - TS 103 190-2
+    }
+    bits.ReadBits(nSkipBytes * 8);
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseAc4SgiSpecifier
++---------------------------------------------------------------------*/
+AP4_UI32 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseAc4SgiSpecifier(AP4_BitReader &bits, unsigned int bitstream_version) 
+{
+    if (bitstream_version  == 1) {
+        // Error
+        return 0;
+    } else{
+        unsigned int groupIndex = bits.ReadBits(3);
+        if (groupIndex == 7) {
+            groupIndex += AP4_Ac4VariableBits(bits, 2);
+        }
+        return groupIndex;
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseDSIFrameRateMultiplyInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseDSIFrameRateMultiplyInfo(AP4_BitReader &bits, unsigned int frame_rate_idx)
+{
+    switch (frame_rate_idx) {
+        case 2:
+        case 3:
+        case 4:
+            if (bits.ReadBit()) {                               // b_multiplier
+                unsigned int multiplier_bit = bits.ReadBit();   //multiplier_bit
+                d.v1.dsi_frame_rate_multiply_info = (multiplier_bit == 0)? 1: 2;
+            }
+            else {
+                d.v1.dsi_frame_rate_multiply_info = 0;
+            }
+            break;
+        case 0:
+        case 1:
+        case 7:
+        case 8:
+        case 9:
+            if (bits.ReadBit()) {
+                d.v1.dsi_frame_rate_multiply_info = 1;
+            }else {
+                d.v1.dsi_frame_rate_multiply_info = 0;
+            }
+            break;
+        default:
+            d.v1.dsi_frame_rate_multiply_info = 0;
+            break;
+    }
+    return AP4_SUCCESS;
+}
+
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseDSIFrameRateFractionsInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseDSIFrameRateFractionsInfo(AP4_BitReader &bits, unsigned int frame_rate_idx)
+{
+     if (frame_rate_idx >= 5 && frame_rate_idx <= 9) {
+        if (bits.ReadBit() == 1) {      // b_frame_rate_fraction
+            d.v1.dsi_frame_rate_fraction_info = 1;
+        }else{
+            d.v1.dsi_frame_rate_fraction_info = 0;
+        }
+    }else if (frame_rate_idx >= 10 && frame_rate_idx <= 12){
+        if (bits.ReadBit() == 1) {      // b_frame_rate_fraction
+            if (bits.ReadBit() == 1) {  // b_frame_rate_fraction_is_4
+                d.v1.dsi_frame_rate_fraction_info = 2;
+            } else {
+                d.v1.dsi_frame_rate_fraction_info = 1;
+            }
+        
+        }else{
+            d.v1.dsi_frame_rate_fraction_info = 0;
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseEmdInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParseEmdInfo(AP4_BitReader &bits, AP4_Ac4EmdfInfo &emdf_info)
+{
+    emdf_info.emdf_version = bits.ReadBits(2);
+    if (emdf_info.emdf_version == 3) { 
+        emdf_info.emdf_version += AP4_Ac4VariableBits(bits, 2);
+    }
+    emdf_info.key_id = bits.ReadBits(3);
+    if (emdf_info.key_id == 7) { 
+        emdf_info.key_id += AP4_Ac4VariableBits(bits, 3);
+    }
+    emdf_info.b_emdf_payloads_substream_info = bits.ReadBit();
+    if (emdf_info.b_emdf_payloads_substream_info == 1) {
+        // emdf_payloads_substream_info ()
+        if (bits.ReadBits(2) == 3) {    // substream_index
+            AP4_Ac4VariableBits(bits, 2);
+        }
+    }
+    emdf_info.protectionLengthPrimary   = bits.ReadBits(2);
+    emdf_info.protectionLengthSecondary = bits.ReadBits(2);
+    // protection_bits_primary
+    switch (emdf_info.protectionLengthPrimary) { 
+        case 1:
+            emdf_info.protection_bits_primary[0] = bits.ReadBits(8);
+            break;
+        case 2:
+            for (unsigned idx = 0; idx < 4; idx ++)  { emdf_info.protection_bits_primary[idx] = bits.ReadBits(8); }
+            break;
+        case 3:
+            for (unsigned idx = 0; idx < 16; idx ++) { emdf_info.protection_bits_primary[idx] = bits.ReadBits(8); }
+            break;
+        default:
+            // Error
+            break;
+    }
+    // protection_bits_secondary
+    switch (emdf_info.protectionLengthSecondary) { 
+        case 0:
+            break;
+        case 1:
+            emdf_info.protection_bits_Secondary[0] = bits.ReadBits(8);
+            break;
+        case 2:
+            for (unsigned idx = 0; idx < 4; idx ++)  { emdf_info.protection_bits_Secondary[idx] = bits.ReadBits(8); }
+            break;
+        case 3:
+            for (unsigned idx = 0; idx < 16; idx ++) { emdf_info.protection_bits_Secondary[idx] = bits.ReadBits(8); }
+            break;
+        default:
+            // TODO: Error
+            break;
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationSubstreamInfo
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::ParsePresentationSubstreamInfo(AP4_BitReader &bits)
+{
+    d.v1.b_alternative = bits.ReadBit();
+    /* unsigned int b_pres_ndot = */ bits.ReadBit();          // b_pres_ndot;
+    unsigned int substream_index = bits.ReadBits(2);    //substream_index
+    if (substream_index == 3){
+        AP4_Ac4VariableBits(bits, 2);
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresentationChMode
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresentationChMode()
+{
+    int pres_ch_mode = -1;
+    char b_obj_or_ajoc = 0;
+    // TODO: n_substream_groups
+    for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg++){
+        AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 &substream_group = d.v1.substream_groups[sg];
+        unsigned int n_substreams = d.v1.substream_groups[sg].d.v1.n_substreams;
+        for (unsigned int sus = 0; sus < n_substreams; sus++){
+            AP4_Dac4Atom::Ac4Dsi::SubStream &substream = substream_group.d.v1.substreams[sus];
+            if (substream_group.d.v1.b_channel_coded){
+                pres_ch_mode = AP4_Ac4SuperSet(pres_ch_mode, substream.ch_mode);
+            }else {
+                b_obj_or_ajoc = 1;
+            }
+        }
+    }
+    if (b_obj_or_ajoc == 1) { pres_ch_mode = -1; }
+    return pres_ch_mode;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresentationChannelMask
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresentationChannelMask()
+{
+    unsigned int channel_mask = 0;
+    char b_obj_or_ajoc = 0;
+    // TODO: n_substream_groups 
+    for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg ++){
+        AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 &substream_group = d.v1.substream_groups[sg];
+        unsigned int n_substreams = d.v1.substream_groups[sg].d.v1.n_substreams;
+        for (unsigned int sus = 0; sus < n_substreams; sus ++){
+            AP4_Dac4Atom::Ac4Dsi::SubStream &substream = substream_group.d.v1.substreams[sus];
+            if (substream_group.d.v1.b_channel_coded){
+                channel_mask |= substream.dsi_substream_channel_mask;
+            }else {
+                b_obj_or_ajoc = 1;
+            }
+        }
+    }
+    //Modify the mask for headphone presentation with b_pre_virtualized = 1
+    /*
+    if (presentation_version == 2 || d.v1.b_pre_virtualized == 1){
+        if (channel_mask == 0x03) { channel_mask = 0x01;}
+    }
+    */
+    // TODO: temporary solution according to Dolby's internal discussion
+    if (channel_mask == 0x03) { channel_mask = 0x01;}
+
+    // If one substream contains Tfl, Tfr, Tbl, Tbr, Tl and Tr shall be removed.
+    if ((channel_mask & 0x30) && (channel_mask & 0x80))  { channel_mask &= ~0x80;}
+
+    // objective channel mask
+    if (b_obj_or_ajoc == 1) { channel_mask = 0x800000; }
+    return channel_mask;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresB4BackChannelsPresent
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresB4BackChannelsPresent()
+{
+    for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg ++){
+        AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 &substream_group = d.v1.substream_groups[sg];
+        for (unsigned int sus = 0; sus < substream_group.d.v1.n_substreams; sus ++){
+            d.v1.pres_b_4_back_channels_present |=  substream_group.d.v1.substreams[sus].b_4_back_channels_present;
+        }
+    }
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresTopChannelPairs
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetPresTopChannelPairs()
+{
+    unsigned char tmp_pres_top_channel_pairs = 0;
+    for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg ++){
+        AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 &substream_group = d.v1.substream_groups[sg];
+        for (unsigned int sus = 0; sus < substream_group.d.v1.n_substreams; sus ++){
+            if (tmp_pres_top_channel_pairs < substream_group.d.v1.substreams[sus].top_channels_present) {
+                tmp_pres_top_channel_pairs = substream_group.d.v1.substreams[sus].top_channels_present;
+            }
+        }
+    }
+    switch (tmp_pres_top_channel_pairs){
+        case 0: 
+            d.v1.pres_top_channel_pairs = 0; break;
+        case 1:
+        case 2:
+            d.v1.pres_top_channel_pairs = 1; break;
+        case 3:
+            d.v1.pres_top_channel_pairs = 2; break;
+        default:
+            d.v1.pres_top_channel_pairs = 0; break;
+    }
+    return AP4_SUCCESS;
+}
+
+
+/*----------------------------------------------------------------------
+|   AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetBPresentationCoreDiffers
++---------------------------------------------------------------------*/
+AP4_Result 
+AP4_Dac4Atom::Ac4Dsi::PresentationV1::GetBPresentationCoreDiffers()
+{
+    int pres_ch_mode_core = -1;
+    char b_obj_or_ajoc_adaptive = 0;
+    for (unsigned int sg = 0; sg < d.v1.n_substream_groups; sg ++){
+        AP4_Dac4Atom::Ac4Dsi::SubStreamGroupV1 &substream_group = d.v1.substream_groups[sg];
+        unsigned int n_substreams = d.v1.substream_groups[sg].d.v1.n_substreams;
+        for (unsigned int sus = 0; sus < n_substreams; sus ++){
+            AP4_Dac4Atom::Ac4Dsi::SubStream &substream = substream_group.d.v1.substreams[sus];
+            if (substream_group.d.v1.b_channel_coded){
+                pres_ch_mode_core = AP4_Ac4SuperSet(pres_ch_mode_core, substream.GetChModeCore(substream_group.d.v1.b_channel_coded));
+            }else {
+                if (substream.b_ajoc){
+                    if (substream.b_static_dmx){
+                        pres_ch_mode_core = AP4_Ac4SuperSet(pres_ch_mode_core, substream.GetChModeCore(substream_group.d.v1.b_channel_coded));
+                    }else{
+                        b_obj_or_ajoc_adaptive = 1;
+                    }
+                }else{
+                    b_obj_or_ajoc_adaptive = 1;
+                }
+            }
+        }
+    }
+    if (b_obj_or_ajoc_adaptive) {
+        pres_ch_mode_core = -1;
+    }
+    if (pres_ch_mode_core == GetPresentationChMode()) {
+        pres_ch_mode_core = -1;
+    }
+    return pres_ch_mode_core;
+}

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Dac4Atom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Dac4Atom.h Changed

@@ -33,11 +33,8 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "Ap4Atom.h"
-#include "Ap4Array.h"
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
+#include "Ap4Utils.h"
+#include "Ap4Ac4Utils.h"
 
 /*----------------------------------------------------------------------
 |   AP4_Dac4Atom
@@ -49,23 +46,146 @@
 
     // inner classes
     struct Ac4Dsi {
+        struct Ac4BitrateDsi{
+            AP4_UI08 bit_rate_mode;
+            AP4_UI32 bit_rate;
+            AP4_UI32 bit_rate_precision;
+        
+            // methods
+            AP4_Result WriteBitrateDsi(AP4_BitWriter &bits);
+        };
+        struct Ac4AlternativeInfo{
+            AP4_UI16 name_len;
+            AP4_UI08 presentation_name[256]; // restrict to 256 char
+            AP4_UI08 n_targets;
+            AP4_UI08 target_md_compat[32];
+            AP4_UI08 target_device_category[32];
+
+            // methods
+            AP4_Result WriteAlternativeInfo(AP4_BitWriter &bits);
+        };
+        struct SubStream{
+            AP4_UI08 b_4_back_channels_present;
+            AP4_UI08 b_centre_present;
+            AP4_UI08 top_channels_present;
+            AP4_UI08 b_lfe;
+            AP4_UI08 dsi_sf_multiplier;
+            AP4_UI08 b_substream_bitrate_indicator;
+            AP4_UI08 substream_bitrate_indicator;
+            AP4_UI08 ch_mode; // auxiliary information, used to calcuate pres_ch_mode
+            AP4_UI32 dsi_substream_channel_mask;
+            AP4_UI08 b_ajoc;
+            AP4_UI08 b_static_dmx;
+            AP4_UI08 n_dmx_objects_minus1;
+            AP4_UI08 n_umx_objects_minus1;
+            AP4_UI08 b_substream_contains_bed_objects;
+            AP4_UI08 b_substream_contains_dynamic_objects;
+            AP4_UI08 b_substream_contains_ISF_objects;
+
+            // methods
+            AP4_Result ParseSubstreamInfoChan(AP4_BitReader &bits, 
+                                              unsigned int  presentation_version, 
+                                              unsigned char defalut_presentation_flag,
+                                              unsigned int  fs_idx,
+                                              unsigned int  &speaker_index_mask,
+                                              unsigned int  frame_rate_factor,
+                                              unsigned int  b_substreams_present,
+                                              unsigned char &dolby_atmos_indicator);
+
+            AP4_Result ParseSubStreamInfoAjoc(AP4_BitReader &bits, 
+                                              unsigned int  &channel_count,
+                                              unsigned char defalut_presentation_flag,
+                                              unsigned int  fs_idx,
+                                              unsigned int  frame_rate_factor,
+                                              unsigned int  b_substreams_present);
+
+            AP4_Result ParseSubstreamInfoObj(AP4_BitReader &bits,
+                                             unsigned int  &channel_count,
+                                             unsigned char defalut_presentation_flag,
+                                             unsigned int  fs_idx,
+                                             unsigned int  frame_rate_factor,
+                                             unsigned int  b_substreams_present);
+            AP4_Result WriteSubstreamDsi    (AP4_BitWriter &bits, unsigned char b_channel_coded);
+            AP4_Result GetChModeCore        (unsigned char b_channel_coded);
+        private:
+            AP4_Result ParseChMode          (AP4_BitReader &bits, int presentationVersion, unsigned char &dolby_atmos_indicator);
+            AP4_Result ParseDsiSfMutiplier  (AP4_BitReader &bits, unsigned int fs_idx  );
+            AP4_Result BedDynObjAssignment  (AP4_BitReader &bits, unsigned int nSignals, bool is_upmix);
+            AP4_Result ParseSubstreamIdxInfo(AP4_BitReader &bits, unsigned int b_substreams_present);
+            
+            AP4_Result ParseBitrateIndicator(AP4_BitReader &bits);
+            AP4_Result ParseOamdCommonData  (AP4_BitReader &bits);
+            AP4_Result Trim                 (AP4_BitReader &bits);
+            AP4_Result BedRendeInfo         (AP4_BitReader &bits);
+            AP4_UI32   ObjNumFromIsfConfig  (unsigned char isf_config);
+            AP4_UI32   BedNumFromAssignCode (unsigned char assign_code);
+            AP4_UI32   BedNumFromNonStdMask (unsigned int  non_std_mask);
+            AP4_UI32   BedNumFromStdMask    (unsigned int  std_mask);
+        };
+        struct SubStreamGroupV1 {
+            union {
+                struct 
+                {
+                    AP4_UI08 channel_mode;
+                    AP4_UI08 dsi_sf_multiplier;
+                    AP4_UI08 b_substream_bitrate_indicator;
+                    AP4_UI08 substream_bitrate_indicator;
+                    AP4_UI08 add_ch_base;
+                    AP4_UI08 b_content_type;
+                    AP4_UI08 content_classifier;
+                    AP4_UI08 b_language_indicator;
+                    AP4_UI08 n_language_tag_bytes;
+                    AP4_UI08 language_tag_bytes[64];
+                }v0;
+                struct 
+                {
+                    AP4_UI08 b_substreams_present;
+                    AP4_UI08 b_hsf_ext;
+                    AP4_UI08 b_channel_coded;
+                    AP4_UI08 n_substreams;
+                    SubStream* substreams;
+                    AP4_UI08 b_content_type;
+                    AP4_UI08 content_classifier;
+                    AP4_UI08 b_language_indicator;
+                    AP4_UI08 n_language_tag_bytes;
+                    AP4_UI08 language_tag_bytes[64]; // n_language_tag_bytes is 6 bits
+                    AP4_UI08 dolby_atmos_indicator;
+                }v1;
+            }d;
+            AP4_Result ParseSubstreamGroupInfo(AP4_BitReader &bits, 
+                                               unsigned int  bitstream_version,
+                                               unsigned int  presentation_version,
+                                               unsigned char defalut_presentation_flag,
+                                               unsigned int  frame_rate_factor,
+                                               unsigned int  fs_idx,
+                                               unsigned int  &channel_count,
+                                               unsigned int  &speaker_index_mask,
+                                               unsigned int  &b_obj_or_Ajoc);
+            AP4_Result WriteSubstreamGroupDsi(AP4_BitWriter &bits);
+        private:
+            AP4_Result ParseOamdSubstreamInfo  (AP4_BitReader &bits);
+            AP4_Result ParseHsfExtSubstreamInfo(AP4_BitReader &bits);
+            AP4_Result ParseContentType        (AP4_BitReader &bits);
+            AP4_Result WriteContentType        (AP4_BitWriter &bits);
+        };
         struct PresentationV1 {
             AP4_UI08 presentation_version;
             union {
                 struct {
                     AP4_UI08 presentation_config;
                     AP4_UI08 mdcompat;
-                    AP4_UI08 presentation_group_index;
+                    AP4_UI08 presentation_id;
                     AP4_UI08 dsi_frame_rate_multiply_info;
                     AP4_UI08 presentation_emdf_version;
                     AP4_UI16 presentation_key_id;
                     AP4_UI32 presentation_channel_mask;
-                    // more fields omitted
+                    // more fields omitted, v0 is deprecated.
                 } v0;
                 struct {
                     AP4_UI08 presentation_config_v1;
                     AP4_UI08 mdcompat;
-                    AP4_UI08 presentation_group_index;
+                    AP4_UI08 b_presentation_id;
+                    AP4_UI08 presentation_id;
                     AP4_UI08 dsi_frame_rate_multiply_info;
                     AP4_UI08 dsi_frame_rate_fraction_info;
                     AP4_UI08 presentation_emdf_version;
@@ -75,9 +195,56 @@
                     AP4_UI08 pres_b_4_back_channels_present;
                     AP4_UI08 pres_top_channel_pairs;
                     AP4_UI32 presentation_channel_mask_v1;
-                    // more fields omitted
+                    AP4_UI08 b_presentation_core_differs;
+                    AP4_UI08 b_presentation_core_channel_coded;
+                    AP4_UI08 dsi_presentation_channel_mode_core;
+                    AP4_UI08 b_presentation_filter;
+                    AP4_UI08 b_enable_presentation;
+                    AP4_UI08 n_filter_bytes;
+
+                    AP4_UI08 b_multi_pid;
+                    AP4_UI08 n_substream_groups;
+                    SubStreamGroupV1* substream_groups;
+                    AP4_UI32* substream_group_indexs; // auxiliary information, not exist in DSI
+                    AP4_UI08 n_skip_bytes;
+
+                    AP4_UI08 b_pre_virtualized;
+                    AP4_UI08 b_add_emdf_substreams;
+                    AP4_UI08 n_add_emdf_substreams;
+                    AP4_UI08 substream_emdf_version[128]; // n_add_emdf_substreams - 7 bits
+                    AP4_UI16 substream_key_id[128];
+
+                    AP4_UI08 b_presentation_bitrate_info;
+                    Ac4BitrateDsi ac4_bitrate_dsi;
+                    AP4_UI08 b_alternative;
+                    Ac4AlternativeInfo alternative_info;
+                    AP4_UI08 de_indicator;
+                    AP4_UI08 dolby_atmos_indicator;
+                    AP4_UI08 b_extended_presentation_id;
+                    AP4_UI16 extended_presentation_id;
                 } v1;
             } d;
+            AP4_Result ParsePresentationV1Info(AP4_BitReader &bits, 
+                                               unsigned int  bitstream_version,
+                                               unsigned int  frame_rate_idx,
+                                               unsigned int  pres_idx,
+                                               unsigned int  &max_group_index,
+                                               unsigned int  **first_pres_sg_index,
+                                               unsigned int  &first_pres_sg_num);
+            AP4_Result WritePresentationV1Dsi(AP4_BitWriter &bits);
+        private:
+            AP4_Result ParsePresentationVersion      (AP4_BitReader &bits, unsigned int bitstream_version);
+            AP4_Result ParsePresentationConfigExtInfo(AP4_BitReader &bits, unsigned int bitstream_version);
+            AP4_UI32   ParseAc4SgiSpecifier          (AP4_BitReader &bits, unsigned int bitstream_version) ;
+            AP4_Result ParseDSIFrameRateMultiplyInfo (AP4_BitReader &bits, unsigned int frame_rate_idx);
+            AP4_Result ParseDSIFrameRateFractionsInfo(AP4_BitReader &bits, unsigned int frame_rate_idx);
+            AP4_Result ParseEmdInfo                  (AP4_BitReader &bits, AP4_Ac4EmdfInfo &emdf_info);
+            AP4_Result ParsePresentationSubstreamInfo(AP4_BitReader &bits);
+            AP4_Result GetPresentationChMode();
+            AP4_Result GetPresentationChannelMask();
+            AP4_Result GetPresB4BackChannelsPresent();
+            AP4_Result GetPresTopChannelPairs();
+            AP4_Result GetBPresentationCoreDiffers();
         };
         
         AP4_UI08 ac4_dsi_version;
@@ -88,23 +255,20 @@
                 AP4_UI32 fs;
                 AP4_UI08 frame_rate_index;
                 AP4_UI16 n_presentations;
-                // more fields from `ac4_dsi` are not included here
+                // more fields from `ac4_dsi` are not included here, v0 is deprecated.
             } v0;
             struct {
                 AP4_UI08 bitstream_version;
                 AP4_UI08 fs_index;
                 AP4_UI32 fs;
                 AP4_UI08 frame_rate_index;
+                AP4_UI08 b_program_id;
                 AP4_UI16 short_program_id;
+                AP4_UI08 b_uuid;
                 AP4_UI08 program_uuid[16];
-                struct {
-                    AP4_UI08 bit_rate_mode;
-                    AP4_UI32 bit_rate;
-                    AP4_UI32 bit_rate_precision;
-                } ac4_bitrate_dsi;
+                Ac4BitrateDsi ac4_bitrate_dsi;
                 AP4_UI16        n_presentations;
                 PresentationV1* presentations;
-                // more fields from `ac4_dsi_v1` are not included here
             } v1;
         } d;
     };
@@ -112,13 +276,17 @@
     // class methods
     static AP4_Dac4Atom* Create(AP4_Size size, AP4_ByteStream& stream);
 
+    // constructors
+    AP4_Dac4Atom(AP4_UI32 size, const Ac4Dsi* ac4Dsi);  // DSI vaiable initialize m_RawBytes (m_Dsi -> m_RawBytes)
+
     // destructor
     ~AP4_Dac4Atom();
     
     // methods
-    virtual AP4_Result InspectFields(AP4_AtomInspector& inspector);
-    virtual AP4_Result WriteFields(AP4_ByteStream& stream);
-    virtual AP4_Atom*  Clone() { return new AP4_Dac4Atom(m_Size32, m_RawBytes.GetData()); }
+    virtual AP4_Result    InspectFields(AP4_AtomInspector& inspector);
+    virtual AP4_Result    WriteFields(AP4_ByteStream& stream);
+    virtual AP4_Atom*     Clone() { return new AP4_Dac4Atom(m_Size32, m_RawBytes.GetData()); }
+    virtual AP4_Dac4Atom* CloneConst() const { return new AP4_Dac4Atom(m_Size32, m_RawBytes.GetData()); }
 
     // accessors
     const AP4_DataBuffer& GetRawBytes() const { return m_RawBytes;   }
@@ -129,11 +297,12 @@
     
 private:
     // methods
-    AP4_Dac4Atom(AP4_UI32 size, const AP4_UI08* payload);
+    AP4_Dac4Atom(const AP4_Dac4Atom& other);
+    AP4_Dac4Atom(AP4_UI32 size, const AP4_UI08* payload); // box data initialize m_Dsi (m_RawBytes -> m_Dsi)
     
     // members
     AP4_DataBuffer m_RawBytes;
     Ac4Dsi         m_Dsi;
 };
 
-#endif // _AP4_DEC3_ATOM_H_
+#endif // _AP4_DAC4_ATOM_H_

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Dec3Atom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Dec3Atom.cpp Changed

@@ -59,9 +59,73 @@
 /*----------------------------------------------------------------------
 |   AP4_Dec3Atom::AP4_Dec3Atom
 +---------------------------------------------------------------------*/
+AP4_Dec3Atom::AP4_Dec3Atom(const AP4_Dec3Atom& other):
+    AP4_Atom(AP4_ATOM_TYPE_DEC3, other.m_Size32), 
+    m_DataRate(other.m_DataRate),
+    m_FlagEC3ExtensionTypeA(other.m_FlagEC3ExtensionTypeA),
+    m_ComplexityIndexTypeA(other.m_ComplexityIndexTypeA),
+    m_SubStreams(other.m_SubStreams),
+    m_RawBytes(other.m_RawBytes)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dec3Atom::AP4_Dec3Atom
++---------------------------------------------------------------------*/
+AP4_Dec3Atom::AP4_Dec3Atom():
+    AP4_Atom(AP4_ATOM_TYPE_DEC3, AP4_ATOM_HEADER_SIZE), 
+    m_DataRate(0),
+    m_FlagEC3ExtensionTypeA(0),
+    m_ComplexityIndexTypeA(0)
+{
+    m_SubStreams.Append(SubStream());
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dec3Atom::AP4_Dec3Atom
++---------------------------------------------------------------------*/
+AP4_Dec3Atom::AP4_Dec3Atom(AP4_UI32 au_size, const SubStream* substream, const unsigned int complexity_index_type_a):
+    AP4_Atom(AP4_ATOM_TYPE_DEC3, AP4_ATOM_HEADER_SIZE)
+{
+    AP4_BitWriter bits(7);                  // I0 + D0 or 5.1 DD+ JOC is the most complicated stream
+
+    unsigned int date_rate   = au_size / 4;
+    unsigned int num_ind_sub = 0;           // num_ind_sub is set to 0 which is ensured by E-AC-3 parser.
+
+    bits.Write(date_rate, 13);
+    bits.Write(num_ind_sub, 3);  
+    for (unsigned int idx = 0; idx < num_ind_sub + 1; idx ++) {
+        bits.Write(substream->fscod, 2); 
+        bits.Write(substream->bsid , 5); 
+        bits.Write(0, 1);                   // reserved
+        bits.Write(0, 1);                   // asvc is always 0
+        bits.Write(substream->bsmod, 3); 
+        bits.Write(substream->acmod, 3); 
+        bits.Write(substream->lfeon, 1); 
+        bits.Write(0, 3);                   // reserved
+        bits.Write(substream->num_dep_sub, 4);
+        if (substream->num_dep_sub > 0) {
+            bits.Write(substream->chan_loc, 9);
+        }else{
+            bits.Write(0, 1);               // reserved
+        }
+    }
+    if (complexity_index_type_a) {
+        bits.Write(1, 8);
+        bits.Write(complexity_index_type_a, 8);
+    }
+    m_RawBytes.SetData(bits.GetData(), bits.GetBitCount() / 8);
+    m_Size32 += m_RawBytes.GetDataSize();
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Dec3Atom::AP4_Dec3Atom
++---------------------------------------------------------------------*/
 AP4_Dec3Atom::AP4_Dec3Atom(AP4_UI32 size, const AP4_UI08* payload) :
     AP4_Atom(AP4_ATOM_TYPE_DEC3, size),
-    m_DataRate(0)
+    m_DataRate(0), 
+    m_FlagEC3ExtensionTypeA(0), 
+    m_ComplexityIndexTypeA(0)
 {
     // make a copy of our configuration bytes
     unsigned int payload_size = size-AP4_ATOM_HEADER_SIZE;
@@ -103,6 +167,13 @@
             payload_size -= 3;
         }
     }
+    // DD+/Atmos 
+    if (payload_size >= 2) {
+        m_FlagEC3ExtensionTypeA = payload[0] & 0x1;
+        m_ComplexityIndexTypeA  = payload[1];
+        payload      += 2;
+        payload_size -= 2;
+    }
 }
 
 /*----------------------------------------------------------------------
@@ -121,6 +192,7 @@
 AP4_Dec3Atom::InspectFields(AP4_AtomInspector& inspector)
 {
     inspector.AddField("data_rate", m_DataRate);
+    inspector.AddField("complexity_index_type_a", m_ComplexityIndexTypeA);
     for (unsigned int i=0; i<m_SubStreams.ItemCount(); i++) {
         char name[16];
         char value[256];

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Dec3Atom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Dec3Atom.h Changed

@@ -62,6 +62,11 @@
     // class methods
     static AP4_Dec3Atom* Create(AP4_Size size, AP4_ByteStream& stream);
 
+    // constructors
+    AP4_Dec3Atom();
+    AP4_Dec3Atom(const AP4_Dec3Atom& other);
+    AP4_Dec3Atom(AP4_UI32 au_size, const SubStream* substream, const unsigned int complexity_index_type_a);  // DSI vaiable initialize m_RawBytes (substream -> m_RawBytes)
+
     // methods
     virtual AP4_Result InspectFields(AP4_AtomInspector& inspector);
     virtual AP4_Result WriteFields(AP4_ByteStream& stream);
@@ -71,13 +76,17 @@
     const AP4_DataBuffer&       GetRawBytes()   const { return m_RawBytes;   }
     unsigned int                GetDataRate()   const { return m_DataRate;   }
     const AP4_Array<SubStream>& GetSubStreams() const { return m_SubStreams; }
+    unsigned int                GetFlagEC3ExtensionTypeA() const { return m_FlagEC3ExtensionTypeA; }
+    unsigned int                GetComplexityIndexTypeA()  const { return m_ComplexityIndexTypeA; }
     
 private:
     // methods
-    AP4_Dec3Atom(AP4_UI32 size, const AP4_UI08* payload);
+    AP4_Dec3Atom(AP4_UI32 size, const AP4_UI08* payload);  // box data initialize m_Dsi (m_RawBytes -> substream)
     
     // members
     unsigned int              m_DataRate;
+    unsigned int              m_FlagEC3ExtensionTypeA;
+    unsigned int              m_ComplexityIndexTypeA;
     AP4_Array<SubStream>      m_SubStreams;
     AP4_DataBuffer            m_RawBytes;
 };

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4DvccAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4DvccAtom.cpp Changed

@@ -33,6 +33,7 @@
 #include "Ap4AtomFactory.h"
 #include "Ap4Utils.h"
 #include "Ap4Types.h"
+#include "Ap4SampleDescription.h"
 
 /*----------------------------------------------------------------------
 |   dynamic cast support
@@ -54,6 +55,8 @@
         case AP4_DV_PROFILE_DVHE_STN: return "dvhe.stn";
         case AP4_DV_PROFILE_DVHE_DTH: return "dvhe.dth";
         case AP4_DV_PROFILE_DVHE_DTB: return "dvhr.dtb";
+        case AP4_DV_PROFILE_DVHE_ST : return "dvhe.st";
+        case AP4_DV_PROFILE_DVHE_SE : return "dvav.se";
     }
 
     return NULL;
@@ -77,7 +80,8 @@
                             ((payload[2]&1)<<5) | (payload[3]>>3),
                             (payload[3]&4) != 0,
                             (payload[3]&2) != 0,
-                            (payload[3]&1) != 0);
+                            (payload[3]&1) != 0,
+                            payload[4]>>4);
 }
 
 /*----------------------------------------------------------------------
@@ -91,7 +95,8 @@
     m_DvLevel(0),
     m_RpuPresentFlag(false),
     m_ElPresentFlag(false),
-    m_BlPresentFlag(false)
+    m_BlPresentFlag(false),
+    m_DvBlSignalCompatibilityID(0)
 {
 }
 
@@ -104,16 +109,77 @@
                            AP4_UI08 dv_level,
                            bool     rpu_present_flag,
                            bool     el_present_flag,
-                           bool     bl_present_flag) :
-    AP4_Atom(AP4_ATOM_TYPE_DVCC, AP4_ATOM_HEADER_SIZE+24),
+                           bool     bl_present_flag,
+                           AP4_UI08 dv_bl_signal_compatibility_id) :
+    AP4_Atom((dv_profile>7) ? AP4_ATOM_TYPE_DVVC : AP4_ATOM_TYPE_DVCC, AP4_ATOM_HEADER_SIZE+24),
     m_DvVersionMajor(dv_version_major),
     m_DvVersionMinor(dv_version_minor),
     m_DvProfile(dv_profile),
     m_DvLevel(dv_level),
     m_RpuPresentFlag(rpu_present_flag),
     m_ElPresentFlag(el_present_flag),
-    m_BlPresentFlag(bl_present_flag)
+    m_BlPresentFlag(bl_present_flag),
+    m_DvBlSignalCompatibilityID(dv_bl_signal_compatibility_id)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_DvccAtom::GetCodecString
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_DvccAtom::GetCodecString(AP4_SampleDescription* parent, AP4_String& codec)
 {
+    char workspace[64];
+    
+    AP4_UI32 format = parent->GetFormat();
+    if (format == AP4_ATOM_TYPE_DVAV ||
+        format == AP4_ATOM_TYPE_DVA1 ||
+        format == AP4_ATOM_TYPE_DVHE ||
+        format == AP4_ATOM_TYPE_DVH1) {
+        /* Non backward-compatible */
+        char coding[5];
+        AP4_FormatFourChars(coding, format);
+        AP4_FormatString(workspace,
+                         sizeof(workspace),
+                         "%s.%02d.%02d",
+                         coding,
+                         GetDvProfile(),
+                         GetDvLevel());
+        codec = workspace;
+    } else {
+        /* Backward-compatible */
+        switch (format) {
+          case AP4_ATOM_TYPE_AVC1:
+            format = AP4_ATOM_TYPE_DVA1;
+            break;
+
+          case AP4_ATOM_TYPE_AVC3:
+            format = AP4_ATOM_TYPE_DVAV;
+            break;
+
+          case AP4_ATOM_TYPE_HEV1:
+            format = AP4_ATOM_TYPE_DVHE;
+            break;
+
+          case AP4_ATOM_TYPE_HVC1:
+            format = AP4_ATOM_TYPE_DVH1;
+            break;
+        }
+        char coding[5];
+        AP4_FormatFourChars(coding, format);
+        AP4_String parent_codec;
+        parent->GetCodecString(parent_codec);
+        AP4_FormatString(workspace,
+                         sizeof(workspace),
+                         "%s,%s.%02d.%02d",
+                         parent_codec.GetChars(),
+                         coding,
+                         GetDvProfile(),
+                         GetDvLevel());
+        codec = workspace;
+    }
+    
+    return AP4_SUCCESS;
 }
 
 /*----------------------------------------------------------------------
@@ -129,6 +195,7 @@
     payload[1] = m_DvVersionMinor;
     payload[2] = (m_DvProfile<<1) | ((m_DvLevel&0x20)>>5);
     payload[3] = (m_DvLevel<<3) | (m_RpuPresentFlag?4:0) | (m_ElPresentFlag?2:0) | (m_BlPresentFlag?1:0);
+    payload[4] = m_DvBlSignalCompatibilityID<<4;
     
     return stream.Write(payload, 24);
 }
@@ -152,5 +219,6 @@
     inspector.AddField("rpu_present_flag", m_RpuPresentFlag);
     inspector.AddField("el_present_flag",  m_ElPresentFlag);
     inspector.AddField("bl_present_flag",  m_BlPresentFlag);
+    inspector.AddField("dv_bl_signal_compatibility_id", m_DvBlSignalCompatibilityID);
     return AP4_SUCCESS;
 }

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4DvccAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4DvccAtom.h Changed

@@ -36,6 +36,11 @@
 #include "Ap4Array.h"
 
 /*----------------------------------------------------------------------
+|   class references
++---------------------------------------------------------------------*/
+class AP4_SampleDescription;
+
+/*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
 const AP4_UI08 AP4_DV_PROFILE_DVAV_PER = 0;
@@ -46,6 +51,8 @@
 const AP4_UI08 AP4_DV_PROFILE_DVHE_STN = 5;
 const AP4_UI08 AP4_DV_PROFILE_DVHE_DTH = 6;
 const AP4_UI08 AP4_DV_PROFILE_DVHE_DTB = 7;
+const AP4_UI08 AP4_DV_PROFILE_DVHE_ST  = 8;
+const AP4_UI08 AP4_DV_PROFILE_DVHE_SE  = 9;
 
 /*----------------------------------------------------------------------
 |   AP4_DvccAtom
@@ -67,7 +74,8 @@
                  AP4_UI08 dv_level,
                  bool     rpu_present_flag,
                  bool     el_present_flag,
-                 bool     bl_present_flag);
+                 bool     bl_present_flag,
+                 AP4_UI08 dv_bl_signal_compatibility_id);
     
     // methods
     virtual AP4_Result InspectFields(AP4_AtomInspector& inspector);
@@ -81,6 +89,10 @@
     bool     GetRpuPresentFlag() { return m_RpuPresentFlag != 0; }
     bool     GetElPresentFlag()  { return m_ElPresentFlag  != 0; }
     bool     GetBlPresentFlag()  { return m_BlPresentFlag  != 0; }
+    AP4_UI08 GetDvBlSignalCompatibilityID() { return m_DvBlSignalCompatibilityID; }
+
+    // helpers
+    AP4_Result GetCodecString(AP4_SampleDescription* parent, AP4_String& codec);
 
 private:
     // members
@@ -91,6 +103,7 @@
     AP4_UI08 m_RpuPresentFlag;
     AP4_UI08 m_ElPresentFlag;
     AP4_UI08 m_BlPresentFlag;
+    AP4_UI08 m_DvBlSignalCompatibilityID;
 };
 
 #endif // _AP4_DVCC_ATOM_H_

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4File.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4File.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4LinearReader.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4LinearReader.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4MdhdAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4MdhdAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4MdhdAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4MdhdAtom.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Movie.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Movie.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Movie.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Movie.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Mpeg2Ts.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Mpeg2Ts.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4MvhdAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4MvhdAtom.cpp Changed

@@ -55,13 +55,13 @@
 /*----------------------------------------------------------------------
 |   AP4_MvhdAtom::AP4_MvhdAtom
 +---------------------------------------------------------------------*/
-AP4_MvhdAtom::AP4_MvhdAtom(AP4_UI32 creation_time,
-                           AP4_UI32 modification_time,
+AP4_MvhdAtom::AP4_MvhdAtom(AP4_UI64 creation_time,
+                           AP4_UI64 modification_time,
                            AP4_UI32 time_scale,
                            AP4_UI64 duration,
                            AP4_UI32 rate,
                            AP4_UI16 volume) :
-    AP4_Atom(AP4_ATOM_TYPE_MVHD, AP4_FULL_ATOM_HEADER_SIZE+96, 0, 0),
+    AP4_Atom(AP4_ATOM_TYPE_MVHD, AP4_FULL_ATOM_HEADER_SIZE + 96, 0, 0),
     m_CreationTime(creation_time),
     m_ModificationTime(modification_time),
     m_TimeScale(time_scale),
@@ -84,7 +84,9 @@
     AP4_SetMemory(m_Reserved2, 0, sizeof(m_Reserved2));
     AP4_SetMemory(m_Predefined, 0, sizeof(m_Predefined));
 
-    if (duration > 0xFFFFFFFF) {
+    if (duration          > 0xFFFFFFFFULL ||
+        creation_time     > 0xFFFFFFFFULL ||
+        modification_time > 0xFFFFFFFFULL) {
         m_Version = 1;
         m_Size32 += 12;
     }

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4MvhdAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4MvhdAtom.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Protection.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Protection.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SaioAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SaioAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SaizAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SaizAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SampleDescription.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SampleDescription.cpp Changed

@@ -36,6 +36,7 @@
 #include "Ap4AvccAtom.h"
 #include "Ap4HvccAtom.h"
 #include "Ap4VpccAtom.h"
+#include "Ap4Av1cAtom.h"
 #include "Ap4Utils.h"
 #include "Ap4Mp4AudioInfo.h"
 
@@ -54,6 +55,7 @@
 AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_MpegSystemSampleDescription)
 AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_AvcSampleDescription)
 AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_HevcSampleDescription)
+AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_Av1SampleDescription)
 AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_SubtitleSampleDescription)
 
 /*----------------------------------------------------------------------
@@ -77,6 +79,7 @@
         case AP4_SAMPLE_FORMAT_HVC1: return "H.265";
         case AP4_SAMPLE_FORMAT_DVH1: return "Dolby Vision (H.265)";
         case AP4_SAMPLE_FORMAT_DVHE: return "Dolby Vision (H.265)";
+        case AP4_SAMPLE_FORMAT_AV01: return "AV1";
         case AP4_SAMPLE_FORMAT_OVC1: return "VC-1";
         case AP4_SAMPLE_FORMAT_OWMA: return "WMA";
         case AP4_SAMPLE_FORMAT_AC_3: return "Dolby Digital (AC-3)";
@@ -277,6 +280,21 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_GenericVideoSampleDescription::GetCodecString
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_GenericVideoSampleDescription::GetCodecString(AP4_String& codec)
+{
+    // VPx override
+    AP4_VpccAtom* vpcc = AP4_DYNAMIC_CAST(AP4_VpccAtom, m_Details.GetChild(AP4_ATOM_TYPE_VPCC));
+    if (vpcc) {
+        return vpcc->GetCodecString(GetFormat(), codec);
+    }
+
+    return AP4_SampleDescription::GetCodecString(codec);
+}
+
+/*----------------------------------------------------------------------
 |   AP4_GenericVideoSampleDescription
 +---------------------------------------------------------------------*/
 AP4_Atom*
@@ -309,6 +327,9 @@
                                                    AP4_UI08     level,
                                                    AP4_UI08     profile_compatibility,
                                                    AP4_UI08     length_size,
+                                                   AP4_UI08     chroma_format,
+                                                   AP4_UI08     bit_depth_luma_minus8,
+                                                   AP4_UI08     bit_depth_chroma_minus8,
                                                    const AP4_Array<AP4_DataBuffer>& sequence_parameters,
                                                    const AP4_Array<AP4_DataBuffer>& picture_parameters) :
     AP4_SampleDescription(TYPE_AVC, format, NULL),
@@ -318,6 +339,9 @@
                                   level, 
                                   profile_compatibility,
                                   length_size,
+                                  chroma_format,
+                                  bit_depth_luma_minus8,
+                                  bit_depth_chroma_minus8,
                                   sequence_parameters,
                                   picture_parameters);
     m_Details.AddChild(m_AvccAtom);
@@ -372,6 +396,12 @@
 +---------------------------------------------------------------------*/
 AP4_Result
 AP4_AvcSampleDescription::GetCodecString(AP4_String& codec) {
+    // Dolby Vision override
+    AP4_DvccAtom* dvcc = AP4_DYNAMIC_CAST(AP4_DvccAtom, m_Details.GetChild(AP4_ATOM_TYPE_DVCC));
+    if (dvcc) {
+        return dvcc->GetCodecString(this, codec);
+    }
+    
     char coding[5];
     AP4_FormatFourChars(coding, GetFormat());
     char workspace[64];
@@ -402,6 +432,57 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_AvcDoviSampleDescription::AP4_AvcDoviSampleDescription
++---------------------------------------------------------------------*/
+AP4_AvcDoviSampleDescription::AP4_AvcDoviSampleDescription(AP4_UI32                         format,
+                                                           AP4_UI16                         width,
+                                                           AP4_UI16                         height,
+                                                           AP4_UI16                         depth,
+                                                           const char*                      compressor_name,
+                                                           AP4_UI08                         profile,
+                                                           AP4_UI08                         level,
+                                                           AP4_UI08                         profile_compatibility,
+                                                           AP4_UI08                         length_size,
+                                                           const AP4_Array<AP4_DataBuffer>& sequence_parameters,
+                                                           const AP4_Array<AP4_DataBuffer>& picture_parameters,
+                                                           AP4_UI08                         chroma_format,
+                                                           AP4_UI08                         bit_depth_luma_minus8,
+                                                           AP4_UI08                         bit_depth_chroma_minus8,
+                                                           AP4_UI08                         dv_version_major,
+                                                           AP4_UI08                         dv_version_minor,
+                                                           AP4_UI08                         dv_profile,
+                                                           AP4_UI08                         dv_level,
+                                                           bool                             rpu_present_flag,
+                                                           bool                             el_present_flag,
+                                                           bool                             bl_present_flag,
+                                                           AP4_UI08                         dv_bl_signal_compatibility_id) :
+    AP4_AvcSampleDescription(format,
+                             width,
+                             height,
+                             depth,
+                             compressor_name,
+                             profile,
+                             level,
+                             profile_compatibility,
+                             length_size,
+                             chroma_format,
+                             bit_depth_luma_minus8,
+                             bit_depth_chroma_minus8,
+                             sequence_parameters,
+                             picture_parameters)
+{
+    m_DvccAtom = new AP4_DvccAtom(dv_version_major,
+                                  dv_version_minor,
+                                  dv_profile,
+                                  dv_level,
+                                  rpu_present_flag,
+                                  el_present_flag,
+                                  bl_present_flag,
+                                  dv_bl_signal_compatibility_id);
+    m_Details.AddChild(m_DvccAtom);
+}
+
+/*----------------------------------------------------------------------
 |   AP4_HevcSampleDescription::AP4_HevcSampleDescription
 +---------------------------------------------------------------------*/
 AP4_HevcSampleDescription::AP4_HevcSampleDescription(AP4_UI32            format,
@@ -525,6 +606,12 @@
 +---------------------------------------------------------------------*/
 AP4_Result
 AP4_HevcSampleDescription::GetCodecString(AP4_String& codec) {
+    // Dolby Vision override
+    AP4_DvccAtom* dvcc = AP4_DYNAMIC_CAST(AP4_DvccAtom, m_Details.GetChild(AP4_ATOM_TYPE_DVCC));
+    if (dvcc) {
+        return dvcc->GetCodecString(this, codec);
+    }
+
     char coding[5];
     AP4_FormatFourChars(coding, GetFormat());
     char profile_space[2] = {0,0};
@@ -566,6 +653,218 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_HevcDoviSampleDescription::AP4_HevcDoviSampleDescription
++---------------------------------------------------------------------*/
+AP4_HevcDoviSampleDescription::AP4_HevcDoviSampleDescription(AP4_UI32                         format,
+                                                             AP4_UI16                         width,
+                                                             AP4_UI16                         height,
+                                                             AP4_UI16                         depth,
+                                                             const char*                      compressor_name,
+                                                             AP4_UI08                         general_profile_space,
+                                                             AP4_UI08                         general_tier_flag,
+                                                             AP4_UI08                         general_profile,
+                                                             AP4_UI32                         general_profile_compatibility_flags,
+                                                             AP4_UI64                         general_constraint_indicator_flags,
+                                                             AP4_UI08                         general_level,
+                                                             AP4_UI32                         min_spatial_segmentation,
+                                                             AP4_UI08                         parallelism_type,
+                                                             AP4_UI08                         chroma_format,
+                                                             AP4_UI08                         luma_bit_depth,
+                                                             AP4_UI08                         chroma_bit_depth,
+                                                             AP4_UI16                         average_frame_rate,
+                                                             AP4_UI08                         constant_frame_rate,
+                                                             AP4_UI08                         num_temporal_layers,
+                                                             AP4_UI08                         temporal_id_nested,
+                                                             AP4_UI08                         nalu_length_size,
+                                                             const AP4_Array<AP4_DataBuffer>& video_parameters,
+                                                             AP4_UI08                         video_parameters_completeness,
+                                                             const AP4_Array<AP4_DataBuffer>& sequence_parameters,
+                                                             AP4_UI08                         sequence_parameters_completeness,
+                                                             const AP4_Array<AP4_DataBuffer>& picture_parameters,
+                                                             AP4_UI08                         picture_parameters_completeness,
+                                                             AP4_UI08                         dv_version_major,
+                                                             AP4_UI08                         dv_version_minor,
+                                                             AP4_UI08                         dv_profile,
+                                                             AP4_UI08                         dv_level,
+                                                             bool                             rpu_present_flag,
+                                                             bool                             el_present_flag,
+                                                             bool                             bl_present_flag,
+                                                             AP4_UI08                         dv_bl_signal_compatibility_id) :
+    AP4_HevcSampleDescription(format,
+                              width,
+                              height,
+                              depth,
+                              compressor_name,
+                              general_profile_space,
+                              general_tier_flag,
+                              general_profile,
+                              general_profile_compatibility_flags,
+                              general_constraint_indicator_flags,
+                              general_level,
+                              min_spatial_segmentation,
+                              parallelism_type,
+                              chroma_format,
+                              luma_bit_depth,
+                              chroma_bit_depth,
+                              average_frame_rate,
+                              constant_frame_rate,
+                              num_temporal_layers,
+                              temporal_id_nested,
+                              nalu_length_size,
+                              video_parameters,
+                              video_parameters_completeness,
+                              sequence_parameters,
+                              sequence_parameters_completeness,
+                              picture_parameters,
+                              picture_parameters_completeness)
+{
+    m_DvccAtom = new AP4_DvccAtom(dv_version_major,
+                                  dv_version_minor,
+                                  dv_profile,
+                                  dv_level,
+                                  rpu_present_flag,
+                                  el_present_flag,
+                                  bl_present_flag,
+                                  dv_bl_signal_compatibility_id);
+    m_Details.AddChild(m_DvccAtom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1SampleDescription::AP4_Av1SampleDescription
++---------------------------------------------------------------------*/
+AP4_Av1SampleDescription::AP4_Av1SampleDescription(AP4_UI32        format,
+                                                   AP4_UI16        width,
+                                                   AP4_UI16        height,
+                                                   AP4_UI16        depth,
+                                                   const char*     compressor_name,
+                                                   AP4_UI08        version,
+                                                   AP4_UI08        seq_profile,
+                                                   AP4_UI08        seq_level_idx_0,
+                                                   AP4_UI08        seq_tier_0,
+                                                   AP4_UI08        high_bitdepth,
+                                                   AP4_UI08        twelve_bit,
+                                                   AP4_UI08        monochrome,
+                                                   AP4_UI08        chroma_subsampling_x,
+                                                   AP4_UI08        chroma_subsampling_y,
+                                                   AP4_UI08        chroma_sample_position,
+                                                   AP4_UI08        initial_presentation_delay_present,
+                                                   AP4_UI08        initial_presentation_delay_minus_one,
+                                                   const AP4_UI08* config_obus,
+                                                   AP4_Size        config_obus_size) :
+    AP4_SampleDescription(TYPE_AV1, format, NULL),
+    AP4_VideoSampleDescription(width, height, depth, compressor_name)
+{
+    m_Av1cAtom = new AP4_Av1cAtom(version,
+                                  seq_profile,
+                                  seq_level_idx_0,
+                                  seq_tier_0,
+                                  high_bitdepth,
+                                  twelve_bit,
+                                  monochrome,
+                                  chroma_subsampling_x,
+                                  chroma_subsampling_y,
+                                  chroma_sample_position,
+                                  initial_presentation_delay_present,
+                                  initial_presentation_delay_minus_one,
+                                  config_obus,
+                                  config_obus_size);
+    m_Details.AddChild(m_Av1cAtom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1SampleDescription::AP4_Av1SampleDescription
++---------------------------------------------------------------------*/
+AP4_Av1SampleDescription::AP4_Av1SampleDescription(AP4_UI32            format,
+                                                   AP4_UI16            width,
+                                                   AP4_UI16            height,
+                                                   AP4_UI16            depth,
+                                                   const char*         compressor_name,
+                                                   const AP4_Av1cAtom* av1c) :
+    AP4_SampleDescription(TYPE_AV1, format, NULL),
+    AP4_VideoSampleDescription(width, height, depth, compressor_name)
+{
+    if (av1c) {
+        m_Av1cAtom = new AP4_Av1cAtom(*av1c);
+    } else {
+        // should never happen
+        m_Av1cAtom = new AP4_Av1cAtom();
+    }
+    m_Details.AddChild(m_Av1cAtom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1SampleDescription::AP4_Av1SampleDescription
++---------------------------------------------------------------------*/
+AP4_Av1SampleDescription::AP4_Av1SampleDescription(AP4_UI32        format,
+                                                   AP4_UI16        width,
+                                                   AP4_UI16        height,
+                                                   AP4_UI16        depth,
+                                                   const char*     compressor_name,
+                                                   AP4_AtomParent* details) :
+    AP4_SampleDescription(TYPE_AV1, format, details),
+    AP4_VideoSampleDescription(width, height, depth, compressor_name),
+    m_Av1cAtom(NULL)
+{
+    AP4_Av1cAtom* av1c = AP4_DYNAMIC_CAST(AP4_Av1cAtom, m_Details.GetChild(AP4_ATOM_TYPE_AV1C));
+    if (av1c) {
+        m_Av1cAtom = av1c;
+    } else {
+        // shoud never happen
+        m_Av1cAtom = new AP4_Av1cAtom();
+        m_Details.AddChild(m_Av1cAtom);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1cSampleDescription::GetCodecString
++---------------------------------------------------------------------*/
+AP4_Result
+AP4_Av1SampleDescription::GetCodecString(AP4_String& codec) {
+    AP4_UI08 bit_depth = 10;
+    AP4_UI08 color_primaries = 1;
+    AP4_UI08 transfer_characteristics = 1;
+    AP4_UI08 matrix_coefficients = 1;
+    AP4_UI08 video_full_range_flag = 0;
+    char coding[5];
+    AP4_FormatFourChars(coding, GetFormat());
+    char workspace[64];
+    AP4_FormatString(workspace,
+                     sizeof(workspace),
+                     "%s.%d.%02d%c.%02d.%d.%d%d%d.%02d.%02d.%02d.%d",
+                     coding,
+                     this->GetSeqProfile(),
+                     this->GetSeqLevelIdx0() >> 4,
+                     this->GetSeqTier0() == 0 ? 'M' : 'H',
+                     bit_depth,
+                     this->GetMonochrome(),
+                     this->GetChromaSubsamplingX(),
+                     this->GetChromaSubsamplingY(),
+                     (this->GetChromaSubsamplingX() == 1 && this->GetChromaSubsamplingY() == 1) ?
+                     this->GetChromaSamplePosition() : 0,
+                     color_primaries,
+                     transfer_characteristics,
+                     matrix_coefficients,
+                     video_full_range_flag);
+    codec = workspace;
+    
+    return AP4_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1SampleDescription::ToAtom
++---------------------------------------------------------------------*/
+AP4_Atom*
+AP4_Av1SampleDescription::ToAtom() const
+{
+    return new AP4_Av1SampleEntry(m_Format,
+                                  m_Width,
+                                  m_Height,
+                                  m_Depth,
+                                  m_CompressorName.GetChars(),
+                                  &m_Details);
+}
+
+/*----------------------------------------------------------------------
 |   AP4_MpegSampleDescription::AP4_MpegSampleDescription
 +---------------------------------------------------------------------*/
 AP4_MpegSampleDescription::AP4_MpegSampleDescription(AP4_UI32      format,
@@ -793,6 +1092,227 @@
 }
 
 /*----------------------------------------------------------------------
+ |   AP4_Ac3SampleDescription::AP4_Ac3SampleDescription
+ +---------------------------------------------------------------------*/
+AP4_Ac3SampleDescription::AP4_Ac3SampleDescription(AP4_UI32            sample_rate,
+                                                   AP4_UI16            sample_size,
+                                                   AP4_UI16            channel_count,
+                                                   const AP4_Dac3Atom* dac3):
+    AP4_SampleDescription(TYPE_AC3, AP4_SAMPLE_FORMAT_AC_3, NULL),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count)
+{
+    if (dac3) {
+        m_Dac3Atom = new AP4_Dac3Atom(*dac3);
+    } else {
+        // TODO: add default construtor, m_Dac3Atom = new AP4_Dac3Atom() / should never happen
+        m_Dac3Atom = NULL;
+    }
+    m_Details.AddChild(m_Dac3Atom);
+}
+
+/*----------------------------------------------------------------------
+ |   AP4_Ac3SampleDescription::AP4_Ac3SampleDescription
+ +---------------------------------------------------------------------*/
+AP4_Ac3SampleDescription::AP4_Ac3SampleDescription(AP4_UI32        sample_rate,
+                                                   AP4_UI16        sample_size,
+                                                   AP4_UI16        channel_count,
+                                                   AP4_AtomParent* details) :
+    AP4_SampleDescription(TYPE_AC3, AP4_SAMPLE_FORMAT_AC_3, details),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count),
+m_Dac3Atom(NULL)
+{
+    AP4_Dac3Atom* ac3 = AP4_DYNAMIC_CAST(AP4_Dac3Atom, m_Details.GetChild(AP4_SAMPLE_FORMAT_AC_3));
+    if (ac3) {
+        m_Dac3Atom = ac3;
+    } else {
+        // TODO: add default construtor, m_Dac3Atom = new AP4_Dac3Atom() / should never happen
+        m_Dac3Atom = NULL;
+        m_Details.AddChild(m_Dac3Atom);
+    }
+}
+
+/*----------------------------------------------------------------------
+ |   AP4_Ac3SampleDescription::AP4_Ac3SampleDescription
+ +---------------------------------------------------------------------*/
+
+AP4_Ac3SampleDescription::AP4_Ac3SampleDescription(AP4_UI32                        sample_rate,
+                                                   AP4_UI16                        sample_size,
+                                                   AP4_UI16                        channel_count,
+                                                   AP4_UI32                        size,
+                                                   const AP4_Dac3Atom::StreamInfo* ac3_stream_info):
+    AP4_SampleDescription(TYPE_AC3, AP4_SAMPLE_FORMAT_AC_3, NULL),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count)
+{
+    m_Dac3Atom = new AP4_Dac3Atom(ac3_stream_info);
+    m_Details.AddChild(m_Dac3Atom);
+}
+
+/*----------------------------------------------------------------------
+ |   AP4_Ac3SampleDescription::ToAtom
+ +---------------------------------------------------------------------*/
+
+AP4_Atom*
+AP4_Ac3SampleDescription::ToAtom() const
+{
+    return new AP4_Ac3SampleEntry(m_Format,
+                                  m_SampleRate<<16,
+                                  m_SampleSize,
+                                  m_ChannelCount,
+                                  &m_Details);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleDescription::AP4_Eac3SampleDescription
++---------------------------------------------------------------------*/
+AP4_Eac3SampleDescription::AP4_Eac3SampleDescription():
+    AP4_SampleDescription(TYPE_EAC3, AP4_SAMPLE_FORMAT_EC_3, NULL),
+    AP4_AudioSampleDescription(48000, 16, 2)
+{
+    m_Details.AddChild(new AP4_Dec3Atom());
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleDescription::AP4_Eac3SampleDescription
++---------------------------------------------------------------------*/
+AP4_Eac3SampleDescription::AP4_Eac3SampleDescription(AP4_UI32            sample_rate, 
+                                                     AP4_UI16            sample_size,
+                                                     AP4_UI16            channel_count,
+                                                     const AP4_Dec3Atom* dec3):
+    AP4_SampleDescription(TYPE_EAC3, AP4_SAMPLE_FORMAT_EC_3, NULL),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count)
+{
+    if (dec3) {
+        m_Dec3Atom = new AP4_Dec3Atom(*dec3);
+    } else {
+        // shoud never happen
+        m_Dec3Atom = new AP4_Dec3Atom();
+    }
+    m_Details.AddChild(m_Dec3Atom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleDescription::AP4_Eac3SampleDescription
++---------------------------------------------------------------------*/
+AP4_Eac3SampleDescription::AP4_Eac3SampleDescription(AP4_UI32        sample_rate, 
+                                                     AP4_UI16        sample_size,
+                                                     AP4_UI16        channel_count,
+                                                     AP4_AtomParent* details) :
+    AP4_SampleDescription(TYPE_EAC3, AP4_SAMPLE_FORMAT_EC_3, details),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count),
+    m_Dec3Atom(NULL)
+{
+    AP4_Dec3Atom* eac3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, m_Details.GetChild(AP4_SAMPLE_FORMAT_EC_3));
+    if (eac3) {
+        m_Dec3Atom = eac3;
+    } else {
+        // shoud never happen
+        m_Dec3Atom = new AP4_Dec3Atom();
+        m_Details.AddChild(m_Dec3Atom);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleDescription::AP4_Eac3SampleDescription
++---------------------------------------------------------------------*/
+
+AP4_Eac3SampleDescription::AP4_Eac3SampleDescription(AP4_UI32                       sample_rate, 
+                                                     AP4_UI16                       sample_size,
+                                                     AP4_UI16                       channel_count,
+                                                     AP4_UI32                       size,
+                                                     const AP4_Dec3Atom::SubStream* subStream,
+                                                     const AP4_UI32                 complexity_index_type_a):
+    AP4_SampleDescription(TYPE_EAC3, AP4_SAMPLE_FORMAT_EC_3, NULL),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count)
+{
+    m_Dec3Atom = new AP4_Dec3Atom(size, subStream, complexity_index_type_a);
+    m_Details.AddChild(m_Dec3Atom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleDescription::ToAtom
++---------------------------------------------------------------------*/
+
+AP4_Atom*
+AP4_Eac3SampleDescription::ToAtom() const
+{
+    return new AP4_Eac3SampleEntry(m_Format,
+                                   m_SampleRate<<16,
+                                   m_SampleSize,
+                                   m_ChannelCount,
+                                   &m_Details);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleDescription::AP4_Ac4SampleDescription
++---------------------------------------------------------------------*/
+AP4_Ac4SampleDescription::AP4_Ac4SampleDescription(AP4_UI32            sample_rate, 
+                                                   AP4_UI16            sample_size,
+                                                   AP4_UI16            channel_count,
+                                                   const AP4_Dac4Atom* dac4):
+    AP4_SampleDescription(TYPE_AC4, AP4_SAMPLE_FORMAT_AC_4, NULL),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count)
+{
+    if (dac4) {
+        m_Dac4Atom = dac4->CloneConst();
+;
+    } else {
+        // TODO: add default construtor, m_Dac4Atom = new AP4_Dac4Atom() / should never happen
+        m_Dac4Atom = NULL;
+    }
+    m_Details.AddChild(m_Dac4Atom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleDescription::AP4_Ac4SampleDescription
++---------------------------------------------------------------------*/
+AP4_Ac4SampleDescription::AP4_Ac4SampleDescription(AP4_UI32        sample_rate, 
+                                                   AP4_UI16        sample_size,
+                                                   AP4_UI16        channel_count,
+                                                   AP4_AtomParent* details) :
+    AP4_SampleDescription(TYPE_AC4, AP4_SAMPLE_FORMAT_AC_4, details),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count),
+    m_Dac4Atom(NULL)
+{
+    AP4_Dac4Atom* ac4 = AP4_DYNAMIC_CAST(AP4_Dac4Atom, m_Details.GetChild(AP4_ATOM_TYPE_AC_4));
+    if (ac4) {
+        m_Dac4Atom = ac4;
+    } else {
+        // TODO: add default construtor, m_Dac4Atom = new AP4_Dac4Atom() / should never happen
+        m_Dac4Atom = NULL;
+        m_Details.AddChild(m_Dac4Atom);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleDescription::AP4_Ac4SampleDescription
++---------------------------------------------------------------------*/
+AP4_Ac4SampleDescription::AP4_Ac4SampleDescription(AP4_UI32                    sample_rate, 
+                                                   AP4_UI16                    sample_size,
+                                                   AP4_UI16                    channel_count,
+                                                   AP4_UI32                    size,
+                                                   const AP4_Dac4Atom::Ac4Dsi* ac4Dsi):
+    AP4_SampleDescription(TYPE_AC4, AP4_SAMPLE_FORMAT_AC_4, NULL),
+    AP4_AudioSampleDescription(sample_rate, sample_size, channel_count)
+{
+    m_Dac4Atom = new AP4_Dac4Atom(size, ac4Dsi);
+    m_Details.AddChild(m_Dac4Atom);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleDescription::ToAtom
++---------------------------------------------------------------------*/
+
+AP4_Atom*
+AP4_Ac4SampleDescription::ToAtom() const
+{
+    return new AP4_Ac4SampleEntry(m_Format,
+                                  m_SampleRate<<16,
+                                  m_SampleSize,
+                                  m_ChannelCount,
+                                  &m_Details);
+}
+
+/*----------------------------------------------------------------------
 |   AP4_MpegVideoSampleDescription::AP4_MpegVideoSampleDescription
 +---------------------------------------------------------------------*/
 AP4_MpegVideoSampleDescription::AP4_MpegVideoSampleDescription(
@@ -853,7 +1373,7 @@
     switch (type) {
         case AP4_STREAM_TYPE_FORBIDDEN: return "INVALID"; 
         case AP4_STREAM_TYPE_OD:        return "Object Descriptor";
-        case AP4_STREAM_TYPE_CR:        return "CR";	
+        case AP4_STREAM_TYPE_CR:        return "CR";
         case AP4_STREAM_TYPE_BIFS:      return "BIFS";
         case AP4_STREAM_TYPE_VISUAL:    return "Visual";
         case AP4_STREAM_TYPE_AUDIO:     return "Audio";
@@ -955,6 +1475,8 @@
         case AP4_MPEG4_AUDIO_OBJECT_TYPE_ER_AAC_ELD:              return "Error Resilient AAC ELD";
         case AP4_MPEG4_AUDIO_OBJECT_TYPE_SMR_SIMPLE:              return "SMR Simple";
         case AP4_MPEG4_AUDIO_OBJECT_TYPE_SMR_MAIN:                return "SMR Main";
+        case AP4_MPEG4_AUDIO_OBJECT_TYPE_USAC:                    return "USAC";
+        case AP4_MPEG4_AUDIO_OBJECT_TYPE_SAOC:                    return "SAOC";
         default:                                                  return "UNKNOWN";
     }
 }

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SampleDescription.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SampleDescription.h Changed

@@ -39,7 +39,12 @@
 #include "Ap4Array.h"
 #include "Ap4AvccAtom.h"
 #include "Ap4HvccAtom.h"
+#include "Ap4Av1cAtom.h"
 #include "Ap4DynamicCast.h"
+#include "Ap4Dac4Atom.h"
+#include "Ap4Dec3Atom.h"
+#include "Ap4Dac3Atom.h"
+#include "Ap4DvccAtom.h"
 
 /*----------------------------------------------------------------------
 |   class references
@@ -63,6 +68,7 @@
 const AP4_UI32 AP4_SAMPLE_FORMAT_HEV1 = AP4_ATOM_TYPE('h','e','v','1');
 const AP4_UI32 AP4_SAMPLE_FORMAT_DVHE = AP4_ATOM_TYPE('d','v','h','e');
 const AP4_UI32 AP4_SAMPLE_FORMAT_DVH1 = AP4_ATOM_TYPE('d','v','h','1');
+const AP4_UI32 AP4_SAMPLE_FORMAT_AV01 = AP4_ATOM_TYPE('a','v','0','1');
 const AP4_UI32 AP4_SAMPLE_FORMAT_ALAC = AP4_ATOM_TYPE('a','l','a','c');
 const AP4_UI32 AP4_SAMPLE_FORMAT_OWMA = AP4_ATOM_TYPE('o','w','m','a');
 const AP4_UI32 AP4_SAMPLE_FORMAT_OVC1 = AP4_ATOM_TYPE('o','v','c','1');
@@ -117,9 +123,13 @@
         TYPE_UNKNOWN   = 0x00,
         TYPE_MPEG      = 0x01,
         TYPE_PROTECTED = 0x02,
-        TYPE_AVC       = 0x03,
-        TYPE_HEVC      = 0x04,
-        TYPE_SUBTITLES = 0x05
+        TYPE_SUBTITLES = 0x03,
+        TYPE_AVC       = 0x04,
+        TYPE_HEVC      = 0x05,
+        TYPE_AV1       = 0x06,
+        TYPE_AC3       = 0x07,
+        TYPE_EAC3      = 0x08,
+        TYPE_AC4       = 0x09
     };
 
     // constructors & destructor
@@ -272,7 +282,8 @@
         AP4_VideoSampleDescription(width, height, depth, compressor_name) {}
     
     // inherited from AP4_SampleDescription
-    virtual AP4_Atom* ToAtom() const;    
+    virtual AP4_Atom*  ToAtom() const;
+    virtual AP4_Result GetCodecString(AP4_String& codec);
 };
 
 /*----------------------------------------------------------------------
@@ -308,6 +319,9 @@
                              AP4_UI08                         level,
                              AP4_UI08                         profile_compatibility,
                              AP4_UI08                         nalu_length_size,
+                             AP4_UI08                         chroma_format,
+                             AP4_UI08                         bit_depth_luma_minus8,
+                             AP4_UI08                         bit_depth_chroma_minus8,
                              const AP4_Array<AP4_DataBuffer>& sequence_parameters,
                              const AP4_Array<AP4_DataBuffer>& picture_parameters);
     
@@ -320,6 +334,9 @@
     AP4_Array<AP4_DataBuffer>& GetSequenceParameters() {return m_AvccAtom->GetSequenceParameters(); }
     AP4_Array<AP4_DataBuffer>& GetPictureParameters() { return m_AvccAtom->GetPictureParameters(); }
     const AP4_DataBuffer& GetRawBytes() const { return m_AvccAtom->GetRawBytes(); }
+    AP4_UI08 GetChromaFormat() const { return m_AvccAtom->GetChromaFormat(); }
+    AP4_UI08 GetBitDepthLumaMinus8() const { return m_AvccAtom->GetBitDepthLumaMinus8(); }
+    AP4_UI08 GetBitDepthChromaMinus8() const { return m_AvccAtom->GetBitDepthChromaMinus8(); }
     
     // inherited from AP4_SampleDescription
     virtual AP4_Atom* ToAtom() const;
@@ -335,6 +352,38 @@
 };
 
 /*----------------------------------------------------------------------
+|   AP4_AvcDoviSampleDescription
++---------------------------------------------------------------------*/
+class AP4_AvcDoviSampleDescription : public AP4_AvcSampleDescription
+{
+public:
+        AP4_AvcDoviSampleDescription(AP4_UI32                         format,
+                                     AP4_UI16                         width,
+                                     AP4_UI16                         height,
+                                     AP4_UI16                         depth,
+                                     const char*                      compressor_name,
+                                     AP4_UI08                         profile,
+                                     AP4_UI08                         level,
+                                     AP4_UI08                         profile_compatibility,
+                                     AP4_UI08                         nalu_length_size,
+                                     const AP4_Array<AP4_DataBuffer>& sequence_parameters,
+                                     const AP4_Array<AP4_DataBuffer>& picture_parameters,
+                                     AP4_UI08                         chroma_format,
+                                     AP4_UI08                         bit_depth_luma_minus8,
+                                     AP4_UI08                         bit_depth_chroma_minus8,
+                                     AP4_UI08                         dv_version_major,
+                                     AP4_UI08                         dv_version_minor,
+                                     AP4_UI08                         dv_profile,
+                                     AP4_UI08                         dv_level,
+                                     bool                             rpu_present_flag,
+                                     bool                             el_present_flag,
+                                     bool                             bl_present_flag,
+                                     AP4_UI08                         dv_bl_signal_compatibility_id);
+private:
+    AP4_DvccAtom* m_DvccAtom;
+};
+
+/*----------------------------------------------------------------------
 |   AP4_HevcSampleDescription
 +---------------------------------------------------------------------*/
 class AP4_HevcSampleDescription : public AP4_SampleDescription,
@@ -421,6 +470,123 @@
 };
 
 /*----------------------------------------------------------------------
+|   AP4_HevcDoviSampleDescription
++---------------------------------------------------------------------*/
+class AP4_HevcDoviSampleDescription : public AP4_HevcSampleDescription
+{
+public:
+    AP4_HevcDoviSampleDescription(AP4_UI32                         format,
+                                  AP4_UI16                         width,
+                                  AP4_UI16                         height,
+                                  AP4_UI16                         depth,
+                                  const char*                      compressor_name,
+                                  AP4_UI08                         general_profile_space,
+                                  AP4_UI08                         general_tier_flag,
+                                  AP4_UI08                         general_profile,
+                                  AP4_UI32                         general_profile_compatibility_flags,
+                                  AP4_UI64                         general_constraint_indicator_flags,
+                                  AP4_UI08                         general_level,
+                                  AP4_UI32                         min_spatial_segmentation,
+                                  AP4_UI08                         parallelism_type,
+                                  AP4_UI08                         chroma_format,
+                                  AP4_UI08                         luma_bit_depth,
+                                  AP4_UI08                         chroma_bit_depth,
+                                  AP4_UI16                         average_frame_rate,
+                                  AP4_UI08                         constant_frame_rate,
+                                  AP4_UI08                         num_temporal_layers,
+                                  AP4_UI08                         temporal_id_nested,
+                                  AP4_UI08                         nalu_length_size,
+                                  const AP4_Array<AP4_DataBuffer>& video_parameters,
+                                  AP4_UI08                         video_parameters_completeness,
+                                  const AP4_Array<AP4_DataBuffer>& sequence_parameters,
+                                  AP4_UI08                         sequence_parameters_completeness,
+                                  const AP4_Array<AP4_DataBuffer>& picture_parameters,
+                                  AP4_UI08                         picture_parameters_completeness,
+                                  AP4_UI08                         dv_version_major,
+                                  AP4_UI08                         dv_version_minor,
+                                  AP4_UI08                         dv_profile,
+                                  AP4_UI08                         dv_level,
+                                  bool                             rpu_present_flag,
+                                  bool                             el_present_flag,
+                                  bool                             bl_present_flag,
+                                  AP4_UI08                         dv_bl_signal_compatibility_id);
+private:
+    AP4_DvccAtom* m_DvccAtom;
+};
+
+/*----------------------------------------------------------------------
+|   AP4_Av1SampleDescription
++---------------------------------------------------------------------*/
+class AP4_Av1SampleDescription : public AP4_SampleDescription,
+                                 public AP4_VideoSampleDescription
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D2(AP4_Av1SampleDescription, AP4_SampleDescription, AP4_VideoSampleDescription)
+
+    // constructors
+    AP4_Av1SampleDescription(AP4_UI32            format, // av01
+                             AP4_UI16            width,
+                             AP4_UI16            height,
+                             AP4_UI16            depth,
+                             const char*         compressor_name,
+                             const AP4_Av1cAtom* av1c);
+    
+    AP4_Av1SampleDescription(AP4_UI32        format, // av01
+                             AP4_UI16        width,
+                             AP4_UI16        height,
+                             AP4_UI16        depth,
+                             const char*     compressor_name,
+                             AP4_AtomParent* details);
+
+    AP4_Av1SampleDescription(AP4_UI32        format,
+                             AP4_UI16        width,
+                             AP4_UI16        height,
+                             AP4_UI16        depth,
+                             const char*     compressor_name,
+                             AP4_UI08        version,
+                             AP4_UI08        seq_profile,
+                             AP4_UI08        seq_level_idx_0,
+                             AP4_UI08        seq_tier_0,
+                             AP4_UI08        high_bitdepth,
+                             AP4_UI08        twelve_bit,
+                             AP4_UI08        monochrome,
+                             AP4_UI08        chroma_subsampling_x,
+                             AP4_UI08        chroma_subsampling_y,
+                             AP4_UI08        chroma_sample_position,
+                             AP4_UI08        initial_presentation_delay_present,
+                             AP4_UI08        initial_presentation_delay_minus_one,
+                             const AP4_UI08* config_obus,
+                             AP4_Size        config_obus_size);
+    
+    // accessors
+    AP4_UI08 GetSeqProfile()                       const { return m_Av1cAtom->GetSeqProfile();                       }
+    AP4_UI08 GetSeqLevelIdx0()                     const { return m_Av1cAtom->GetSeqLevelIdx0();                     }
+    AP4_UI08 GetSeqTier0()                         const { return m_Av1cAtom->GetSeqTier0();                         }
+    AP4_UI08 GetHighBitDepth()                     const { return m_Av1cAtom->GetHighBitDepth();                     }
+    AP4_UI08 GetTwelveBit()                        const { return m_Av1cAtom->GetTwelveBit();                        }
+    AP4_UI08 GetMonochrome()                       const { return m_Av1cAtom->GetMonochrome();                       }
+    AP4_UI08 GetChromaSubsamplingX()               const { return m_Av1cAtom->GetChromaSubsamplingX();               }
+    AP4_UI08 GetChromaSubsamplingY()               const { return m_Av1cAtom->GetChromaSubsamplingY();               }
+    AP4_UI08 GetChromaSamplePosition()             const { return m_Av1cAtom->GetChromaSamplePosition();             }
+    AP4_UI08 GetInitialPresentationDelayPresent()  const { return m_Av1cAtom->GetInitialPresentationDelayPresent();  }
+    AP4_UI08 GetInitialPresentationDelayMinusOne() const { return m_Av1cAtom->GetInitialPresentationDelayMinusOne(); }
+    const AP4_DataBuffer& GetConfigObus()          const { return m_Av1cAtom->GetConfigObus();                       }
+    
+    // inherited from AP4_SampleDescription
+    virtual AP4_Atom* ToAtom() const;
+    virtual AP4_Result GetCodecString(AP4_String& codec);
+    
+    // static methods
+    static const char* GetProfileName(AP4_UI08 profile) {
+        return AP4_Av1cAtom::GetProfileName(profile);
+    }
+
+private:
+    AP4_Av1cAtom* m_Av1cAtom;
+};
+
+
+/*----------------------------------------------------------------------
 |   AP4_MpegSampleDescription
 +---------------------------------------------------------------------*/
 class AP4_MpegSampleDescription : public AP4_SampleDescription
@@ -533,6 +699,110 @@
 };
 
 /*----------------------------------------------------------------------
+ |   AP4_Ac3SampleDescription
+ +---------------------------------------------------------------------*/
+class AP4_Ac3SampleDescription : public AP4_SampleDescription,
+                                 public AP4_AudioSampleDescription
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D2(AP4_Ac3SampleDescription, AP4_SampleDescription, AP4_AudioSampleDescription)
+    
+    // constructors
+    AP4_Ac3SampleDescription(AP4_UI32            sample_rate,
+                             AP4_UI16            sample_size,
+                             AP4_UI16            channel_count,
+                             const AP4_Dac3Atom* dac3Atom);
+    
+    AP4_Ac3SampleDescription(AP4_UI32        sample_rate,
+                             AP4_UI16        sample_size,
+                             AP4_UI16        channel_count,
+                             AP4_AtomParent* details);
+    
+    AP4_Ac3SampleDescription(AP4_UI32                        sample_rate,
+                             AP4_UI16                        sample_size,
+                             AP4_UI16                        channel_count,
+                             AP4_UI32                        size, // DSI size
+                             const AP4_Dac3Atom::StreamInfo* ac3_stream_info);
+
+    // inherited from AP4_SampleDescription
+    virtual AP4_Result GetCodecString(AP4_String& codec) { codec = "ac-3"; return AP4_SUCCESS; }
+    virtual AP4_Atom* ToAtom() const;
+    
+private:
+    AP4_Dac3Atom* m_Dac3Atom;
+};
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleDescription
++---------------------------------------------------------------------*/
+class AP4_Eac3SampleDescription : public AP4_SampleDescription,
+                                  public AP4_AudioSampleDescription
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D2(AP4_Eac3SampleDescription, AP4_SampleDescription, AP4_AudioSampleDescription)
+
+    // constructors
+    AP4_Eac3SampleDescription();
+    AP4_Eac3SampleDescription(AP4_UI32            sample_rate, 
+                              AP4_UI16            sample_size,
+                              AP4_UI16            channel_count,
+                              const AP4_Dec3Atom* dec3Atom);
+    
+    AP4_Eac3SampleDescription(AP4_UI32        sample_rate, 
+                              AP4_UI16        sample_size,
+                              AP4_UI16        channel_count,
+                              AP4_AtomParent* details);
+    
+    AP4_Eac3SampleDescription(AP4_UI32                       sample_rate, 
+                              AP4_UI16                       sample_size,
+                              AP4_UI16                       channel_count,
+                              AP4_UI32                       size, // DSI size
+                              const AP4_Dec3Atom::SubStream* subStream,
+                              const AP4_UI32                 complexity_index_type_a);
+    
+    // inherited from AP4_SampleDescription
+    virtual AP4_Result GetCodecString(AP4_String& codec) { codec = "ec-3"; return AP4_SUCCESS; }
+    virtual AP4_Atom* ToAtom() const;
+
+private:
+    AP4_Dec3Atom* m_Dec3Atom;
+};
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleDescription
++---------------------------------------------------------------------*/
+class AP4_Ac4SampleDescription : public AP4_SampleDescription,
+                                 public AP4_AudioSampleDescription
+{
+public:
+    AP4_IMPLEMENT_DYNAMIC_CAST_D2(AP4_Ac4SampleDescription, AP4_SampleDescription, AP4_AudioSampleDescription)
+
+    // constructors
+    AP4_Ac4SampleDescription(AP4_UI32            sample_rate, 
+                             AP4_UI16            sample_size,
+                             AP4_UI16            channel_count,
+                             const AP4_Dac4Atom* dac4Atom);
+    
+    AP4_Ac4SampleDescription(AP4_UI32        sample_rate, 
+                             AP4_UI16        sample_size,
+                             AP4_UI16        channel_count,
+                             AP4_AtomParent* details);
+    
+    AP4_Ac4SampleDescription(AP4_UI32                    sample_rate,
+                             AP4_UI16                    sample_size,
+                             AP4_UI16                    channel_count,
+                             AP4_UI32                    size, // DSI size
+                             const AP4_Dac4Atom::Ac4Dsi* ac4Dsi);
+    
+    // inherited from AP4_SampleDescription
+    virtual AP4_Result GetCodecString(AP4_String& codec) { m_Dac4Atom->GetCodecString(codec); return AP4_SUCCESS; }
+    virtual AP4_Atom* ToAtom() const;
+
+private:
+    AP4_Dac4Atom* m_Dac4Atom;
+};
+
+/*----------------------------------------------------------------------
 |   AP4_MpegVideoSampleDescription
 +---------------------------------------------------------------------*/
 class AP4_MpegVideoSampleDescription : public AP4_MpegSampleDescription,
@@ -595,7 +865,7 @@
 +---------------------------------------------------------------------*/
 const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_FORBIDDEN = 0x00;
 const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_OD        = 0x01;
-const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_CR        = 0x02;	
+const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_CR        = 0x02;
 const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_BIFS      = 0x03;
 const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_VISUAL    = 0x04;
 const AP4_MpegSampleDescription::StreamType AP4_STREAM_TYPE_AUDIO     = 0x05;
@@ -680,6 +950,8 @@
 const AP4_UI08 AP4_MPEG4_AUDIO_OBJECT_TYPE_ER_AAC_ELD            = 39; /**< Error Resilient AAC ELD                      */
 const AP4_UI08 AP4_MPEG4_AUDIO_OBJECT_TYPE_SMR_SIMPLE            = 40; /**< SMR Simple                                   */
 const AP4_UI08 AP4_MPEG4_AUDIO_OBJECT_TYPE_SMR_MAIN              = 41; /**< SMR Main                                     */
+const AP4_UI08 AP4_MPEG4_AUDIO_OBJECT_TYPE_USAC                  = 42; /**< USAC                                     */
+const AP4_UI08 AP4_MPEG4_AUDIO_OBJECT_TYPE_SAOC                  = 43; /**< SAOC                                     */
 
 #endif // _AP4_SAMPLE_DESCRIPTION_H_

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SampleEntry.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SampleEntry.cpp Changed

@@ -679,6 +679,148 @@
 }
 
 /*----------------------------------------------------------------------
+ |   AP4_Ac3SampleEntry::AP4_Ac3SampleEntry
+ +---------------------------------------------------------------------*/
+AP4_Ac3SampleEntry::AP4_Ac3SampleEntry(AP4_UI32             format,
+                                       AP4_UI32             sample_rate,
+                                       AP4_UI16             sample_size,
+                                       AP4_UI16             channel_count,
+                                       const AP4_AtomParent *details):
+    AP4_AudioSampleEntry(format, sample_rate, sample_size, channel_count)
+{
+    if (details){
+        AP4_AtomParent* parent = new AP4_AtomParent();
+        details->CopyChildren(*parent);
+        AP4_Atom* child = parent->GetChild(AP4_ATOM_TYPE_DAC3);
+        child->Detach();
+        AddChild(child);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac3SampleEntry::AP4_Ac3SampleEntry
++---------------------------------------------------------------------*/
+AP4_Ac3SampleEntry::AP4_Ac3SampleEntry(AP4_UI32         type,
+                                       AP4_Size         size,
+                                       AP4_ByteStream&  stream,
+                                       AP4_AtomFactory& atom_factory) :
+    AP4_AudioSampleEntry(type, size, stream, atom_factory)
+{
+}
+
+/*----------------------------------------------------------------------
+ |   AP4_Ac3SampleEntry::ToSampleDescription
+ +---------------------------------------------------------------------*/
+AP4_SampleDescription*
+AP4_Ac3SampleEntry::ToSampleDescription()
+{
+    // find the dac3 atom
+    AP4_Dac3Atom* dac3 = AP4_DYNAMIC_CAST(AP4_Dac3Atom, GetChild(AP4_ATOM_TYPE_DAC3));
+    if (dac3 == NULL) {
+        return NULL;
+    }else{
+        return new AP4_Ac3SampleDescription(GetSampleRate(),
+                                            GetSampleSize(),
+                                            GetChannelCount(),
+                                            dac3);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleEntry::AP4_Eac3SampleEntry
++---------------------------------------------------------------------*/
+AP4_Eac3SampleEntry::AP4_Eac3SampleEntry(AP4_UI32             format,
+                                         AP4_UI32             sample_rate,
+                                         AP4_UI16             sample_size,
+                                         AP4_UI16             channel_count,
+                                         const AP4_AtomParent *details): 
+    AP4_AudioSampleEntry(format, sample_rate, sample_size, channel_count)
+{
+    if (details){ 
+        AP4_Atom* child = details->GetChild(AP4_ATOM_TYPE_DEC3)->Clone();
+        AddChild(child);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleEntry::AP4_Eac3SampleEntry
++---------------------------------------------------------------------*/
+AP4_Eac3SampleEntry::AP4_Eac3SampleEntry(AP4_UI32         type,
+                                         AP4_Size         size,
+                                         AP4_ByteStream&  stream,
+                                         AP4_AtomFactory& atom_factory) :
+    AP4_AudioSampleEntry(type, size, stream, atom_factory)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleEntry::ToSampleDescription
++---------------------------------------------------------------------*/
+AP4_SampleDescription*
+AP4_Eac3SampleEntry::ToSampleDescription()
+{
+    // find the dec3 atom
+    AP4_Dec3Atom* dec3 = AP4_DYNAMIC_CAST(AP4_Dec3Atom, GetChild(AP4_ATOM_TYPE_DEC3));
+    if (dec3 == NULL) {
+        // shall never happen
+        return new AP4_Eac3SampleDescription();
+    }else{
+         return new AP4_Eac3SampleDescription(GetSampleRate(),
+                                              GetSampleSize(),
+                                              GetChannelCount(),
+                                              dec3);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleEntry::AP4_Ac4SampleEntry
++---------------------------------------------------------------------*/
+AP4_Ac4SampleEntry::AP4_Ac4SampleEntry(AP4_UI32              format,
+                                       AP4_UI32              sample_rate,
+                                       AP4_UI16              sample_size,
+                                       AP4_UI16              channel_count,
+                                       const AP4_AtomParent* details): 
+    AP4_AudioSampleEntry(format, sample_rate, sample_size, channel_count)
+{
+    if (details){ 
+        AP4_AtomParent* parent = new AP4_AtomParent();
+        details->CopyChildren(*parent);
+        AP4_Atom* child = parent->GetChild(AP4_ATOM_TYPE_DAC4);
+        child->Detach();
+        AddChild(child);
+    }
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleEntry::AP4_Ac4SampleEntry
++---------------------------------------------------------------------*/
+AP4_Ac4SampleEntry::AP4_Ac4SampleEntry(AP4_UI32         type,
+                                       AP4_Size         size,
+                                       AP4_ByteStream&  stream,
+                                       AP4_AtomFactory& atom_factory) :
+    AP4_AudioSampleEntry(type, size, stream, atom_factory)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleEntry::ToSampleDescription
++---------------------------------------------------------------------*/
+AP4_SampleDescription*
+AP4_Ac4SampleEntry::ToSampleDescription()
+{
+    // find the dac4 atom
+    AP4_Dac4Atom* dac4 = AP4_DYNAMIC_CAST(AP4_Dac4Atom, GetChild(AP4_ATOM_TYPE_DAC4));
+    if (dac4 == NULL) {
+        return NULL;
+    } else{
+         return new AP4_Ac4SampleDescription(GetSampleRate(),
+                                             GetSampleSize(),
+                                             GetChannelCount(),
+                                             dac4);
+    }
+}
+
+/*----------------------------------------------------------------------
 |   AP4_Mp4aSampleEntry::AP4_Mp4aSampleEntry
 +---------------------------------------------------------------------*/
 AP4_Mp4aSampleEntry::AP4_Mp4aSampleEntry(AP4_UI32          sample_rate, 
@@ -996,7 +1138,22 @@
 }
 
 /*----------------------------------------------------------------------
-|   AP4_HevcSampleEntry::AP4_HevcSSampleEntry
+|   AP4_AvcSampleEntry::ToSampleDescription
++---------------------------------------------------------------------*/
+AP4_SampleDescription*
+AP4_AvcSampleEntry::ToSampleDescription()
+{
+    return new AP4_AvcSampleDescription(
+        m_Type,
+        m_Width,
+        m_Height,
+        m_Depth,
+        m_CompressorName.GetChars(),
+        this);
+}
+
+/*----------------------------------------------------------------------
+|   AP4_HevcSampleEntry::AP4_HevcSampleEntry
 +---------------------------------------------------------------------*/
 AP4_HevcSampleEntry::AP4_HevcSampleEntry(AP4_UI32            format,
                                          AP4_UI16            width,
@@ -1014,12 +1171,23 @@
 }
 
 /*----------------------------------------------------------------------
-|   AP4_AvcSampleEntry::ToSampleDescription
+|   AP4_HevcSampleEntry::AP4_HevcSampleEntry
++---------------------------------------------------------------------*/
+AP4_HevcSampleEntry::AP4_HevcSampleEntry(AP4_UI32         format,
+                                         AP4_Size         size,
+                                         AP4_ByteStream&  stream,
+                                         AP4_AtomFactory& atom_factory) :
+    AP4_VisualSampleEntry(format, size, stream, atom_factory)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_HevcSampleEntry::ToSampleDescription
 +---------------------------------------------------------------------*/
 AP4_SampleDescription*
-AP4_AvcSampleEntry::ToSampleDescription()
+AP4_HevcSampleEntry::ToSampleDescription()
 {
-    return new AP4_AvcSampleDescription(
+    return new AP4_HevcSampleDescription(
         m_Type,
         m_Width,
         m_Height,
@@ -1029,23 +1197,41 @@
 }
 
 /*----------------------------------------------------------------------
-|   AP4_HevcSampleEntry::AP4_HevcSampleEntry
+|   AP4_Av1SampleEntry::AP4_Av1SampleEntry
 +---------------------------------------------------------------------*/
-AP4_HevcSampleEntry::AP4_HevcSampleEntry(AP4_UI32         format,
-                                         AP4_Size         size,
-                                         AP4_ByteStream&  stream,
-                                         AP4_AtomFactory& atom_factory) :
+AP4_Av1SampleEntry::AP4_Av1SampleEntry(AP4_UI32            format,
+                                       AP4_UI16            width,
+                                       AP4_UI16            height,
+                                       AP4_UI16            depth,
+                                       const char*         compressor_name,
+                                       const AP4_AtomParent* details) :
+    AP4_VisualSampleEntry(format,
+                          width,
+                          height,
+                          depth,
+                          compressor_name,
+                          details)
+{
+}
+
+/*----------------------------------------------------------------------
+|   AP4_Av1SampleEntry::AP4_Av1SampleEntry
++---------------------------------------------------------------------*/
+AP4_Av1SampleEntry::AP4_Av1SampleEntry(AP4_UI32         format,
+                                       AP4_Size         size,
+                                       AP4_ByteStream&  stream,
+                                       AP4_AtomFactory& atom_factory) :
     AP4_VisualSampleEntry(format, size, stream, atom_factory)
 {
 }
 
 /*----------------------------------------------------------------------
-|   AP4_HevcSampleEntry::ToSampleDescription
+|   AP4_Av1SampleEntry::ToSampleDescription
 +---------------------------------------------------------------------*/
 AP4_SampleDescription*
-AP4_HevcSampleEntry::ToSampleDescription()
+AP4_Av1SampleEntry::ToSampleDescription()
 {
-    return new AP4_HevcSampleDescription(
+    return new AP4_Av1SampleDescription(
         m_Type,
         m_Width,
         m_Height,

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SampleEntry.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SampleEntry.h Changed

@@ -266,6 +266,67 @@
 };
 
 /*----------------------------------------------------------------------
+ |   AP4_Ac3SampleEntry
+ +---------------------------------------------------------------------*/
+class AP4_Ac3SampleEntry : public AP4_AudioSampleEntry
+{
+public:
+    AP4_Ac3SampleEntry(AP4_UI32              format,
+                       AP4_UI32              sample_rate,
+                       AP4_UI16              sample_size,
+                       AP4_UI16              channel_count,
+                       const AP4_AtomParent* details);
+    AP4_Ac3SampleEntry(AP4_UI32         type,
+                       AP4_Size         size,
+                       AP4_ByteStream&  stream,
+                       AP4_AtomFactory& atom_factory);
+    
+    // inherited from AP4_SampleEntry
+    virtual AP4_SampleDescription* ToSampleDescription();
+};
+
+/*----------------------------------------------------------------------
+|   AP4_Eac3SampleEntry
++---------------------------------------------------------------------*/
+class AP4_Eac3SampleEntry : public AP4_AudioSampleEntry
+{
+public:    
+    AP4_Eac3SampleEntry(AP4_UI32              format,
+                        AP4_UI32              sample_rate,
+                        AP4_UI16              sample_size,
+                        AP4_UI16              channel_count,
+                        const AP4_AtomParent* details);
+    AP4_Eac3SampleEntry(AP4_UI32         type,
+                        AP4_Size         size,
+                        AP4_ByteStream&  stream,
+                        AP4_AtomFactory& atom_factory);
+                        
+    // inherited from AP4_SampleEntry
+    virtual AP4_SampleDescription* ToSampleDescription();
+};
+
+
+/*----------------------------------------------------------------------
+|   AP4_Ac4SampleEntry
++---------------------------------------------------------------------*/
+class AP4_Ac4SampleEntry : public AP4_AudioSampleEntry
+{
+public:    
+    AP4_Ac4SampleEntry(AP4_UI32              format,
+                       AP4_UI32              sample_rate,
+                       AP4_UI16              sample_size,
+                       AP4_UI16              channel_count,
+                       const AP4_AtomParent* details);
+    AP4_Ac4SampleEntry(AP4_UI32         type,
+                       AP4_Size         size,
+                       AP4_ByteStream&  stream,
+                       AP4_AtomFactory& atom_factory);
+                        
+    // inherited from AP4_SampleEntry
+    virtual AP4_SampleDescription* ToSampleDescription();
+};
+
+/*----------------------------------------------------------------------
 |   AP4_MpegVideoSampleEntry
 +---------------------------------------------------------------------*/
 class AP4_MpegVideoSampleEntry : public AP4_VisualSampleEntry
@@ -384,6 +445,29 @@
 };
 
 /*----------------------------------------------------------------------
+|   AP4_Av1SampleEntry
++---------------------------------------------------------------------*/
+class AP4_Av1SampleEntry : public AP4_VisualSampleEntry
+{
+public:
+    // constructors
+    AP4_Av1SampleEntry(AP4_UI32         format, // av01
+                       AP4_Size         size,
+                       AP4_ByteStream&  stream,
+                       AP4_AtomFactory& atom_factory);
+    
+    AP4_Av1SampleEntry(AP4_UI32              format, // av01
+                       AP4_UI16              width,
+                       AP4_UI16              height,
+                       AP4_UI16              depth,
+                       const char*           compressor_name,
+                       const AP4_AtomParent* details);
+
+    // inherited from AP4_SampleEntry
+    virtual AP4_SampleDescription* ToSampleDescription();
+};
+
+/*----------------------------------------------------------------------
 |   AP4_RtpHintSampleEntry
 +---------------------------------------------------------------------*/
 class AP4_RtpHintSampleEntry : public AP4_SampleEntry

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SbgpAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SbgpAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SegmentBuilder.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SegmentBuilder.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SgpdAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SgpdAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SidxAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SidxAtom.cpp Changed

@@ -157,19 +157,18 @@
 
     if (inspector.GetVerbosity() >= 1) {
         AP4_UI32 reference_count = m_References.ItemCount();
+        inspector.StartArray("entries", reference_count);
         for (unsigned int i=0; i<reference_count; i++) {
-            char header[32];
-            AP4_FormatString(header, sizeof(header), "entry %04d", i);
-            char value[256];
-            AP4_FormatString(value, sizeof(value), "reference_type=%d, referenced_size=%u, subsegment_duration=%u, starts_with_SAP=%d, SAP_type=%d, SAP_delta_time=%d",
-                             m_References[i].m_ReferenceType,
-                             m_References[i].m_ReferencedSize,
-                             m_References[i].m_SubsegmentDuration,
-                             m_References[i].m_StartsWithSap,
-                             m_References[i].m_SapType,
-                             m_References[i].m_SapDeltaTime);
-            inspector.AddField(header, value);
+            inspector.StartObject(NULL, 6, true);
+            inspector.AddField("reference_type",      m_References[i].m_ReferenceType);
+            inspector.AddField("referenced_size",     m_References[i].m_ReferencedSize);
+            inspector.AddField("subsegment_duration", m_References[i].m_SubsegmentDuration);
+            inspector.AddField("starts_with_SAP",     m_References[i].m_StartsWithSap);
+            inspector.AddField("SAP_type",            m_References[i].m_SapType);
+            inspector.AddField("SAP_delta_time",      m_References[i].m_SapDeltaTime);
+            inspector.EndObject();
         }
+        inspector.EndArray();
     }
     
     return AP4_SUCCESS;

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4StcoAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4StcoAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4StscAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4StscAtom.cpp Changed

@@ -237,19 +237,17 @@
 
     // dump table entries
     if (inspector.GetVerbosity() >= 1) {
-        char header[32];
-        char value[256];
+        inspector.StartArray("entries", m_Entries.ItemCount());
         for (unsigned int i=0; i<m_Entries.ItemCount(); i++) {
-            AP4_FormatString(header, sizeof(header), "entry %8d", i);  
-            AP4_FormatString(value, sizeof(value), 
-                    "first_chunk=%d, first_sample=%d, chunk_count=%d, samples_per_chunk=%d, sample_desc_index=%d", 
-                    m_Entries[i].m_FirstChunk,
-                    m_Entries[i].m_FirstSample,
-                    m_Entries[i].m_ChunkCount,
-                    m_Entries[i].m_SamplesPerChunk,
-                    m_Entries[i].m_SampleDescriptionIndex);
-            inspector.AddField(header, value);
+            inspector.StartObject(NULL, 5, true);
+            inspector.AddField("first_chunk",       m_Entries[i].m_FirstChunk);
+            inspector.AddField("first_sample",      m_Entries[i].m_FirstSample);
+            inspector.AddField("chunk_count",       m_Entries[i].m_ChunkCount);
+            inspector.AddField("samples_per_chunk", m_Entries[i].m_SamplesPerChunk);
+            inspector.AddField("sample_desc_index", m_Entries[i].m_SampleDescriptionIndex);
+            inspector.EndObject();
         }
+        inspector.EndArray();
     }
     
     return AP4_SUCCESS;

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4StszAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4StszAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4SttsAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4SttsAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Stz2Atom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Stz2Atom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4TfraAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4TfraAtom.cpp Changed

@@ -315,19 +315,17 @@
     inspector.AddField("length_size_of_trun_num",   m_LengthSizeOfTrunNumber);
     inspector.AddField("length_size_of_sample_num", m_LengthSizeOfSampleNumber);
     if (inspector.GetVerbosity() >= 1) {
+        inspector.StartArray("entries", m_Entries.ItemCount());
         for (unsigned int i=0; i<m_Entries.ItemCount(); i++) {
-            char name[16];
-            char value[256];
-            AP4_FormatString(name, sizeof(name), "entry %04d", i);
-            AP4_FormatString(value, sizeof(value), 
-                             "time=%lld, moof_offset=%lld, traf_number=%d, trun_number=%d, sample_number=%d",
-                             m_Entries[i].m_Time,
-                             m_Entries[i].m_MoofOffset,
-                             m_Entries[i].m_TrafNumber,
-                             m_Entries[i].m_TrunNumber,
-                             m_Entries[i].m_SampleNumber);
-            inspector.AddField(name, value);
+            inspector.StartObject(NULL, 5, true);
+            inspector.AddField("time",          m_Entries[i].m_Time);
+            inspector.AddField("moof_offset",   m_Entries[i].m_MoofOffset);
+            inspector.AddField("traf_number",   m_Entries[i].m_TrafNumber);
+            inspector.AddField("trun_number",   m_Entries[i].m_TrunNumber);
+            inspector.AddField("sample_number", m_Entries[i].m_SampleNumber);
+            inspector.EndObject();
         }
+        inspector.EndArray();
     }
     
     return AP4_SUCCESS;

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4TkhdAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4TkhdAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4TkhdAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4TkhdAtom.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Track.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Track.cpp Changed

@@ -56,7 +56,9 @@
                      AP4_UI64         media_duration,
                      const char*      language,
                      AP4_UI32         width,
-                     AP4_UI32         height) :
+                     AP4_UI32         height,
+                     AP4_UI64         creation_time,
+                     AP4_UI64         modification_time) :
     m_TrakAtomIsOwned(true),
     m_Type(type),
     m_SampleTable(sample_table),
@@ -108,9 +110,9 @@
     m_TrakAtom = new AP4_TrakAtom(sample_table,
                                   hdlr_type, 
                                   hdlr_name,
-                                  track_id, 
-                                  0, 
-                                  0, 
+                                  track_id,
+                                  creation_time,
+                                  modification_time,
                                   track_duration,
                                   media_time_scale,
                                   media_duration,
@@ -182,8 +184,8 @@
                                   hdlr_type, 
                                   hdlr_name,
                                   track_id, 
-                                  0, 
-                                  0, 
+                                  tkhd?tkhd->GetCreationTime():0,
+                                  tkhd?tkhd->GetModificationTime():0, 
                                   track_duration,
                                   media_time_scale,
                                   media_duration,

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Track.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Track.h Changed

@@ -77,16 +77,18 @@
     // methods
     AP4_Track(Type             type,
               AP4_SampleTable* sample_table,     // ownership is transfered to the AP4_Track object
-              AP4_UI32         track_id, 
+              AP4_UI32         track_id,
               AP4_UI32         movie_time_scale, // 0 = use default
               AP4_UI64         track_duration,   // in the movie timescale
               AP4_UI32         media_time_scale,
               AP4_UI64         media_duration,   // in the media timescale
               const char*      language,
               AP4_UI32         width,            // in 16.16 fixed point
-              AP4_UI32         height);          // in 16.16 fixed point
-    AP4_Track(AP4_SampleTable* sample_table,     // ownership is transfered to the AP4_Track object
-              AP4_UI32         track_id, 
+              AP4_UI32         height,           // in 16.16 fixed point
+              AP4_UI64         creation_time = 0,
+              AP4_UI64         modification_time = 0);
+    AP4_Track(AP4_SampleTable* sample_table,     // ownership is transferred to the AP4_Track object
+              AP4_UI32         track_id,
               AP4_UI32         movie_time_scale, // 0 = use default
               AP4_UI64         track_duration,   // in the movie timescale
               AP4_UI32         media_time_scale,
@@ -96,14 +98,14 @@
               AP4_ByteStream& sample_stream,
               AP4_UI32        movie_time_scale);
     virtual ~AP4_Track();
-    
-    /** 
-     * Clone a track. This is useful if you want to create a track from 
-     * a non-synthetic track (parsed from a file for example) and 
+
+    /**
+     * Clone a track. This is useful if you want to create a track from
+     * a non-synthetic track (parsed from a file for example) and
      * write it out
      */
     AP4_Track* Clone(AP4_Result* result = NULL);
-    
+
     AP4_UI32     GetFlags() const;
     AP4_Result   SetFlags(AP4_UI32 flags);
     AP4_Track::Type GetType() const { return m_Type; }
@@ -114,10 +116,10 @@
     AP4_UI32     GetHeight() const;     // in 16.16 fixed point
     AP4_Cardinal GetSampleCount() const;
     AP4_Result   GetSample(AP4_Ordinal index, AP4_Sample& sample);
-    AP4_Result   ReadSample(AP4_Ordinal     index, 
+    AP4_Result   ReadSample(AP4_Ordinal     index,
                             AP4_Sample&     sample,
                             AP4_DataBuffer& data);
-    AP4_Result   GetSampleIndexForTimeStampMs(AP4_UI32     ts_ms, 
+    AP4_Result   GetSampleIndexForTimeStampMs(AP4_UI32     ts_ms,
                                               AP4_Ordinal& index);
     AP4_Ordinal  GetNearestSyncSampleIndex(AP4_Ordinal index, bool before=true);
     AP4_SampleDescription* GetSampleDescription(AP4_Ordinal index);

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4TrakAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4TrakAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4TrakAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4TrakAtom.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4TrunAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4TrunAtom.cpp Changed

@@ -230,80 +230,34 @@
     if (m_Flags & AP4_TRUN_FLAG_FIRST_SAMPLE_FLAGS_PRESENT) {
         inspector.AddField("first sample flags", m_FirstSampleFlags, AP4_AtomInspector::HINT_HEX);
     }
-    if (inspector.GetVerbosity() == 1) {
-        AP4_UI32 sample_count = m_Entries.ItemCount();
-        for (unsigned int i=0; i<sample_count; i++) {
-            char header[32];
-            AP4_FormatString(header, sizeof(header), "%04d", i);
-            char v0[32];
-            char v1[32];
-            char v2[32];
-            char v3[64];
-            const char* s0 = "";
-            const char* s1 = "";
-            const char* s2 = "";
-            const char* s3 = "";
-            const char* sep = "";
-            if (m_Flags & AP4_TRUN_FLAG_SAMPLE_DURATION_PRESENT) {
-                AP4_FormatString(v0, sizeof(v0), "d:%u", m_Entries[i].sample_duration);
-                s0 = v0;
-                sep = ",";
-            }
-            if (m_Flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) {
-                AP4_FormatString(v1, sizeof(v1), "%ss:%u", sep, m_Entries[i].sample_size);
-                s1 = v1;
-                sep = ",";
-            }
-            if (m_Flags & AP4_TRUN_FLAG_SAMPLE_FLAGS_PRESENT) {
-                AP4_FormatString(v2, sizeof(v2), "%sf:%x", sep, m_Entries[i].sample_flags);
-                s2 = v2;
-                sep = ",";
-            }
-            if (m_Flags & AP4_TRUN_FLAG_SAMPLE_COMPOSITION_TIME_OFFSET_PRESENT) {
-                AP4_FormatString(v3, sizeof(v3), "%sc:%u", sep, m_Entries[i].sample_composition_time_offset);
-                s3 = v3;
-            }
-            char value[256];
-            AP4_FormatString(value, sizeof(value), "%s%s%s%s", s0, s1, s2, s3);
-            inspector.AddField(header, value);
-        }
-    } else if (inspector.GetVerbosity() >= 2) {
+    if (inspector.GetVerbosity() > 0) {
+        inspector.StartArray("entries");
+
         AP4_UI32 sample_count = m_Entries.ItemCount();
-        for (unsigned int i=0; i<sample_count; i++) {
-            char header[32];
-            AP4_FormatString(header, sizeof(header), "entry %04d", i);
-            char v0[32];
-            char v1[32];
-            char v2[32];
-            char v3[64];
-            const char* s0 = "";
-            const char* s1 = "";
-            const char* s2 = "";
-            const char* s3 = "";
-            const char* sep = "";
+        for (unsigned int i = 0; i < sample_count; i++) {
+            inspector.StartObject(NULL, 0, true);
+
             if (m_Flags & AP4_TRUN_FLAG_SAMPLE_DURATION_PRESENT) {
-                AP4_FormatString(v0, sizeof(v0), "sample_duration:%u", m_Entries[i].sample_duration);
-                s0 = v0;
-                sep = ", ";
+                inspector.AddField(inspector.GetVerbosity() >= 2 ? "sample_duration" : "d",
+                                   m_Entries[i].sample_duration);
             }
             if (m_Flags & AP4_TRUN_FLAG_SAMPLE_SIZE_PRESENT) {
-                AP4_FormatString(v1, sizeof(v1), "%ssample_size:%u", sep, m_Entries[i].sample_size);
-                s1 = v1;
-                sep = ", ";
+                inspector.AddField(inspector.GetVerbosity() >= 2 ? "sample_size" : "s",
+                                   m_Entries[i].sample_size);
             }
             if (m_Flags & AP4_TRUN_FLAG_SAMPLE_FLAGS_PRESENT) {
-                AP4_FormatString(v2, sizeof(v2), "%ssample_flags:%x", sep, m_Entries[i].sample_flags);
-                s2 = v2;
-                sep = ", ";
+                inspector.AddField(inspector.GetVerbosity() >= 2 ? "sample_flags" : "f",
+                                   m_Entries[i].sample_flags);
             }
             if (m_Flags & AP4_TRUN_FLAG_SAMPLE_COMPOSITION_TIME_OFFSET_PRESENT) {
-                AP4_FormatString(v3, sizeof(v3), "%ssample_composition_time_offset:%u", sep, m_Entries[i].sample_composition_time_offset);
-                s3 = v3;
+                inspector.AddField(inspector.GetVerbosity() >= 2 ? "sample_composition_time_offset" : "c",
+                                   m_Entries[i].sample_composition_time_offset);
             }
-            char value[256];
-            AP4_FormatString(value, sizeof(value), "%s%s%s%s", s0, s1, s2, s3);
-            inspector.AddField(header, value);
+
+            inspector.EndObject();
         }
+
+        inspector.EndArray();
     }
     
     return AP4_SUCCESS;

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Utils.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Utils.cpp Changed

@@ -30,6 +30,7 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "Ap4Utils.h"
+#include "Ap4Debug.h"
 
 /*----------------------------------------------------------------------
 |   AP4_GlobalOptions::g_Entry
@@ -50,7 +51,7 @@
                                 item = item->GetNext()) {
         if (item->GetData()->m_Name == name) return item->GetData();
     }
-    
+
     if (autocreate) {
         Entry* new_entry = new Entry();
         new_entry->m_Name = name;
@@ -118,7 +119,7 @@
     AP4_UI64 i_value = AP4_BytesToUInt64BE(bytes);
     void*    v_value = reinterpret_cast<void*>(&i_value);
     double*  d_value = reinterpret_cast<double*>(v_value);
-    
+
     return *d_value;
 }
 
@@ -128,7 +129,7 @@
 AP4_UI64
 AP4_BytesToUInt64BE(const unsigned char* bytes)
 {
-    return 
+    return
         ( ((AP4_UI64)bytes[0])<<56 ) |
         ( ((AP4_UI64)bytes[1])<<48 ) |
         ( ((AP4_UI64)bytes[2])<<40 ) |
@@ -136,7 +137,7 @@
         ( ((AP4_UI64)bytes[4])<<24 ) |
         ( ((AP4_UI64)bytes[5])<<16 ) |
         ( ((AP4_UI64)bytes[6])<<8  ) |
-        ( ((AP4_UI64)bytes[7])     );    
+        ( ((AP4_UI64)bytes[7])     );
 }
 
 /*----------------------------------------------------------------------
@@ -147,7 +148,7 @@
 {
     void*     v_value = reinterpret_cast<void*>(&value);
     AP4_UI64* i_value = reinterpret_cast<AP4_UI64*>(v_value);
-    
+
     AP4_BytesFromUInt64BE(bytes, *i_value);
 }
 
@@ -168,6 +169,21 @@
 }
 
 /*----------------------------------------------------------------------
+|   AP4_ByteSwap16
++---------------------------------------------------------------------*/
+void
+AP4_ByteSwap16(unsigned char* bytes, unsigned int count) {
+    AP4_ASSERT((count & 1) == 0);
+
+    for (unsigned int i = 0; i < count / 2; i++) {
+        unsigned char tmp = bytes[0];
+        bytes[0] = bytes[1];
+        bytes[1] = tmp;
+        bytes += 2;
+    }
+}
+
+/*----------------------------------------------------------------------
 |   AP4_DurationMsFromUnits
 +---------------------------------------------------------------------*/
 AP4_UI32
@@ -180,7 +196,7 @@
 /*----------------------------------------------------------------------
 |   AP4_ConvertTime
 +---------------------------------------------------------------------*/
-AP4_UI64 
+AP4_UI64
 AP4_ConvertTime(AP4_UI64 time_value,
                 AP4_UI32 from_time_scale,
                 AP4_UI32 to_time_scale)
@@ -277,7 +293,7 @@
 |   AP4_NibbleHex
 +---------------------------------------------------------------------*/
 char
-AP4_NibbleHex(unsigned int nibble) 
+AP4_NibbleHex(unsigned int nibble)
 {
     if (nibble < 10) {
         return (char)('0'+nibble);
@@ -311,14 +327,14 @@
         *hex++ = AP4_NibbleHex(data[i]>>4);
         *hex++ = AP4_NibbleHex(data[i]&0x0F);
     }
-    
+
     return AP4_SUCCESS;
 }
 
 /*----------------------------------------------------------------------
 |   AP4_BitWriter::Write
 +---------------------------------------------------------------------*/
-void 
+void
 AP4_BitWriter::Write(AP4_UI32 bits, unsigned int bit_count)
 {
     unsigned char* data = m_Data;
@@ -358,7 +374,7 @@
             value = 10*value + (c-'0');
         } else {
             return 0;
-        } 
+        }
     }
 
     return value;

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4Utils.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4Utils.h Changed

@@ -50,7 +50,7 @@
     static void        SetBool(const char* name, bool value);
     static const char* GetString(const char* name);
     static void        SetString(const char* name, const char* value);
-    
+
 private:
     struct Entry {
         AP4_String m_Name;
@@ -67,6 +67,7 @@
 AP4_UI64 AP4_BytesToUInt64BE(const unsigned char* bytes);
 void AP4_BytesFromDoubleBE(unsigned char* bytes, double value);
 void AP4_BytesFromUInt64BE(unsigned char* bytes, AP4_UI64 value);
+void AP4_ByteSwap16(unsigned char* bytes, unsigned int count);
 
 /*----------------------------------------------------------------------
 |   AP4_BytesToUInt32BE
@@ -74,11 +75,11 @@
 inline AP4_UI32
 AP4_BytesToUInt32BE(const unsigned char* bytes)
 {
-    return 
+    return
         ( ((AP4_UI32)bytes[0])<<24 ) |
         ( ((AP4_UI32)bytes[1])<<16 ) |
         ( ((AP4_UI32)bytes[2])<<8  ) |
-        ( ((AP4_UI32)bytes[3])     );    
+        ( ((AP4_UI32)bytes[3])     );
 }
 
 /*----------------------------------------------------------------------
@@ -96,10 +97,10 @@
 inline AP4_UI32
 AP4_BytesToUInt24BE(const unsigned char* bytes)
 {
-    return 
+    return
         ( ((AP4_UI32)bytes[0])<<16 ) |
         ( ((AP4_UI32)bytes[1])<<8  ) |
-        ( ((AP4_UI32)bytes[2])     );    
+        ( ((AP4_UI32)bytes[2])     );
 }
 
 /*----------------------------------------------------------------------
@@ -108,9 +109,9 @@
 inline AP4_UI16
 AP4_BytesToUInt16BE(const unsigned char* bytes)
 {
-    return 
+    return
         ( ((AP4_UI16)bytes[0])<<8  ) |
-        ( ((AP4_UI16)bytes[1])     );    
+        ( ((AP4_UI16)bytes[1])     );
 }
 
 /*----------------------------------------------------------------------
@@ -227,12 +228,12 @@
         }
     }
     ~AP4_BitWriter() { delete[] m_Data; }
-    
+
     void Write(AP4_UI32 bits, unsigned int bit_count);
-    
+
     unsigned int GetBitCount()     { return m_BitCount; }
     const unsigned char* GetData() { return m_Data;     }
-    
+
 private:
     unsigned char* m_Data;
     unsigned int   m_DataSize;
@@ -263,7 +264,7 @@
     void         SkipBits(unsigned int bit_count);
 
     unsigned int GetBitsRead();
-    
+
 private:
     // methods
     BitsWord ReadCache() const;
@@ -274,5 +275,5 @@
     BitsWord       m_Cache;
     unsigned int   m_BitsCached;
 };
-    
+
 #endif // _AP4_UTILS_H_

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4VpccAtom.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4VpccAtom.cpp Changed

bento4-1.6.0r637.tar.gz/Source/C++/Core/Ap4VpccAtom.h -> bento4-1.6.0r638.tar.gz/Source/C++/Core/Ap4VpccAtom.h Changed

bento4-1.6.0r637.tar.gz/Source/C++/System/StdC/Ap4StdCFileByteStream.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/System/StdC/Ap4StdCFileByteStream.cpp Changed

@@ -70,6 +70,98 @@
 }
 #endif // defined(AP4_CONFIG_HAVE_FOPEN_S
 
+#if defined(_WIN32)
+
+#include <windows.h>
+#include <malloc.h>
+#include <limits.h>
+#include <assert.h>
+
+#define AP4_WIN32_USE_CHAR_CONVERSION \
+    int     _convert = 0;             \
+    LPCWSTR _lpw     = NULL;          \
+    LPCSTR  _lpa     = NULL
+
+/*----------------------------------------------------------------------
+|   A2WHelper
++---------------------------------------------------------------------*/
+static LPWSTR
+A2WHelper(LPWSTR lpw, LPCSTR lpa, int nChars, UINT acp)
+{
+    int ret;
+
+    assert(lpa != NULL);
+    assert(lpw != NULL);
+    if (lpw == NULL || lpa == NULL) return NULL;
+
+    lpw[0] = '\0';
+    ret    = MultiByteToWideChar(acp, 0, lpa, -1, lpw, nChars);
+    if (ret == 0) {
+        assert(0);
+        return NULL;
+    }
+    return lpw;
+}
+
+/*----------------------------------------------------------------------
+|   W2AHelper
++---------------------------------------------------------------------*/
+static LPSTR
+W2AHelper(LPSTR lpa, LPCWSTR lpw, int nChars, UINT acp)
+{
+    int ret;
+
+    assert(lpw != NULL);
+    assert(lpa != NULL);
+    if (lpa == NULL || lpw == NULL) return NULL;
+
+    lpa[0] = '\0';
+    ret    = WideCharToMultiByte(acp, 0, lpw, -1, lpa, nChars, NULL, NULL);
+    if (ret == 0) {
+        int error = GetLastError();
+        assert(error);
+        return NULL;
+    }
+    return lpa;
+}
+
+/*----------------------------------------------------------------------
+|   conversion macros
++---------------------------------------------------------------------*/
+#define AP4_WIN32_A2W(lpa)                                                            \
+    (((_lpa = lpa) == NULL) ?                                                         \
+    NULL :                                                                            \
+    (_convert = (int)(strlen(_lpa) + 1),                                              \
+        (INT_MAX / 2 < _convert) ?                                                    \
+        NULL :                                                                        \
+        A2WHelper((LPWSTR)alloca(_convert * sizeof(WCHAR)), _lpa, _convert, CP_UTF8)))
+
+/* +2 instead of +1 temporary fix for Chinese characters */
+#define AP4_WIN32_W2A(lpw)                                                                           \
+    (((_lpw = lpw) == NULL) ?                                                                        \
+    NULL :                                                                                           \
+    ((_convert = (lstrlenW(_lpw) + 2),                                                               \
+       (_convert > INT_MAX / 2) ?                                                                    \
+       NULL :                                                                                        \
+       W2AHelper((LPSTR)alloca(_convert * sizeof(WCHAR)), _lpw, _convert * sizeof(WCHAR), CP_UTF8))))
+
+/*----------------------------------------------------------------------
+|   AP4_fopen_s_utf8
++---------------------------------------------------------------------*/
+static errno_t
+AP4_fopen_s_utf8(FILE** file, const char* path, const char* mode)
+{
+    AP4_WIN32_USE_CHAR_CONVERSION;
+    return _wfopen_s(file, AP4_WIN32_A2W(path), AP4_WIN32_A2W(mode));
+}
+
+/*----------------------------------------------------------------------
+|   remap some functions
++---------------------------------------------------------------------*/
+#define fopen_s AP4_fopen_s_utf8
+
+#endif /* _WIN32 */
+
 /*----------------------------------------------------------------------
 |   AP4_StdcFileByteStream
 +---------------------------------------------------------------------*/

bento4-1.6.0r637.tar.gz/Source/C++/Test/Avc/AvcTrackWriterTest.cpp -> bento4-1.6.0r638.tar.gz/Source/C++/Test/Avc/AvcTrackWriterTest.cpp Changed

bento4-1.6.0r637.tar.gz/Source/Python/utils/mp4-dash.py -> bento4-1.6.0r638.tar.gz/Source/Python/utils/mp4-dash.py Changed

@@ -30,35 +30,38 @@
 import struct
 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
+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,
+    BooleanFromString
+)
 
 # setup main options
 VERSION = "2.0.0"
-SDK_REVISION = '637'
+SDK_REVISION = '638'
 SCRIPT_PATH = path.abspath(path.dirname(__file__))
 sys.path += [SCRIPT_PATH]
 
@@ -128,9 +131,10 @@
 HIPPO_MEDIA_SEGMENT_REGEXP_SMOOTH  = 'QualityLevels\\\$%d\\\$/Fragments\\\$%s=(\\\\d+)\\\$'
 HIPPO_MEDIA_SEGMENT_GROUPS_SMOOTH  = '["time"]'
 
-MPEG_DASH_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI     = 'urn:mpeg:dash:23003:3:audio_channel_configuration:2011'
-DOLBY_DIGITAL_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI = 'tag:dolby.com,2014:dash:audio_channel_configuration:2011'
-DOLBY_AC4_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI     = 'tag:dolby.com,2015:dash:audio_channel_configuration:2015'
+MPEG_DASH_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI       = 'urn:mpeg:dash:23003:3:audio_channel_configuration:2011'
+ISO_IEC_23001_8_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI = 'urn:mpeg:mpegB:cicp:ChannelConfiguration'
+DOLBY_DIGITAL_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI   = 'tag:dolby.com,2014:dash:audio_channel_configuration:2011'
+DOLBY_AC4_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI       = 'tag:dolby.com,2015:dash:audio_channel_configuration:2015'
 
 ISOFF_MAIN_PROFILE          = 'urn:mpeg:dash:profile:isoff-main:2011'
 ISOFF_LIVE_PROFILE          = 'urn:mpeg:dash:profile:isoff-live:2011'
@@ -548,7 +552,7 @@
                         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
+                    scheme_id_uri = MPEG_DASH_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI if options.use_legacy_audio_channel_config_uri else ISO_IEC_23001_8_AUDIO_CHANNEL_CONFIGURATION_SCHEME_ID_URI
                 xml.SubElement(representation,
                                'AudioChannelConfiguration',
                                schemeIdUri=scheme_id_uri,
@@ -683,7 +687,9 @@
 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), 'w', newline='\r\n')
+    output_dir = path.join(options.output_dir, media_subdir)
+    os.makedirs(output_dir, exist_ok = True)
+    playlist_file = open(path.join(output_dir, 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')
@@ -739,7 +745,9 @@
 #############################################
 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')
+    output_dir = path.join(options.output_dir, media_subdir)
+    os.makedirs(output_dir, exist_ok = True)
+    playlist_file = open(path.join(output_dir, 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')
@@ -762,6 +770,7 @@
     iframe_total_segment_duration = 0
     iframe_bitrate = 0
     iframe_max_bitrate = 0
+    iframe_average_segment_bitrate = 0
 
     if not options.split:
         # get the I-frame index for a single file
@@ -814,7 +823,8 @@
 
     index_playlist_file.write('#EXT-X-ENDLIST\n')
 
-    iframe_average_segment_bitrate = 8.0*(iframe_total_segment_size/iframe_total_segment_duration)
+    if iframe_total_segment_duration:
+        iframe_average_segment_bitrate = 8.0*(iframe_total_segment_size/iframe_total_segment_duration)
 
     return (iframe_average_segment_bitrate, iframe_max_bitrate)
 
@@ -834,31 +844,46 @@
 
     master_playlist_file.write('\n')
     master_playlist_file.write('# Audio\n')
+
+    # group tracks that don't have an explicit '+hls_group' specifier
+    ungrouped_audio_tracks = [track for track in all_audio_tracks if not track.hls_group]
+    if len(set([track.language for track in ungrouped_audio_tracks])) == 1:
+        # all the tracks have the same language, put them each in a separate group
+        for index, audio_track in enumerate(ungrouped_audio_tracks, start=1):
+            audio_track.hls_group = f'audio/{index}' if len(ungrouped_audio_tracks) > 1 else 'audio'
+    else:
+        # group tracks by codec
+        codec_groups = {}
+        for audio_track in ungrouped_audio_tracks:
+            codec_groups.setdefault(audio_track.codec, []).append(audio_track)
+        for codec, audio_tracks in codec_groups.items():
+            for audio_track in audio_tracks:
+                audio_track.hls_group = f'audio/{codec}'
+
+    # categorize the audio tracks by group
     audio_groups = {}
-    for adaptation_set_name, audio_tracks in list(audio_sets.items()):
-        language = audio_tracks[0].language
-        language_name = audio_tracks[0].language_name
-
-        audio_group_name = adaptation_set_name[0]+'/'+adaptation_set_name[2]
-        audio_groups[audio_group_name] = {
-            'codec': '',
+    for audio_track in all_audio_tracks:
+        audio_group_name = audio_track.hls_group
+        audio_group = audio_groups.setdefault(audio_group_name, {
+            'tracks': [],
+            'codecs': set(),
             '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']:
-                audio_groups[audio_group_name]['average_segment_bitrate'] = audio_track.average_segment_bitrate
-            if audio_track.max_segment_bitrate > audio_groups[audio_group_name]['max_segment_bitrate']:
-                audio_groups[audio_group_name]['max_segment_bitrate'] = audio_track.max_segment_bitrate
-
-            # update/check the codec
-            if audio_groups[audio_group_name]['codec'] == '':
-                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)
+        })
+        audio_group['tracks'].append(audio_track)
+
+    for audio_group_name, audio_group in audio_groups.items():
+        default_selected = False
+        media_names = []  # used to keep track of all media names used and detect duplicates
+        for audio_track in audio_group['tracks']:
+            # update the average and max bitrates
+            if audio_track.average_segment_bitrate > audio_group['average_segment_bitrate']:
+                audio_group['average_segment_bitrate'] = audio_track.average_segment_bitrate
+            if audio_track.max_segment_bitrate > audio_group['max_segment_bitrate']:
+                audio_group['max_segment_bitrate'] = audio_track.max_segment_bitrate
+
+            # update the codecs
+            audio_group['codecs'].add(audio_track.codec)
 
             if options.on_demand or not options.split:
                 media_subdir        = ''
@@ -871,29 +896,45 @@
                 media_playlist_name = options.hls_media_playlist_name
                 media_playlist_path = media_subdir+'/'+media_playlist_name
 
-            group_name = audio_track.label if audio_track.label != '' else language_name
-            master_playlist_file.write('#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="{}",LANGUAGE="{}",NAME="{}",AUTOSELECT=YES,DEFAULT={},URI="{}"\n'.format(
+            # compute a media name that is unique in the group
+            media_name = audio_track.label if audio_track.label else audio_track.language_name
+            if media_name in media_names:
+                duplicate = media_name
+                for suffix in range(1, len(media_names) + 1):
+                    media_name = f'{duplicate}-{suffix}'
+                    if media_name not in media_names:
+                        break
+            media_names.append(media_name)
+
+            default = audio_track.hls_default
+            if default is None:
+                default = not default_selected
+            if default:
+                default_selected = True
+            master_playlist_file.write('#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="{}",LANGUAGE="{}",NAME="{}",AUTOSELECT={},DEFAULT={},CHANNELS="{}",URI="{}"\n'.format(
                                        audio_group_name,
-                                       language,
-                                       group_name,
-                                       'YES' if select_as_default else 'NO',
+                                       audio_track.language,
+                                       media_name,
+                                       'YES' if audio_track.hls_autoselect else 'NO',
+                                       'YES' if default else 'NO',
+                                       audio_track.channels,
                                        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:
+            # Add an audio stream entry for audio-only presentations or if the track specifiers include a '-' entry
+            # for the group match spec ('+hls_group_match' is equal to or includes the special name '-')
+            if not all_video_tracks or '-' in audio_track.hls_group_match:
                 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))
+                                            ','.join(audio_group['codecs'])))
                 master_playlist_file.write(media_playlist_path+'\n')
 
     master_playlist_file.write('\n')
     master_playlist_file.write('# Video\n')
     iframe_playlist_lines = []
-    subtitles_group = 'SUBTITLES="subtitles",' if subtitles_files else ''
+    subtitles_group = 'SUBTITLES="subtitles",' if (subtitles_files or all_subtitles_tracks) else ''
     for video_track in all_video_tracks:
         if options.on_demand or not options.split:
             media_subdir          = ''
@@ -911,15 +952,17 @@
             iframes_playlist_path = media_subdir+'/'+iframes_playlist_name
 
         if audio_groups:
-            # one entry per audio group
+            # one entry per matching audio group
             for audio_group_name in audio_groups:
-                audio_codec = audio_groups[audio_group_name]['codec']
+                if '*' not in video_track.hls_group_match and audio_group_name not in video_track.hls_group_match:
+                    continue
+                audio_codecs = ','.join(audio_groups[audio_group_name]['codecs'])
                 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'],
-                                           video_track.codec+','+audio_codec,
+                                           video_track.codec+','+audio_codecs,
                                            video_track.width,
                                            video_track.height,
                                            video_track.frame_rate))
@@ -954,7 +997,7 @@
     # IMSC1 subtitles
     if all_subtitles_tracks:
         master_playlist_file.write('\n# Subtitles (IMSC1)\n')
-        select_as_default = True
+        default_selected = False
         for subtitles_track in all_subtitles_tracks:
             if subtitles_track.codec != 'stpp':
                 # only accept IMSC1 tracks
@@ -973,28 +1016,36 @@
                 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="subtitles",NAME="{}",DEFAULT={},AUTOSELECT=YES,LANGUAGE="{}",URI="{}"\n'.format(
+            default = subtitles_track.hls_default and not default_selected
+            if default is None:
+                default = not default_selected
+            if default:
+                default_selected = True
+            master_playlist_file.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitles",NAME="{}",AUTOSELECT={},DEFAULT={},LANGUAGE="{}",URI="{}"\n'.format(
                                        language_name,
-                                       'YES' if select_as_default else 'NO',
+                                       'YES' if subtitles_track.hls_autoselect else 'NO',
+                                       'YES' if default else 'NO',
                                        language,
                                        media_playlist_path))
-            select_as_default = False
 
     # WebVTT subtitles
     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
+        default_selected = False
         for subtitles_file in subtitles_files:
             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(
+            default = audio_track.hls_default and not default_selected
+            if default:
+                default_selected = True
+            master_playlist_file.write('#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitles",NAME="{}",AUTOSELECT={},DEFAULT={},LANGUAGE="{}",URI="{}/{}"\n'.format(
                                        language_name,
-                                       'YES' if select_as_default else 'NO',
+                                       'YES' if subtitles_file.hls_autoselect else 'NO',
+                                       'YES' if 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)
 
 #############################################
@@ -1316,6 +1367,14 @@
             # label
             track.label = media_source.spec.get('+label', '')
 
+            # HLS options
+            track.hls_default = media_source.spec.get('+hls_default', None)  # None means: unspecified
+            if track.hls_default is not None:
+                track.hls_default = BooleanFromString(track.hls_default)
+            track.hls_autoselect = BooleanFromString(media_source.spec.get('+hls_autoselect', 'YES'))
+            track.hls_group = media_source.spec.get('+hls_group')
+            track.hls_group_match = media_source.spec.get('+hls_group_match', '*').split('&')
+
         # update label indexes (so that we can use numbers instead of strings for labels)
         for track in tracks:
             if track.label not in label_indexes:
@@ -1323,7 +1382,7 @@
 
         # process audio tracks
         for track in [t for t in tracks if t.type == 'audio']:
-            adaptation_set_name = ('audio', track.language, track.codec_family)
+            adaptation_set_name = ('audio', track.language, track.codec)
 
             # add the label index
             adaptation_set_name += (str(label_indexes[track.label]),)
@@ -1708,6 +1767,8 @@
                       help="Hippo Media Server Manifest file name", metavar="<filename>", default='stream.msm')
     parser.add_option('', "--use-compat-namespace", dest="use_compat_namespace", action="store_true", default=False,
                       help="Use the original DASH MPD namespace as it was specified in the first published specification")
+    parser.add_option('', "--use-legacy-audio-channel-config-uri", dest="use_legacy_audio_channel_config_uri", action="store_true", default=False,
+                      help="Use the legacy DASH namespace URI for the AudioChannelConfiguration descriptor")
     parser.add_option('', "--encryption-key", dest="encryption_key", metavar='<key-spec>', default=None,
                       help="Encrypt some or all tracks with MPEG CENC (AES-128), where <key-spec> specifies the KID(s) and Key(s) to use, using one of the following forms: " +
                            "(1) <KID>:<key> or <KID>:<key>:<IV> with <KID> (and <IV> if specififed) as a 32-character hex string and <key> either a 32-character hex string or the character '#' followed by a base64-encoded key seed; or " +
@@ -2132,8 +2193,8 @@
         OutputHippo(options, audio_tracks, video_tracks)
 
 ###########################
-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")
+if sys.version_info < (3,7,0):
+    sys.stderr.write("ERROR: This tool must be run with Python 3.7 or above\n")
     sys.stderr.write("You are running Python version: "+sys.version+"\n")
     exit(1)

bento4-1.6.0r637.tar.gz/Source/Python/utils/mp4-hls.py -> bento4-1.6.0r638.tar.gz/Source/Python/utils/mp4-hls.py Changed

bento4-1.6.0r637.tar.gz/Source/Python/utils/mp4utils.py -> bento4-1.6.0r638.tar.gz/Source/Python/utils/mp4utils.py Changed

@@ -249,6 +249,11 @@
         xsd += ('%.3fS' % (s))
     return xsd
 
+def BooleanFromString(string):
+    if string is None:
+        return False
+    return string.lower() in ['yes', 'true', 'on', '1']
+
 def Base64Encode(x):
     return base64.b64encode(x).decode('ascii')
 
@@ -570,16 +575,9 @@
                 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 list(trun.items()):
-                        if name[0] in '0123456789':
-                            sample_duration = -1
-                            fields = value.split(',')
-                            for field in fields:
-                                if field.startswith('d:'):
-                                    sample_duration = int(field[2:])
-                            if sample_duration == -1:
-                                sample_duration = default_sample_duration
-                            segment_duration += sample_duration
+                    for entry in trun['entries']:
+                        sample_duration = int(entry.get('d', default_sample_duration))
+                        segment_duration += sample_duration
                 track.segment_scaled_durations.append(segment_duration)
                 segment_duration_sec = float(segment_duration) / float(track.timescale)
                 track.segment_durations.append(segment_duration_sec)

bento4-1.6.0r637.tar.gz/tasks/__init__.py -> bento4-1.6.0r638.tar.gz/tasks/__init__.py Changed

bento4-1.6.0r638.tar.gz/tasks/doc.py Added