Sync

.github/workflows/ci.yml

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

Build/Makefiles/Lib.mak

@@ -17,6 +17,7 @@ CORE_SOURCES = 								\
     Ap4Av1cAtom.cpp                         \
     Ap4ByteStream.cpp                       \
     Ap4Co64Atom.cpp                         \
+    Ap4ColrAtom.cpp                         \
     Ap4ContainerAtom.cpp                    \
     Ap4CttsAtom.cpp                         \
     Ap4DataBuffer.cpp                       \
@@ -25,6 +26,7 @@ CORE_SOURCES = 								\
     Ap4DecoderSpecificInfoDescriptor.cpp    \
     Ap4Descriptor.cpp                       \
     Ap4DescriptorFactory.cpp                \
+    Ap4DmlpAtom.cpp                         \
     Ap4DrefAtom.cpp                         \
     Ap4EsDescriptor.cpp                     \
     Ap4EsdsAtom.cpp                         \

Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj

@@ -119,6 +119,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ColrAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.cpp" />

Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ColrAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

Build/Targets/x86_64-microsoft-win32-vs2015/Bento4/Bento4.vcxproj

@@ -185,6 +185,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ColrAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.cpp" />

Build/Targets/x86_64-microsoft-win32-vs2015/Bento4/Bento4.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ColrAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj

@@ -168,6 +168,7 @@
     <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\Ap4DmlpAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4HvccAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4PsshAtom.cpp" />
@@ -190,6 +191,7 @@
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4BitStream.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ByteStream.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp" />
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ColrAtom.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4CommandFactory.cpp" />
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ContainerAtom.cpp" />
@@ -303,6 +305,7 @@
     <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\Ap4DmlpAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DvccAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4PsshAtom.h" />
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4SaioAtom.h" />

Build/Targets/x86_64-microsoft-win32-vs2019/Bento4/Bento4.vcxproj.filters

@@ -45,6 +45,9 @@
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Co64Atom.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4ColrAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4Command.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -411,6 +414,9 @@
     <ClCompile Include="..\..\..\..\Source\C++\Codecs\Ap4Eac3Parser.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\Source\C++\Core\Ap4DmlpAtom.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4.h">
@@ -833,5 +839,8 @@
     <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4Ac4Utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\Source\C++\Core\Ap4DmlpAtom.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Build/pkgconfig/bento4.pc.in

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

CMakeLists.txt

@@ -14,7 +14,9 @@ function(get_bento4_version)
 endfunction()
 
 get_bento4_version()
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "")
+if(APPLE)
+  set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "")
+endif()
 project(bento4 VERSION "${BENTO4_VERSION}")
 
 # Variables
@@ -34,7 +36,9 @@ if (EMSCRIPTEN)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-warn-absolute-paths")
 endif()
 
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
+if(APPLE)
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12)
+endif()
 
 if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
