feat(HLS): Add HLS support for non-sequence mode

shaka-project · Oct 26, 2022 · 888c9d7 · 888c9d7
1 parent 57ce56b
commit 888c9d7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/externs/shaka/player.js b/externs/shaka/player.js
@@ -829,7 +829,8 @@ shaka.extern.DashManifestConfiguration;
  *   ignoreManifestProgramDateTime: boolean,
  *   mediaPlaylistFullMimeType: string,
  *   useSafariBehaviorForLive: boolean,
- *   liveSegmentsDelay: number
+ *   liveSegmentsDelay: number,
+ *   sequenceMode: boolean
  * }}
  *
  * @property {boolean} ignoreTextStreamFailures
@@ -870,6 +871,11 @@ shaka.extern.DashManifestConfiguration;
  *   The default presentation delay will be calculated as a number of segments.
  *   This is the number of segments for this calculation..
  *   <i>Defaults to <code>3</code>.</i>
+ * @property {boolean} sequenceMode
+ *   If true, the media segments are appended to the SourceBuffer in
+ *   "sequence mode" (ignoring their internal timestamps).
+ *   Defaults to <code>true</code> except on WebOS 3, Tizen 2,
+ *   Tizen 3 and PlayStation 4 which defualt value is <code>false</code>.
  * @exportDoc
  */
 shaka.extern.HlsManifestConfiguration;

diff --git a/lib/hls/hls_parser.js b/lib/hls/hls_parser.js
@@ -732,7 +732,7 @@ shaka.hls.HlsParser = class {
       imageStreams,
       offlineSessionIds: [],
       minBufferTime: 0,
-      sequenceMode: true,
+      sequenceMode: this.config_.hls.sequenceMode,
     };
     this.playerInterface_.makeTextStreamsForClosedCaptions(this.manifest_);
   }

diff --git a/lib/media/media_source_engine.js b/lib/media/media_source_engine.js
@@ -573,8 +573,14 @@ shaka.media.MediaSourceEngine = class {
 
     const uint8ArrayData = shaka.util.BufferUtils.toUint8(data);
     if (shaka.util.TsParser.probe(uint8ArrayData)) {
-      const metadata = new shaka.util.TsParser().parse(uint8ArrayData)
-          .getMetadata();
+      const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);
+      const timestampOffset =
+          reference.startTime - tsParser.getStartTime()[contentType] || 0;
+      this.enqueueOperation_(contentType, () => this.abort_(contentType));
+      this.enqueueOperation_(
+          contentType,
+          () => this.setTimestampOffset_(contentType, timestampOffset));
+      const metadata = tsParser.getMetadata();
       if (metadata.length) {
         const timestampOffset =
             this.sourceBuffers_[contentType].timestampOffset;

diff --git a/lib/util/player_configuration.js b/lib/util/player_configuration.js
@@ -82,6 +82,14 @@ shaka.util.PlayerConfiguration = class {
       parseInbandPsshEnabled: shaka.util.Platform.isXboxOne(),
     };
 
+    let supportsSequenceMode = true;
+    if (shaka.util.Platform.isTizen3() ||
+        shaka.util.Platform.isTizen2() ||
+        shaka.util.Platform.isWebOS3() ||
+        shaka.util.Platform.isPS4()) {
+      supportsSequenceMode = false;
+    }
+
     const manifest = {
       retryParameters: shaka.net.NetworkingEngine.defaultRetryParameters(),
       availabilityWindowOverride: NaN,
@@ -132,6 +140,7 @@ shaka.util.PlayerConfiguration = class {
             'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"',
         useSafariBehaviorForLive: true,
         liveSegmentsDelay: 3,
+        sequenceMode: supportsSequenceMode,
       },
     };