hls.js 1.6.0-beta.2.0.canary.10839 → 1.6.0-beta.2.0.canary.10844

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.10839"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10844"}`);
     } 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.10839";
+const version = "1.6.0-beta.2.0.canary.10844";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -18629,7 +18629,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
             this.hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
               bufferEnd: targetBackBufferPosition
             });
-          } else if (track != null && track.ended && buffered.end(buffered.length - 1) - currentTime < targetDuration * 2) {
+          } else if (track != null && track.ended) {
             this.log(`Cannot flush ${type} back buffer while SourceBuffer is in ended state`);
             return;
           }
@@ -18653,13 +18653,9 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => key === 'in
         }
         const bufferStart = buffered.start(numBufferedRanges - 1);
         const bufferEnd = buffered.end(numBufferedRanges - 1);
-        const track = this.tracks[type];
         // No flush if we can tolerate the current buffer length or the current buffer range we would flush is contiguous with current position
         if (targetFrontBufferPosition > bufferStart || currentTime >= bufferStart && currentTime <= bufferEnd) {
           return;
-        } else if (track != null && track.ended && currentTime - bufferEnd < 2 * targetDuration) {
-          this.log(`Cannot flush ${type} front buffer while SourceBuffer is in ended state`);
-          return;
         }
         this.hls.trigger(Events.BUFFER_FLUSHING, {
           startOffset: bufferStart,
@@ -24372,7 +24368,6 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
     this.log(`setSchedulePosition ${index}, ${assetListIndex}`);
     const scheduledItem = index >= 0 ? scheduleItems[index] : null;
-    const media = this.primaryMedia;
     // Cleanup current item / asset
     const currentItem = this.playingItem;
     const playingLastItem = this.playingLastItem;
@@ -24412,15 +24407,22 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
         // Exiting an Interstitial
         this.clearInterstitial(interstitial, scheduledItem);
         if (interstitial.cue.once) {
+          // Remove interstitial with CUE attribute value of ONCE after it has played
           this.updateSchedule();
-          if (scheduledItem) {
+          const items = this.schedule.items;
+          if (scheduledItem && items) {
             const updatedIndex = this.schedule.findItemIndex(scheduledItem);
-            this.setSchedulePosition(updatedIndex, assetListIndex);
+            this.advanceSchedule(updatedIndex, items, assetListIndex, currentItem, playingLastItem);
           }
           return;
         }
       }
     }
+    this.advanceSchedule(index, scheduleItems, assetListIndex, currentItem, playingLastItem);
+  }
+  advanceSchedule(index, scheduleItems, assetListIndex, currentItem, playedLastItem) {
+    const scheduledItem = index >= 0 ? scheduleItems[index] : null;
+    const media = this.primaryMedia;
     // Cleanup out of range Interstitials
     const playerQueue = this.playerQueue;
     if (playerQueue.length) {
@@ -24509,7 +24511,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
       if (this.shouldPlay) {
         playWithCatch(this.hls.media);
       }
-    } else if (playingLastItem && this.isInterstitial(currentItem)) {
+    } else if (playedLastItem && this.isInterstitial(currentItem)) {
       // Maintain playingItem state at end of schedule (setSchedulePosition(-1) called to end program)
       // this allows onSeeking handler to update schedule position
       this.playingItem = currentItem;
@@ -31984,7 +31986,7 @@ class StreamController extends BaseStreamController {
   onBufferFlushed(event, {
     type
   }) {
-    if (type !== ElementaryStreamTypes.AUDIO || this.audioOnly && !this.altAudio) {
+    if (type !== ElementaryStreamTypes.AUDIO || !this.altAudio) {
       const mediaBuffer = (type === ElementaryStreamTypes.VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
       this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.MAIN);
       this.tick();