@@ -71,13 +75,18 @@ file(GLOB AP4_HEADERS
   ${SOURCE_METADATA}/*.h
 )
 
-add_library(ap4 STATIC ${AP4_SOURCES})
+option(BUILD_SHARED_LIBRARY "Build as a shared library" OFF)
+if(BUILD_SHARED_LIBRARY)
+  add_library(ap4 SHARED ${AP4_SOURCES})
+else()
+  add_library(ap4 STATIC ${AP4_SOURCES})
+endif()
 target_include_directories(ap4 PUBLIC
   ${AP4_INCLUDE_DIRS}
 )
 
-# Use the statically linked C runtime library
-if(MSVC)
+option(MSVC_FORCE_STATIC_C_RUNTIME "Use the statically linked C runtime library when compiling with MSVC" ON)
+if(MSVC AND MSVC_FORCE_STATIC_C_RUNTIME)
   set_property(TARGET ap4 PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
   target_compile_definitions(ap4 PRIVATE -D_LIB)
 endif()
@@ -92,7 +101,7 @@ foreach(app ${BENTO4_APPS})
   add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp)
   target_link_libraries(${binary_name} ap4)
 
-  if(MSVC)
+  if(MSVC AND MSVC_FORCE_STATIC_C_RUNTIME)
     set_property(TARGET ${binary_name} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     target_compile_definitions(${binary_name} PRIVATE -D_CONSOLE)
   endif()
@@ -119,6 +128,12 @@ configure_package_config_file(
     INSTALL_DESTINATION "${config_install_dir}"
 )
 
+configure_file(
+    "Build/pkgconfig/bento4.pc.in"
+    "${generated_dir}/bento4.pc"
+    @ONLY
+)
+
 install(
     TARGETS ap4 ${BENTO4_APPS_LOWERCASE}
     EXPORT "${TARGETS_EXPORT_NAME}"
@@ -138,6 +153,11 @@ install(
     DESTINATION "${config_install_dir}"
 )
 
+install(
+    FILES "${generated_dir}/bento4.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+)
+
 install(
     EXPORT "${TARGETS_EXPORT_NAME}"
     NAMESPACE "${namespace}"

Source/C++/Apps/Mp42Ts/Mp42Ts.cpp

@@ -301,21 +301,21 @@ WriteSamples(AP4_Mpeg2TsWriter&               writer,
                                                audio_track->GetSampleDescription(audio_sample.GetDescriptionIndex()), 
                                                video_track==NULL, 
                                                *output);
-            if (AP4_FAILED(result)) return result;
+            if (AP4_FAILED(result)) goto end;
 
             result = ReadSample(*audio_reader, *audio_track, audio_sample, audio_sample_data, audio_ts, audio_eos);
-            if (AP4_FAILED(result)) return result;
+            if (AP4_FAILED(result)) goto end;
             ++audio_sample_count;
         } else if (chosen_track == video_track) {
             result = video_stream->WriteSample(video_sample,
                                                video_sample_data, 
                                                video_track->GetSampleDescription(video_sample.GetDescriptionIndex()),
                                                true, 
                                                *output);
-            if (AP4_FAILED(result)) return result;
+            if (AP4_FAILED(result)) goto end;
 
             result = ReadSample(*video_reader, *video_track, video_sample, video_sample_data, video_ts, video_eos);
-            if (AP4_FAILED(result)) return result;
+            if (AP4_FAILED(result)) goto end;
             ++video_sample_count;
         } else {
             break;
@@ -347,7 +347,7 @@ WriteSamples(AP4_Mpeg2TsWriter&               writer,
     // create the playlist file if needed 
     if (Options.playlist) {
         playlist = OpenOutput(Options.playlist, 0);
-        if (playlist == NULL) return AP4_ERROR_CANNOT_OPEN_FILE;
+        if (playlist == NULL) goto end;
 
         unsigned int target_duration = 0;
         for (unsigned int i=0; i<segment_durations.ItemCount(); i++) {
@@ -515,8 +515,8 @@ main(int argc, char** argv)
     AP4_Movie* movie = input_file->GetMovie();
     if (movie == NULL) {
         fprintf(stderr, "ERROR: no movie in file\n");
-        delete input;
         delete input_file;
+        input->Release();
         return 1;
     }
 
@@ -581,7 +581,7 @@ main(int argc, char** argv)
             stream_id   = AP4_MPEG2_TS_STREAM_ID_PRIVATE_STREAM_1;
         } else {
             fprintf(stderr, "ERROR: audio codec not supported\n");
-            return 1;
+            goto end;
         }
 
         result = writer.SetAudioStream(audio_track->GetMediaTimeScale(),
@@ -622,7 +622,7 @@ main(int argc, char** argv)
             stream_type = AP4_MPEG2_STREAM_TYPE_HEVC;
         } else {
             fprintf(stderr, "ERROR: video codec not supported\n");
-            return 1;
+            goto end;
         }
         result = writer.SetVideoStream(video_track->GetMediaTimeScale(),
                                        stream_type,

Source/C++/Apps/Mp4Fragment/Mp4Fragment.cpp

@@ -623,7 +623,7 @@ Fragment(AP4_File&                input_file,
         AP4_UI32 sync_sample_flags = 0;
         AP4_UI32 non_sync_sample_flags = 0x10000; // 0x10000 -> sample_is_non_sync
         if (cursor->m_Track->GetType() == AP4_Track::TYPE_VIDEO ||
-            (cursor->m_Track->GetSampleDescriptionCount() > 0 &&
+            (cursor->m_Track->GetSampleDescriptionCount() > 0 && cursor->m_Track->GetSampleDescription(0) &&
              cursor->m_Track->GetSampleDescription(0)->GetFormat() == AP4_SAMPLE_FORMAT_AC_4)) {
             non_sync_sample_flags |= 0x1000000; // sample_depends_on=1 (not I frame)
             sync_sample_flags     |= 0x2000000; // sample_depends_on=2 (I frame)

Source/C++/Apps/Mp4Info/Mp4Info.cpp

@@ -653,6 +653,16 @@ ShowSampleDescription_Text(AP4_SampleDescription& description, bool verbose)
         break;
       }
 
+      case AP4_SAMPLE_FORMAT_MLPA: {
+        // Dolby TrueHD specifics
+        AP4_DmlpAtom* dmlp = AP4_DYNAMIC_CAST(AP4_DmlpAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_DMLP));
+        if (dmlp) {
+            printf("    Format Info:    %d\n", dmlp->m_FormatInfo);
+            printf("    Peak Data Rate: %d\n", dmlp->m_PeakDataRate);
+        }
+        break;
+      }
+
       // VPx Specifics
       case AP4_SAMPLE_FORMAT_VP8:
       case AP4_SAMPLE_FORMAT_VP9:
@@ -1081,6 +1091,22 @@ ShowSampleDescription_Json(AP4_SampleDescription& description, bool verbose)
         printf("}");
     }
 
+    // Color information from colr atom for non-VPx tracks
+    if (desc->GetFormat() != AP4_SAMPLE_FORMAT_VP8 &&
+        desc->GetFormat() != AP4_SAMPLE_FORMAT_VP9 &&
+        desc->GetFormat() != AP4_SAMPLE_FORMAT_VP10) {
+        AP4_ColrAtom* colr = AP4_DYNAMIC_CAST(AP4_ColrAtom, desc->GetDetails().GetChild(AP4_ATOM_TYPE_COLR));
+        if (colr && colr->GetColourParameterType() == AP4_SAMPLE_COLOR_TYPE_NCLX) {
+            printf(",\n");
+            printf("\"color_info\": {\n");
+            printf("    \"colour_primaries\":%d,\n", colr->GetPrimariesIndex());
+            printf("    \"transfer_characteristics\":%d,\n", colr->GetTransferFunctionIndex());
+            printf("    \"matrix_coefficients\":%d,\n", colr->GetMatrixIndex());
+            printf("    \"video_full_range_flag\":%s\n", colr->GetFullRangeFlag() ? "true" : "false");
+            printf("}");
+        }
+    }
+
     printf("\n}");
 }
 

Source/C++/Apps/Mp4Mux/Mp4Mux.cpp

@@ -667,7 +667,7 @@ AddAc3Track(AP4_Movie&             movie,
         if (!movie.GetTimeScale()) {
             duration = sample_count * 1536;
         } else {
-            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), sample_rate, movie.GetTimeScale());
+            duration = AP4_ConvertTime(1536*sample_table->GetSampleCount(), sample_rate, movie.GetTimeScale());
         }
         AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, 0, 1);
         new_elst->AddEntry(new_elst_entry);
@@ -814,7 +814,7 @@ AddEac3Track(AP4_Movie&             movie,
         if (!movie.GetTimeScale()) {
             duration = sample_count * 1536;
         } else {
-            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), sample_rate, movie.GetTimeScale());
+            duration = AP4_ConvertTime(1536*sample_table->GetSampleCount(), sample_rate, movie.GetTimeScale());
         }
         AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, 0, 1);
         new_elst->AddEntry(new_elst_entry);
@@ -962,7 +962,7 @@ AddAc4Track(AP4_Movie&            movie,
         if (!movie.GetTimeScale()) {
             duration = AP4_UI64(sample_count) * sample_duration;
         } else {
-            duration = AP4_ConvertTime(1000*sample_table->GetSampleCount(), media_time_scale, movie.GetTimeScale());
+            duration = AP4_ConvertTime(AP4_UI64(sample_duration)*sample_table->GetSampleCount(), media_time_scale, movie.GetTimeScale());
         }
         AP4_ElstEntry new_elst_entry = AP4_ElstEntry(duration, 0, 1);
         new_elst->AddEntry(new_elst_entry);

Source/C++/Codecs/Ap4Ac3Parser.cpp

@@ -43,6 +43,13 @@ AP4_Ac3Header::AP4_Ac3Header(const AP4_UI08* bytes)
     bits.SkipBits(16);                  // crc1
     m_Fscod       = bits.ReadBits(2);
     m_Frmsizecod  = bits.ReadBits(6);   // frmsizecod
+    if (m_Fscod >= sizeof(FRAME_SIZE_CODE_ARY_AC3)/sizeof(FRAME_SIZE_CODE_ARY_AC3[0]) ||
+        m_Frmsizecod >= sizeof(FRAME_SIZE_CODE_ARY_AC3[0])/sizeof(FRAME_SIZE_CODE_ARY_AC3[0][0])) {
+        m_FrameSize = 0;
+        // invalid frame size code, set bsid to an invalid value to make sure the header check will fail
+        m_Bsid = 0xFF;
+        return;
+    }
     m_FrameSize   = FRAME_SIZE_CODE_ARY_AC3[m_Fscod][m_Frmsizecod] * 2;
 
     m_Bsid        = bits.ReadBits(5);
@@ -58,6 +65,11 @@ AP4_Ac3Header::AP4_Ac3Header(const AP4_UI08* bytes)
         bits.SkipBits(2);               //dsurmod
     }
     m_Lfeon         = bits.ReadBit();
+    if (m_Acmod >= sizeof(GLOBAL_CHANNEL_ARY)/sizeof(GLOBAL_CHANNEL_ARY[0])) {
+        // invalid acmod, set bsid to an invalid value to make sure the header check will fail
+        m_Bsid = 0xFF;
+        return;
+    }
     m_ChannelCount  = GLOBAL_CHANNEL_ARY[m_Acmod] + m_Lfeon;
     bits.SkipBits(5);                   // dialnorm
     if(bits.ReadBit()){                 // compre