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

package/dist/hls.js

@@ -1057,7 +1057,7 @@
       // 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.10811");
+        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();
@@ -16296,7 +16296,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10811";
+  var 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
@@ -23928,9 +23928,6 @@
         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(function (player) {
           if (player.interstitial.appendInPlace) {
             var timelineStart = player.assetItem.timelineStart;
@@ -23960,14 +23957,14 @@
           } 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(function (interstitial) {
           interstitial.assetList.forEach(function (asset) {
-            _this.clearAssetPlayer(asset.identifier);
+            _this.clearAssetPlayer(asset.identifier, null);
           });
         });
         if (interstitialsUpdated || previousItems) {
@@ -23977,6 +23974,11 @@
             durations: durations,
             removedIds: 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)
@@ -24433,9 +24435,6 @@
       this.playingAsset = null;
       this.waitingItem = null;
       this.bufferedToItem(scheduledItem);
-      if (!fromItem) {
-        return;
-      }
       this.log("resuming " + segmentToString(scheduledItem));
       if (!((_this$detachedData2 = this.detachedData) != null && _this$detachedData2.mediaSource)) {
         var timelinePos = this.timelinePos;
@@ -24445,6 +24444,9 @@
         }
         this.attachPrimary(timelinePos, scheduledItem);
       }
+      if (!fromItem) {
+        return;
+      }
       var scheduleItems = this.schedule.items;
       if (!scheduleItems) {
         return;
@@ -25164,7 +25166,7 @@
       var error = new Error(errorMessage);
       if (assetItem) {
         if (this.playingAsset !== assetItem) {
-          this.clearAssetPlayer(assetItem.identifier);
+          this.clearAssetPlayer(assetItem.identifier, null);
         }
         assetItem.error = error;
       }
@@ -25187,6 +25189,7 @@
       // 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);
@@ -33566,6 +33569,7 @@
       this.hls = void 0;
       this.loaders = Object.create(null);
       this.variableList = null;
+      this.onManifestLoaded = this.checkAutostartLoad;
       this.hls = hls;
       this.registerListeners();
     }
@@ -33881,7 +33885,6 @@
         startTimeOffset: startTimeOffset,
         variableList: variableList
       });
-      this.checkAutostartLoad();
     };
     _proto.handleTrackOrLevelPlaylist = function handleTrackOrLevelPlaylist(response, stats, context, networkDetails, loader) {
       var hls = this.hls;
@@ -33905,6 +33908,7 @@
           name: '',
           url: url
         };
+        levelDetails.requestScheduled = stats.loading.start + computeReloadInterval(levelDetails, 0);
         hls.trigger(Events.MANIFEST_LOADED, {
           levels: [singleLevel],
           audioTracks: [],
@@ -33925,9 +33929,6 @@
       // 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();
-      }
     };
     _proto.handleManifestParsingError = function handleManifestParsingError(response, context, error, networkDetails, stats) {
       this.hls.trigger(Events.ERROR, {
@@ -34212,6 +34213,8 @@
       if (typeof onErrorOut === 'function') {
         this.on(Events.ERROR, onErrorOut, errorController);
       }
+      // Autostart load handler
+      this.on(Events.MANIFEST_LOADED, playListLoader.onManifestLoaded, playListLoader);
     }
     /**
      * Check if the required MediaSource Extensions are available.