hls.js 1.6.0-beta.2.0.canary.10831 → 1.6.0-beta.2.0.canary.10835

package/dist/hls.js

@@ -1058,7 +1058,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.2.0.canary.10831");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.2.0.canary.10835");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16305,7 +16305,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10831";
+  var version = "1.6.0-beta.2.0.canary.10835";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -23798,7 +23798,9 @@
   }();
 
   function playWithCatch(media) {
-    media == null ? void 0 : media.play().catch() /* no-op */;
+    media == null ? void 0 : media.play().catch(function () {
+      /* no-op */
+    });
   }
   var InterstitialsController = /*#__PURE__*/function (_Logger) {
     function InterstitialsController(hls, HlsPlayerClass) {
@@ -23973,16 +23975,20 @@
         });
 
         // Update schedule item references
-        // Do not change Interstitial playingItem - used for INTERSTITIAL_ASSET_ENDED and INTERSTITIAL_ENDED
-        if (playingItem && !playingItem.event) {
-          _this.playingItem = _this.updateItem(playingItem, _this.timelinePos);
+        // Do not replace Interstitial playingItem without a match - used for INTERSTITIAL_ASSET_ENDED and INTERSTITIAL_ENDED
+        if (playingItem) {
+          var updatedPlayingItem = _this.updateItem(playingItem, _this.timelinePos);
+          if (_this.itemsMatch(playingItem, updatedPlayingItem)) {
+            _this.playingItem = updatedPlayingItem;
+          }
         }
-        // Do not change Interstitial bufferingItem - used for transfering media element or source
+        // Do not replace Interstitial bufferingItem without a match - used for transfering media element or source
         var bufferingItem = _this.bufferingItem;
         if (bufferingItem) {
-          if (!bufferingItem.event) {
-            _this.bufferingItem = _this.updateItem(bufferingItem, _this.bufferedPos);
-          } else if (!_this.updateItem(bufferingItem)) {
+          var updatedBufferingItem = _this.updateItem(bufferingItem, _this.bufferedPos);
+          if (_this.itemsMatch(bufferingItem, updatedBufferingItem)) {
+            _this.bufferingItem = updatedBufferingItem;
+          } else if (bufferingItem.event) {
             // 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, null);
@@ -24623,7 +24629,7 @@
     };
     _proto.onBufferFlushed = function onBufferFlushed(event, data) {
       var playingItem = this.playingItem;
-      if (playingItem && playingItem !== this.bufferingItem && !this.isInterstitial(playingItem)) {
+      if (playingItem && !this.itemsMatch(playingItem, this.bufferingItem) && !this.isInterstitial(playingItem)) {
         var timelinePos = this.timelinePos;
         this.bufferedPos = timelinePos;
         this.setBufferingItem(playingItem);
@@ -24729,16 +24735,19 @@
             this.preloadAssets(nextItemToBuffer.event, 0);
           }
         }
-      } else if (bufferIsEmpty && playingItem && bufferingItem !== playingItem && bufferEndIndex === playingIndex) {
+      } else if (bufferIsEmpty && playingItem && !this.itemsMatch(playingItem, bufferingItem) && bufferEndIndex === playingIndex) {
         this.bufferedToItem(playingItem);
       }
     };
     _proto.setBufferingItem = function setBufferingItem(item) {
       var bufferingLast = this.bufferingItem;
       var schedule = this.schedule;
-      var items = schedule.items,
-        events = schedule.events;
-      if (items && events && (!bufferingLast || schedule.findItemIndex(bufferingLast) !== schedule.findItemIndex(item))) {
+      if (!this.itemsMatch(item, bufferingLast)) {
+        var items = schedule.items,
+          events = schedule.events;
+        if (!items || !events) {
+          return bufferingLast;
+        }
         var isInterstitial = this.isInterstitial(item);
         var bufferingPlayer = this.getBufferingPlayer();
         var timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
@@ -24764,6 +24773,8 @@
           bufferingIndex: this.findItemIndex(item),
           playingIndex: this.findItemIndex(this.playingItem)
         });
+      } else if (this.bufferingItem !== item) {
+        this.bufferingItem = item;
       }
       return bufferingLast;
     };