hls.js 1.6.0-beta.2.0.canary.10833 → 1.6.0-beta.2.0.canary.10837

package/dist/hls.mjs

@@ -401,7 +401,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.2.0.canary.10833"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10837"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9844,7 +9844,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10833";
+const version = "1.6.0-beta.2.0.canary.10837";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -23589,7 +23589,9 @@ class AssetListLoader {
 }
 
 function playWithCatch(media) {
-  media == null ? void 0 : media.play().catch() /* no-op */;
+  media == null ? void 0 : media.play().catch(() => {
+    /* no-op */
+  });
 }
 class InterstitialsController extends Logger {
   constructor(hls, HlsPlayerClass) {
@@ -23758,16 +23760,20 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       });
 
       // 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) {
+        const 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
       const bufferingItem = this.bufferingItem;
       if (bufferingItem) {
-        if (!bufferingItem.event) {
-          this.bufferingItem = this.updateItem(bufferingItem, this.bufferedPos);
-        } else if (!this.updateItem(bufferingItem)) {
+        const 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);
@@ -24682,7 +24688,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     const {
       playingItem
     } = this;
-    if (playingItem && playingItem !== this.bufferingItem && !this.isInterstitial(playingItem)) {
+    if (playingItem && !this.itemsMatch(playingItem, this.bufferingItem) && !this.isInterstitial(playingItem)) {
       const timelinePos = this.timelinePos;
       this.bufferedPos = timelinePos;
       this.setBufferingItem(playingItem);
@@ -24787,18 +24793,21 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
           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);
     }
   }
   setBufferingItem(item) {
     const bufferingLast = this.bufferingItem;
     const schedule = this.schedule;
-    const {
-      items,
-      events
-    } = schedule;
-    if (items && events && (!bufferingLast || schedule.findItemIndex(bufferingLast) !== schedule.findItemIndex(item))) {
+    if (!this.itemsMatch(item, bufferingLast)) {
+      const {
+        items,
+        events
+      } = schedule;
+      if (!items || !events) {
+        return bufferingLast;
+      }
       const isInterstitial = this.isInterstitial(item);
       const bufferingPlayer = this.getBufferingPlayer();
       const timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
@@ -24820,6 +24829,8 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
         bufferingIndex: this.findItemIndex(item),
         playingIndex: this.findItemIndex(this.playingItem)
       });
+    } else if (this.bufferingItem !== item) {
+      this.bufferingItem = item;
     }
     return bufferingLast;
   }