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

package/src/controller/interstitials-controller.ts

@@ -75,7 +75,9 @@ export type PlayheadTimes = {
 };
 
 function playWithCatch(media: HTMLMediaElement | null) {
-  media?.play().catch(/* no-op */);
+  media?.play().catch(() => {
+    /* no-op */
+  });
 }
 
 export default class InterstitialsController
@@ -1383,7 +1385,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`,
     const { playingItem } = this;
     if (
       playingItem &&
-      playingItem !== this.bufferingItem &&
+      !this.itemsMatch(playingItem, this.bufferingItem) &&
       !this.isInterstitial(playingItem)
     ) {
       const timelinePos = this.timelinePos;
@@ -1474,16 +1476,23 @@ 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);
@@ -1644,7 +1653,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     } else if (
       bufferIsEmpty &&
       playingItem &&
-      bufferingItem !== playingItem &&
+      !this.itemsMatch(playingItem, bufferingItem) &&
       bufferEndIndex === playingIndex
     ) {
       this.bufferedToItem(playingItem);
@@ -1656,14 +1665,12 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
   ): InterstitialScheduleItem | null {
     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
@@ -1692,6 +1699,8 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
         bufferingIndex: this.findItemIndex(item),
         playingIndex: this.findItemIndex(this.playingItem),
       });
+    } else if (this.bufferingItem !== item) {
+      this.bufferingItem = item;
     }
     return bufferingLast;
   }