fix: Fix support for Dolby Vision based in VVC (#7212)

Info from https://dolby.my.salesforce.com/sfc/p/#700000009YuG/a/4u000000l6G4/4R18riPaaW3gxpVx7XwyQLdEITLFjB.w.Si0LoQR5j8
shaka-project · Aug 27, 2024 · 5c3ea38 · 5c3ea38
1 parent c690e4e
commit 5c3ea38
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 7 deletions.
diff --git a/lib/cea/mp4_cea_parser.js b/lib/cea/mp4_cea_parser.js
@@ -105,14 +105,16 @@ shaka.cea.Mp4CeaParser = class {
         // These are the various boxes that signal a codec.
         .box('avc1', codecBoxParser)
         .box('avc3', codecBoxParser)
-        .box('hev1', codecBoxParser)
-        .box('hvc1', codecBoxParser)
         .box('dvav', codecBoxParser)
         .box('dva1', codecBoxParser)
+        .box('hev1', codecBoxParser)
+        .box('hvc1', codecBoxParser)
         .box('dvh1', codecBoxParser)
         .box('dvhe', codecBoxParser)
         .box('vvc1', codecBoxParser)
         .box('vvi1', codecBoxParser)
+        .box('dvc1', codecBoxParser)
+        .box('dvi1', codecBoxParser)
 
         // This signals an encrypted sample, which we can go inside of to find
         // the codec used.
@@ -406,18 +408,21 @@ shaka.cea.Mp4CeaParser.CodecBitstreamMap_ = {
   // AVC
   'avc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
   'avc3': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
-  // HEVC
-  'hev1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
-  'hvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   // Dolby Vision based in AVC
   'dvav': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
   'dva1': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
+  // HEVC
+  'hev1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
+  'hvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   // Dolby Vision based in HEVC
   'dvh1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   'dvhe': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
   // VVC
   'vvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
   'vvi1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
+  // Dolby Vision based in VVC
+  'dvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
+  'dvi1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
 };
 
 /**

diff --git a/lib/media/content_workarounds.js b/lib/media/content_workarounds.js
@@ -95,6 +95,18 @@ shaka.media.ContentWorkarounds = class {
             newType: ContentWorkarounds.BOX_TYPE_ENCV_,
           });
         })
+        .fullBox('dvc1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvi1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
         .fullBox('hev1', (box) => {
           boxesToModify.push({
             box,

diff --git a/lib/media/segment_utils.js b/lib/media/segment_utils.js
@@ -493,9 +493,13 @@ shaka.media.SegmentUtils = class {
       return codecs;
     }
     const dolbyVision = codecs.find((codec) => {
-      return codec.startsWith('dvh1.') ||
+      return codec.startsWith('dvav.') ||
+          codec.startsWith('dva1.') ||
+          codec.startsWith('dvh1.') ||
           codec.startsWith('dvhe.') ||
-          codec.startsWith('dav1.');
+          codec.startsWith('dav1.') ||
+          codec.startsWith('dvc1.') ||
+          codec.startsWith('dvi1.');
     });
     if (!dolbyVision) {
       return codecs;

diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
@@ -2029,6 +2029,8 @@ shaka.media.StreamingEngine = class {
                 .box('dva1', Mp4Parser.visualSampleEntry)
                 .box('dvh1', Mp4Parser.visualSampleEntry)
                 .box('dvhe', Mp4Parser.visualSampleEntry)
+                .box('dvc1', Mp4Parser.visualSampleEntry)
+                .box('dvi1', Mp4Parser.visualSampleEntry)
                 .box('vexu', Mp4Parser.children)
                 .box('proj', Mp4Parser.children)
                 .fullBox('prji', (box) => {

diff --git a/lib/util/mime_utils.js b/lib/util/mime_utils.js
@@ -183,6 +183,9 @@ shaka.util.MimeUtils = class {
         return 'dovi-avc'; // Dolby Vision based in AVC
       case base === 'dav1':
         return 'dovi-av1'; // Dolby Vision based in AV1
+      case base === 'dvc1':
+      case base === 'dvi1':
+        return 'dovi-vvc'; // Dolby Vision based in VVC
     }
     return base;
   }

diff --git a/lib/util/stream_utils.js b/lib/util/stream_utils.js
@@ -418,6 +418,8 @@ shaka.util.StreamUtils = class {
       'dva1': 'avc1',
       'dvhe': 'hev1',
       'dvh1': 'hvc1',
+      'dvc1': 'vvc1',
+      'dvi1': 'vvi1',
     };
     /** @type {!Set<!shaka.extern.Stream>} */
     const streams = new Set();

diff --git a/test/util/mime_utils_unit.js b/test/util/mime_utils_unit.js
@@ -58,6 +58,9 @@ describe('MimeUtils', () => {
     expect(getNormalizedCodec('dvav.05')).toBe('dovi-avc');
 
     expect(getNormalizedCodec('dav1.05')).toBe('dovi-av1');
+
+    expect(getNormalizedCodec('dvc1.05')).toBe('dovi-vvc');
+    expect(getNormalizedCodec('dvi1.05')).toBe('dovi-vvc');
   });
 
   it('isHlsType', () => {