hls.js 1.6.0-rc.1.0.canary.11078 → 1.6.0-rc.1.0.canary.11080

package/dist/hls.light.mjs

@@ -402,7 +402,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-rc.1.0.canary.11078"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-rc.1.0.canary.11080"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -7964,6 +7964,14 @@ class BaseStreamController extends TaskLoop {
       return (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details;
     }
   }
+  get timelineOffset() {
+    const configuredTimelineOffset = this.config.timelineOffset;
+    if (configuredTimelineOffset) {
+      var _this$getLevelDetails;
+      return ((_this$getLevelDetails = this.getLevelDetails()) == null ? void 0 : _this$getLevelDetails.appliedTimelineOffset) || configuredTimelineOffset;
+    }
+    return 0;
+  }
   onMediaAttached(event, data) {
     const media = this.media = this.mediaBuffer = data.media;
     media.removeEventListener('seeking', this.onMediaSeeking);
@@ -8661,8 +8669,8 @@ class BaseStreamController extends TaskLoop {
       const end = this.loadingParts ? levelDetails.partEnd : levelDetails.fragmentEnd;
       frag = this.getFragmentAtPosition(pos, end, levelDetails);
     }
-    frag = this.filterReplacedPrimary(frag, levelDetails);
-    return this.mapToInitFragWhenRequired(frag);
+    const programFrag = this.filterReplacedPrimary(frag, levelDetails);
+    return this.mapToInitFragWhenRequired(programFrag);
   }
   isLoopLoading(frag, targetBufferTime) {
     const trackerState = this.fragmentTracker.getState(frag);
@@ -8689,11 +8697,15 @@ class BaseStreamController extends TaskLoop {
     this.loopSn = undefined;
     return nextFragment;
   }
+  get primaryPrefetch() {
+    if (interstitialsEnabled(this.hls.config)) ;
+    return false;
+  }
   filterReplacedPrimary(frag, details) {
     if (!frag) {
       return frag;
     }
-    this.hls.config;
+    if (interstitialsEnabled(this.hls.config)) ;
     return frag;
   }
   mapToInitFragWhenRequired(frag) {
@@ -8865,6 +8877,7 @@ class BaseStreamController extends TaskLoop {
     if (startPosition < sliding) {
       startPosition = -1;
     }
+    const timelineOffset = this.timelineOffset;
     if (startPosition === -1) {
       // Use Playlist EXT-X-START:TIME-OFFSET when set
       // Prioritize Multivariant Playlist offset so that main, audio, and subtitle stream-controller start times match
@@ -8888,9 +8901,9 @@ class BaseStreamController extends TaskLoop {
         this.log(`setting startPosition to 0 by default`);
         this.startPosition = startPosition = 0;
       }
-      this.lastCurrentTime = startPosition;
+      this.lastCurrentTime = startPosition + timelineOffset;
     }
-    this.nextLoadPosition = startPosition;
+    this.nextLoadPosition = startPosition + timelineOffset;
   }
   getLoadPosition() {
     var _this$hls;
@@ -9170,6 +9183,9 @@ class BaseStreamController extends TaskLoop {
     return this._state;
   }
 }
+function interstitialsEnabled(config) {
+  return false;
+}
 
 class BufferOperationQueue {
   constructor(sourceBufferReference) {
@@ -10210,17 +10226,10 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
       return type && !((_this$tracks$type4 = this.tracks[type]) != null && _this$tracks$type4.ended);
     });
     if (allTracksEnding) {
-      this.log(`Queueing EOS`);
-      this.blockUntilOpen(() => {
-        this.sourceBuffers.forEach(([type]) => {
-          if (type !== null) {
-            const track = this.tracks[type];
-            if (track) {
-              track.ending = false;
-            }
-          }
-        });
-        if (allowEndOfStream) {
+      if (allowEndOfStream) {
+        this.log(`Queueing EOS`);
+        this.blockUntilOpen(() => {
+          this.tracksEnded();
           const {
             mediaSource
           } = this;
@@ -10233,11 +10242,24 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
           this.log(`Calling mediaSource.endOfStream()`);
           // Allow this to throw and be caught by the enqueueing function
           mediaSource.endOfStream();
-        }
+          this.hls.trigger(Events.BUFFERED_TO_END, undefined);
+        });
+      } else {
+        this.tracksEnded();
         this.hls.trigger(Events.BUFFERED_TO_END, undefined);
-      });
+      }
     }
   }
+  tracksEnded() {
+    this.sourceBuffers.forEach(([type]) => {
+      if (type !== null) {
+        const track = this.tracks[type];
+        if (track) {
+          track.ending = false;
+        }
+      }
+    });
+  }
   onLevelUpdated(event, {
     details
   }) {
@@ -18861,9 +18883,10 @@ class LatencyController {
       if (inLiveRange && distanceFromTarget > 0.05 && this.forwardBufferLength > 1) {
         const max = Math.min(2, Math.max(1.0, maxLiveSyncPlaybackRate));
         const rate = Math.round(2 / (1 + Math.exp(-0.75 * distanceFromTarget - this.edgeStalled)) * 20) / 20;
-        media.playbackRate = Math.min(max, Math.max(1, rate));
+        const playbackRate = Math.min(max, Math.max(1, rate));
+        this.changeMediaPlaybackRate(media, playbackRate);
       } else if (media.playbackRate !== 1 && media.playbackRate !== 0) {
-        media.playbackRate = 1;
+        this.changeMediaPlaybackRate(media, 1);
       }
     };
     this.hls = hls;
@@ -19022,6 +19045,14 @@ class LatencyController {
       this.hls.logger.warn('[latency-controller]: Stall detected, adjusting target latency');
     }
   }
+  changeMediaPlaybackRate(media, playbackRate) {
+    var _this$hls2, _this$targetLatency;
+    if (media.playbackRate === playbackRate) {
+      return;
+    }
+    (_this$hls2 = this.hls) == null ? void 0 : _this$hls2.logger.debug(`[latency-controller]: latency=${this.latency.toFixed(3)}, targetLatency=${(_this$targetLatency = this.targetLatency) == null ? void 0 : _this$targetLatency.toFixed(3)}, forwardBufferLength=${this.forwardBufferLength.toFixed(3)}: adjusting playback rate from ${media.playbackRate} to ${playbackRate}`);
+    media.playbackRate = playbackRate;
+  }
   estimateLiveEdge() {
     const levelDetails = this.levelDetails;
     if (levelDetails === null) {
@@ -19637,7 +19668,7 @@ function assignTrackIdsByGroup(tracks) {
   });
 }
 
-const version = "1.6.0-rc.1.0.canary.11078";
+const version = "1.6.0-rc.1.0.canary.11080";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -20160,7 +20191,7 @@ class StreamController extends BaseStreamController {
         startPosition = lastCurrentTime;
       }
       this.state = State.IDLE;
-      this.nextLoadPosition = this.lastCurrentTime = startPosition;
+      this.nextLoadPosition = this.lastCurrentTime = startPosition + this.timelineOffset;
       this.startPosition = skipSeekToStartPosition ? -1 : startPosition;
       this.tick();
     } else {
@@ -20236,7 +20267,7 @@ class StreamController extends BaseStreamController {
     // if start level not parsed yet OR
     // if video not attached AND start fragment already requested OR start frag prefetch not enabled
     // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
-    if (levelLastLoaded === null || !media && (this.startFragRequested || !hls.config.startFragPrefetch)) {
+    if (levelLastLoaded === null || !media && !this.primaryPrefetch && (this.startFragRequested || !hls.config.startFragPrefetch)) {
       return;
     }
 
@@ -20866,11 +20897,11 @@ class StreamController extends BaseStreamController {
       }
 
       // Offset start position by timeline offset
-      const details = this.getLevelDetails();
-      const configuredTimelineOffset = this.config.timelineOffset;
-      if (configuredTimelineOffset && startPosition) {
-        startPosition += (details == null ? void 0 : details.appliedTimelineOffset) || configuredTimelineOffset;
+      const timelineOffset = this.timelineOffset;
+      if (timelineOffset && startPosition) {
+        startPosition += timelineOffset;
       }
+      const details = this.getLevelDetails();
       const buffered = BufferHelper.getBuffered(media);
       const bufferStart = buffered.length ? buffered.start(0) : 0;
       const delta = bufferStart - startPosition;