hls.js 1.6.0-beta.1.0.canary.10812 → 1.6.0-beta.1.0.canary.10813

package/dist/hls.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.10812"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10813"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9835,7 +9835,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10812";
+const version = "1.6.0-beta.1.0.canary.10813";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -23716,9 +23716,6 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       if (removedIds.length) {
         this.log(`Removed events ${removedIds}`);
       }
-      if (this.isInterstitial(playingItem) && removedIds.includes(playingItem.event.identifier)) {
-        this.warn(`Interstitial "${playingItem.event.identifier}" removed while playing`);
-      }
       this.playerQueue.forEach(player => {
         if (player.interstitial.appendInPlace) {
           const timelineStart = player.assetItem.timelineStart;
@@ -23748,14 +23745,14 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         } else if (!this.updateItem(bufferingItem)) {
           // Interstitial removed from schedule (Live -> VOD or other scenario where Start Date is outside the range of VOD Playlist)
           this.bufferingItem = null;
-          this.clearInterstitial(bufferingItem.event);
+          this.clearInterstitial(bufferingItem.event, null);
         }
       }
       // Clear waitingItem if it has been removed from the schedule
       this.waitingItem = this.updateItem(this.waitingItem);
       removedInterstitials.forEach(interstitial => {
         interstitial.assetList.forEach(asset => {
-          this.clearAssetPlayer(asset.identifier);
+          this.clearAssetPlayer(asset.identifier, null);
         });
       });
       if (interstitialsUpdated || previousItems) {
@@ -23765,6 +23762,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           durations,
           removedIds
         });
+        if (this.isInterstitial(playingItem) && removedIds.includes(playingItem.event.identifier)) {
+          this.warn(`Interstitial "${playingItem.event.identifier}" removed while playing`);
+          this.primaryFallback(playingItem.event);
+          return;
+        }
 
         // Check is buffered to new Interstitial event boundary
         // (Live update publishes Interstitial with new segment)
@@ -24498,9 +24500,6 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     this.playingAsset = null;
     this.waitingItem = null;
     this.bufferedToItem(scheduledItem);
-    if (!fromItem) {
-      return;
-    }
     this.log(`resuming ${segmentToString(scheduledItem)}`);
     if (!((_this$detachedData3 = this.detachedData) != null && _this$detachedData3.mediaSource)) {
       let timelinePos = this.timelinePos;
@@ -24510,6 +24509,9 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
       }
       this.attachPrimary(timelinePos, scheduledItem);
     }
+    if (!fromItem) {
+      return;
+    }
     const scheduleItems = this.schedule.items;
     if (!scheduleItems) {
       return;
@@ -25220,7 +25222,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     const error = new Error(errorMessage);
     if (assetItem) {
       if (this.playingAsset !== assetItem) {
-        this.clearAssetPlayer(assetItem.identifier);
+        this.clearAssetPlayer(assetItem.identifier, null);
       }
       assetItem.error = error;
     }
@@ -25241,6 +25243,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     // Update schedule now that interstitial/assets are flagged with `error` for fallback
     this.updateSchedule();
     if (playingItem) {
+      this.log(`Fallback to primary from event "${interstitial.identifier}" start: ${flushStart} pos: ${this.timelinePos} playing: ${playingItem ? segmentToString(playingItem) : '<none>'} error: ${interstitial.error}`);
       if (interstitial.appendInPlace) {
         interstitial.appendInPlace = false;
         this.attachPrimary(flushStart, null);
@@ -32672,6 +32675,7 @@ class PlaylistLoader {
     this.hls = void 0;
     this.loaders = Object.create(null);
     this.variableList = null;
+    this.onManifestLoaded = this.checkAutostartLoad;
     this.hls = hls;
     this.registerListeners();
   }
@@ -32998,11 +33002,6 @@ class PlaylistLoader {
       variableList
     });
   }
-  onManifestLoaded(event, data) {
-    if (!data.isMediaPlaylist) {
-      this.checkAutostartLoad();
-    }
-  }
   handleTrackOrLevelPlaylist(response, stats, context, networkDetails, loader) {
     const hls = this.hls;
     const {
@@ -33027,6 +33026,7 @@ class PlaylistLoader {
         name: '',
         url
       };
+      levelDetails.requestScheduled = stats.loading.start + computeReloadInterval(levelDetails, 0);
       hls.trigger(Events.MANIFEST_LOADED, {
         levels: [singleLevel],
         audioTracks: [],
@@ -33037,8 +33037,7 @@ class PlaylistLoader {
         sessionKeys: null,
         contentSteering: null,
         startTimeOffset: null,
-        variableList: null,
-        isMediaPlaylist: true
+        variableList: null
       });
     }
 
@@ -33048,9 +33047,6 @@ class PlaylistLoader {
     // extend the context with the new levelDetails property
     context.levelDetails = levelDetails;
     this.handlePlaylistLoaded(levelDetails, response, stats, context, networkDetails, loader);
-    if (type === PlaylistContextType.MANIFEST && (!levelDetails.playlistParsingError || !levelDetails.fragments.length && levelDetails.live)) {
-      this.checkAutostartLoad();
-    }
   }
   handleManifestParsingError(response, context, error, networkDetails, stats) {
     this.hls.trigger(Events.ERROR, {