hls.js 1.6.0-beta.1.0.canary.10766 → 1.6.0-beta.1.0.canary.10768

package/dist/hls.light.mjs

@@ -400,7 +400,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-beta.1.0.canary.10766"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10768"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -3256,6 +3256,13 @@ class LevelDetails {
     }
     return this.endSN;
   }
+  get expired() {
+    if (this.live && this.age) {
+      const playlistWindowDuration = this.partEnd - this.fragmentStart;
+      return this.age > Math.max(playlistWindowDuration, this.totalduration) + this.levelTargetDuration;
+    }
+    return false;
+  }
 }
 
 var DecrypterAesMode = {
@@ -7836,6 +7843,10 @@ class BaseStreamController extends TaskLoop {
       details.deltaUpdateFailed = true;
     }
   }
+  waitForLive(levelInfo) {
+    const details = levelInfo.details;
+    return (details == null ? void 0 : details.live) && details.type !== 'EVENT' && (this.levelLastLoaded !== levelInfo || details.expired);
+  }
   flushMainBuffer(startOffset, endOffset, type = null) {
     if (!(startOffset - endOffset)) {
       return;
@@ -8192,7 +8203,7 @@ class BaseStreamController extends TaskLoop {
       part: partIndex
     } = chunkMeta;
     if (!(levels != null && levels[levelIndex])) {
-      this.warn(`Levels object was unset while buffering fragment ${sn} of level ${levelIndex}. The current chunk will not be buffered.`);
+      this.warn(`Levels object was unset while buffering fragment ${sn} of ${this.playlistLabel()} ${levelIndex}. The current chunk will not be buffered.`);
       return null;
     }
     const level = levels[levelIndex];
@@ -8581,6 +8592,7 @@ class BaseStreamController extends TaskLoop {
         // Leave this.startPosition at -1, so that we can use `getInitialLiveFragment` logic when startPosition has
         // not been specified via the config or an as an argument to startLoad (#3736).
         startPosition = this.hls.liveSyncPosition || sliding;
+        this.startPosition = -1;
       } else {
         this.log(`setting startPosition to 0 by default`);
         this.startPosition = startPosition = 0;
@@ -8603,8 +8615,8 @@ class BaseStreamController extends TaskLoop {
     return pos;
   }
   handleFragLoadAborted(frag, part) {
-    if (this.transmuxer && isMediaFragment(frag) && frag.stats.aborted) {
-      this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${frag.level} was aborted`);
+    if (this.transmuxer && frag.type === this.playlistType && isMediaFragment(frag) && frag.stats.aborted) {
+      this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of ${this.playlistLabel()} ${frag.level} was aborted`);
       this.resetFragmentLoading(frag);
     }
   }
@@ -8755,7 +8767,7 @@ class BaseStreamController extends TaskLoop {
     }
   }
   resetWhenMissingContext(chunkMeta) {
-    this.warn(`The loading context changed while buffering fragment ${chunkMeta.sn} of level ${chunkMeta.level}. This chunk will not be buffered.`);
+    this.warn(`The loading context changed while buffering fragment ${chunkMeta.sn} of ${this.playlistLabel()} ${chunkMeta.level}. This chunk will not be buffered.`);
     this.removeUnbufferedFrags();
     this.resetStartWhenNotLoaded(this.levelLastLoaded);
     this.resetLoadingState();
@@ -8796,7 +8808,7 @@ class BaseStreamController extends TaskLoop {
       return result;
     }, false);
     if (!parsed && ((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null) {
-      const error = new Error(`Found no media in fragment ${frag.sn} of level ${frag.level} resetting transmuxer to fallback to playlist timing`);
+      const error = new Error(`Found no media in fragment ${frag.sn} of ${this.playlistLabel()} ${frag.level} resetting transmuxer to fallback to playlist timing`);
       if (level.fragmentError === 0) {
         // Mark and track the odd empty segment as a gap to avoid reloading
         this.treatAsGap(frag, level);
@@ -8808,7 +8820,7 @@ class BaseStreamController extends TaskLoop {
         fatal: false,
         error,
         frag,
-        reason: `Found no media in msn ${frag.sn} of level "${level.url}"`
+        reason: `Found no media in msn ${frag.sn} of ${this.playlistLabel()} "${level.url}"`
       });
       if (!this.hls) {
         return;
@@ -18666,7 +18678,9 @@ class LevelController extends BasePlaylistController {
         }
       }
       const pathwayId = currentLevel.attrs['PATHWAY-ID'];
-      this.log(`Loading level index ${currentLevelIndex}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''} with${pathwayId ? ' Pathway ' + pathwayId : ''} ${url}`);
+      const details = currentLevel.details;
+      const age = details == null ? void 0 : details.age;
+      this.log(`Loading level index ${currentLevelIndex}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${pathwayId ? ' Pathway ' + pathwayId : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
 
       // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId);
       // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
@@ -19099,7 +19113,7 @@ class GapController extends Logger {
   }
 }
 
-const version = "1.6.0-beta.1.0.canary.10766";
+const version = "1.6.0-beta.1.0.canary.10768";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -19618,7 +19632,7 @@ class StreamController extends BaseStreamController {
         this._hasEnoughToStart = false;
       }
       // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
-      if (lastCurrentTime > 0 && startPosition === -1) {
+      if (lastCurrentTime > 0 && startPosition === -1 && !skipSeekToStartPosition) {
         this.log(`Override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
         startPosition = lastCurrentTime;
       }
@@ -19645,7 +19659,7 @@ class StreamController extends BaseStreamController {
           } = this;
           const currentLevel = levels == null ? void 0 : levels[level];
           const details = currentLevel == null ? void 0 : currentLevel.details;
-          if (details && (!details.live || this.levelLastLoaded === currentLevel)) {
+          if (details && (!details.live || this.levelLastLoaded === currentLevel && !this.waitForLive(currentLevel))) {
             if (this.waitForCdnTuneIn(details)) {
               break;
             }
@@ -19739,9 +19753,10 @@ class StreamController extends BaseStreamController {
     // if level info not retrieved yet, switch state and wait for level retrieval
     // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load
     // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist)
-    if (!levelDetails || this.state === State.WAITING_LEVEL || levelDetails.live && this.levelLastLoaded !== levelInfo) {
+    if (!levelDetails || this.state === State.WAITING_LEVEL || this.waitForLive(levelInfo)) {
       this.level = level;
       this.state = State.WAITING_LEVEL;
+      this.startFragRequested = false;
       return;
     }
     const bufferLen = bufferInfo.len;
@@ -19991,7 +20006,7 @@ class StreamController extends BaseStreamController {
       return;
     }
     const level = data.levelInfo;
-    if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
+    if (!level.details || level.details.live && (this.levelLastLoaded !== level || level.details.expired) || this.waitForCdnTuneIn(level.details)) {
       this.state = State.WAITING_LEVEL;
     }
   }
@@ -21226,13 +21241,18 @@ class PlaylistLoader {
     // Check if a loader for this context already exists
     let loader = this.getInternalLoader(context);
     if (loader) {
+      const logger = this.hls.logger;
       const loaderContext = loader.context;
-      if (loaderContext && loaderContext.url === context.url && loaderContext.levelOrTrack === context.levelOrTrack) {
-        // same URL can't overlap
-        this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
+      if (loaderContext && loaderContext.levelOrTrack === context.levelOrTrack && (loaderContext.url === context.url || loaderContext.deliveryDirectives && !context.deliveryDirectives)) {
+        // same URL can't overlap, or wait for blocking request
+        if (loaderContext.url === context.url) {
+          logger.log(`[playlist-loader]: playlist request ongoing`);
+        } else {
+          logger.log(`[playlist-loader]: ignore ${context.url} in favor of ${loaderContext.url}`);
+        }
         return;
       }
-      this.hls.logger.log(`[playlist-loader]: aborting previous loader for type: ${context.type}`);
+      logger.log(`[playlist-loader]: aborting previous loader for type: ${context.type}`);
       loader.abort();
     }
 
@@ -21942,6 +21962,10 @@ class Hls {
       return;
     }
     this.logger.log(`attachMedia`);
+    if (this._media) {
+      this.logger.warn(`media must be detached before attaching`);
+      this.detachMedia();
+    }
     const attachMediaSource = 'media' in data;
     const media = attachMediaSource ? data.media : data;
     const attachingData = attachMediaSource ? data : {