handle dav1 non-backwward compatible mode and add the dby1 compatible…

… brands for P10.x as well
shaka-project · May 8, 2024 · e6c3c69 · e6c3c69
1 parent 5762215
commit e6c3c69
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/packager/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc
@@ -163,6 +163,7 @@ bool UpdateCodecStringForDolbyVision(
   switch (actual_format) {
     case FOURCC_dvh1:
     case FOURCC_dvhe:
+    case FOURCC_dav1:
       // Non-Backward compatibility mode. Replace the code string with
       // Dolby Vision only.
       *codec_string = dovi_config.GetCodecString(actual_format);
@@ -202,6 +203,7 @@ bool UpdateDolbyVisionInfo(FourCC actual_format,
   switch (actual_format) {
     case FOURCC_dvh1:
     case FOURCC_dvhe:
+    case FOURCC_dav1:
       // Non-Backward compatibility mode. Replace the code string with
       // Dolby Vision only.
       *codec_string = dovi_config.GetCodecString(actual_format);

diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc
@@ -244,7 +244,9 @@ Status MP4Muxer::DelayInitializeMuxer() {
           static_cast<const VideoStreamInfo*>(streams()[0].get())
               ->supplemental_codec();
       if (codec_string.find("dvh") != std::string::npos ||
-          supplemental_codec_string.find("dvh") != std::string::npos)
+          supplemental_codec_string.find("dvh") != std::string::npos ||
+          codec_string.find("dav1") != std::string::npos ||
+          supplemental_codec_string.find("dav1") != std::string::npos)
         ftyp->compatible_brands.push_back(FOURCC_dby1);
       FourCC extra_brand =
           static_cast<const VideoStreamInfo*>(streams()[0].get())