feat: Add a Mp4Generator (shaka-project#5127)

theodab · Apr 12, 2023 · d475a73 · d475a73
1 parent 412a7e8
commit d475a73
Show file tree

Hide file tree

Showing 5 changed files with 974 additions and 841 deletions.
diff --git a/build/types/core b/build/types/core
@@ -91,6 +91,7 @@
 +../../lib/util/media_ready_state_utils.js
 +../../lib/util/mime_utils.js
 +../../lib/util/mp4_box_parsers.js
++../../lib/util/mp4_generator.js
 +../../lib/util/mp4_parser.js
 +../../lib/util/multi_map.js
 +../../lib/util/networking.js

diff --git a/build/types/mss b/build/types/mss
@@ -2,6 +2,5 @@
 
 +../../lib/mss/content_protection.js
 +../../lib/mss/mss_parser.js
-+../../lib/mss/mss_utils.js
 
 +../../lib/transmuxer/mss_transmuxer.js
diff --git a/lib/mss/mss_parser.js b/lib/mss/mss_parser.js
@@ -15,14 +15,13 @@ goog.require('shaka.media.PresentationTimeline');
 goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.mss.ContentProtection');
-goog.require('shaka.mss.MssUtils');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Mp4Generator');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.XmlUtils');
-goog.require('shaka.dependencies');
 
 
 /**
@@ -485,6 +484,13 @@ shaka.mss.MssParser = class {
     const audioSamplingRate = XmlUtils.parseAttr(
         qualityLevel, 'SamplingRate', XmlUtils.parsePositiveInt);
 
+    let duration = context.duration;
+    if (timeline.length) {
+      const start = timeline[0].start;
+      const end = timeline[timeline.length - 1].end;
+      duration = end - start;
+    }
+
     /** @type {!shaka.extern.Stream} */
     const stream = {
       id: id,
@@ -519,7 +525,7 @@ shaka.mss.MssParser = class {
       tilesLayout: undefined,
       matchedStreams: [],
       mssPrivateData: {
-        duration: context.duration,
+        duration: duration,
         timescale: context.timescale,
         codecPrivateData: null,
       },
@@ -612,7 +618,16 @@ shaka.mss.MssParser = class {
       if (this.initSegmentDataByStreamId_.has(stream.id)) {
         initSegmentData = this.initSegmentDataByStreamId_.get(stream.id);
       } else {
-        initSegmentData = shaka.mss.MssUtils.generateInitSegment(stream);
+        const timescale = stream.mssPrivateData.timescale;
+        const duration = stream.mssPrivateData.duration;
+        let videoNalus = null;
+        if (stream.type == ContentType.VIDEO) {
+          const codecPrivateData = stream.mssPrivateData.codecPrivateData;
+          videoNalus = codecPrivateData.split('00000001').slice(1);
+        }
+        const mp4Generator = new shaka.util.Mp4Generator(
+            stream, timescale, duration, videoNalus);
+        initSegmentData = mp4Generator.initSegment();
         this.initSegmentDataByStreamId_.set(stream.id, initSegmentData);
       }
       const initSegmentRef = new shaka.media.InitSegmentReference(
@@ -624,7 +639,7 @@ shaka.mss.MssParser = class {
           initSegmentData);
 
       const segments = this.createSegments_(initSegmentRef,
-          stream, streamIndex, timeline, context);
+          stream, streamIndex, timeline);
 
       stream.segmentIndex = new shaka.media.SegmentIndex(segments);
       return Promise.resolve();
@@ -784,11 +799,10 @@ shaka.mss.MssParser = class {
    * @param {!shaka.extern.Stream} stream
    * @param {!Element} streamIndex
    * @param {!Array.<shaka.mss.MssParser.TimeRange>} timeline
-   * @param {!shaka.mss.MssParser.Context} context
    * @return {!Array.<!shaka.media.SegmentReference>}
    * @private
    */
-  createSegments_(initSegmentRef, stream, streamIndex, timeline, context) {
+  createSegments_(initSegmentRef, stream, streamIndex, timeline) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const url = streamIndex.getAttribute('Url');
     goog.asserts.assert(url, 'Missing URL for segments');
@@ -810,7 +824,7 @@ shaka.mss.MssParser = class {
           initSegmentRef,
           /* timestampOffset= */ 0,
           /* appendWindowStart= */ 0,
-          /* appendWindowEnd= */ context.duration));
+          /* appendWindowEnd= */ stream.mssPrivateData.duration));
     }
     return segments;
   }
@@ -1043,9 +1057,7 @@ shaka.mss.MssParser.Context;
  */
 shaka.mss.MssParser.TimeRange;
 
-if (shaka.dependencies.isoBoxer()) {
-  shaka.media.ManifestParser.registerParserByExtension(
-      'ism', () => new shaka.mss.MssParser());
-  shaka.media.ManifestParser.registerParserByMime(
-      'application/vnd.ms-sstr+xml', () => new shaka.mss.MssParser());
-}
+shaka.media.ManifestParser.registerParserByExtension(
+    'ism', () => new shaka.mss.MssParser());
+shaka.media.ManifestParser.registerParserByMime(
+    'application/vnd.ms-sstr+xml', () => new shaka.mss.MssParser());