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

package/dist/hls.d.mts

@@ -2309,6 +2309,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private advanceAfterAssetEnded;
     private setScheduleToAssetAtTime;
     private setSchedulePosition;
+    private advanceSchedule;
     private get playbackDisabled();
     private get primaryDetails();
     private get primaryLive();

package/dist/hls.d.ts

@@ -2309,6 +2309,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private advanceAfterAssetEnded;
     private setScheduleToAssetAtTime;
     private setSchedulePosition;
+    private advanceSchedule;
     private get playbackDisabled();
     private get primaryDetails();
     private get primaryLive();

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.10837");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.2.0.canary.10842");
       } 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.10837";
+  var version = "1.6.0-beta.2.0.canary.10842";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -19192,7 +19192,7 @@
               _this18.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) {
               _this18.log("Cannot flush " + type + " back buffer while SourceBuffer is in ended state");
               return;
             }
@@ -19219,13 +19219,9 @@
           }
           var bufferStart = buffered.start(numBufferedRanges - 1);
           var bufferEnd = buffered.end(numBufferedRanges - 1);
-          var track = _this19.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) {
-            _this19.log("Cannot flush " + type + " front buffer while SourceBuffer is in ended state");
-            return;
           }
           _this19.hls.trigger(Events.BUFFER_FLUSHING, {
             startOffset: bufferStart,
@@ -24314,14 +24310,12 @@
       }
     };
     _proto.setSchedulePosition = function setSchedulePosition(index, assetListIndex) {
-      var _this2 = this;
       var scheduleItems = this.schedule.items;
       if (!scheduleItems || this.playbackDisabled) {
         return;
       }
       this.log("setSchedulePosition " + index + ", " + assetListIndex);
       var scheduledItem = index >= 0 ? scheduleItems[index] : null;
-      var media = this.primaryMedia;
       // Cleanup current item / asset
       var currentItem = this.playingItem;
       var playingLastItem = this.playingLastItem;
@@ -24361,15 +24355,23 @@
           // 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) {
+            var items = this.schedule.items;
+            if (scheduledItem && items) {
               var updatedIndex = this.schedule.findItemIndex(scheduledItem);
-              this.setSchedulePosition(updatedIndex, assetListIndex);
+              this.advanceSchedule(updatedIndex, items, assetListIndex, currentItem, playingLastItem);
             }
             return;
           }
         }
       }
+      this.advanceSchedule(index, scheduleItems, assetListIndex, currentItem, playingLastItem);
+    };
+    _proto.advanceSchedule = function advanceSchedule(index, scheduleItems, assetListIndex, currentItem, playedLastItem) {
+      var _this2 = this;
+      var scheduledItem = index >= 0 ? scheduleItems[index] : null;
+      var media = this.primaryMedia;
       // Cleanup out of range Interstitials
       var playerQueue = this.playerQueue;
       if (playerQueue.length) {
@@ -24385,39 +24387,39 @@
       if (this.isInterstitial(scheduledItem)) {
         this.timelinePos = Math.min(Math.max(this.timelinePos, scheduledItem.start), scheduledItem.end);
         // Handle Interstitial
-        var _interstitial = scheduledItem.event;
+        var interstitial = scheduledItem.event;
         // find asset index
         if (assetListIndex === undefined) {
-          assetListIndex = this.schedule.findAssetIndex(_interstitial, this.timelinePos);
+          assetListIndex = this.schedule.findAssetIndex(interstitial, this.timelinePos);
         }
         // Ensure Interstitial is enqueued
         var waitingItem = this.waitingItem;
-        var _player = this.preloadAssets(_interstitial, assetListIndex);
-        if (!_player) {
+        var player = this.preloadAssets(interstitial, assetListIndex);
+        if (!player) {
           this.setBufferingItem(scheduledItem);
         }
         if (!this.eventItemsMatch(scheduledItem, currentItem || waitingItem)) {
           this.waitingItem = scheduledItem;
-          this.log("INTERSTITIAL_STARTED " + segmentToString(scheduledItem) + " " + (_interstitial.appendInPlace ? 'append in place' : ''));
+          this.log("INTERSTITIAL_STARTED " + segmentToString(scheduledItem) + " " + (interstitial.appendInPlace ? 'append in place' : ''));
           this.hls.trigger(Events.INTERSTITIAL_STARTED, {
-            event: _interstitial,
+            event: interstitial,
             schedule: scheduleItems.slice(0),
             scheduleIndex: index
           });
         }
-        var assetListLength = _interstitial.assetList.length;
-        if (assetListLength === 0 && !_interstitial.assetListResponse) {
+        var assetListLength = interstitial.assetList.length;
+        if (assetListLength === 0 && !interstitial.assetListResponse) {
           // Waiting at end of primary content segment
           // Expect setSchedulePosition to be called again once ASSET-LIST is loaded
-          this.log("Waiting for ASSET-LIST to complete loading " + _interstitial);
+          this.log("Waiting for ASSET-LIST to complete loading " + interstitial);
           return;
         }
-        if (_interstitial.assetListLoader) {
-          _interstitial.assetListLoader.destroy();
-          _interstitial.assetListLoader = undefined;
+        if (interstitial.assetListLoader) {
+          interstitial.assetListLoader.destroy();
+          interstitial.assetListLoader = undefined;
         }
         if (!media) {
-          this.log("Waiting for attachMedia to start Interstitial " + _interstitial);
+          this.log("Waiting for attachMedia to start Interstitial " + interstitial);
           return;
         }
         // Update schedule and asset list position now that it can start
@@ -24425,40 +24427,40 @@
         this.playingItem = scheduledItem;
 
         // If asset-list is empty or missing asset index, advance to next item
-        var assetItem = _interstitial.assetList[assetListIndex];
+        var assetItem = interstitial.assetList[assetListIndex];
         if (!assetItem) {
           var nextItem = scheduleItems[index + 1];
           var _media = this.media;
           if (nextItem && _media && !this.isInterstitial(nextItem) && _media.currentTime < nextItem.start) {
             _media.currentTime = this.timelinePos = nextItem.start;
           }
-          this.advanceAfterAssetEnded(_interstitial, index, assetListIndex || 0);
+          this.advanceAfterAssetEnded(interstitial, index, assetListIndex || 0);
           return;
         }
 
         // Start Interstitial Playback
-        if (!_player) {
-          _player = this.getAssetPlayer(assetItem.identifier);
+        if (!player) {
+          player = this.getAssetPlayer(assetItem.identifier);
         }
-        if (_player === null || _player.destroyed) {
-          this.warn("asset " + (assetListIndex + 1) + "/" + assetListLength + " player destroyed " + _interstitial);
-          _player = this.createAssetPlayer(_interstitial, assetItem, assetListIndex);
+        if (player === null || player.destroyed) {
+          this.warn("asset " + (assetListIndex + 1) + "/" + assetListLength + " player destroyed " + interstitial);
+          player = this.createAssetPlayer(interstitial, assetItem, assetListIndex);
         }
         if (!this.eventItemsMatch(scheduledItem, this.bufferingItem)) {
-          if (_interstitial.appendInPlace && this.isAssetBuffered(assetItem)) {
+          if (interstitial.appendInPlace && this.isAssetBuffered(assetItem)) {
             return;
           }
         }
-        this.startAssetPlayer(_player, assetListIndex, scheduleItems, index, media);
+        this.startAssetPlayer(player, assetListIndex, scheduleItems, index, media);
         if (this.shouldPlay) {
-          playWithCatch(_player.media);
+          playWithCatch(player.media);
         }
       } else if (scheduledItem !== null) {
         this.resumePrimary(scheduledItem, index, currentItem);
         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;
@@ -32881,7 +32883,7 @@
     };
     _proto.onBufferFlushed = function onBufferFlushed(event, _ref) {
       var type = _ref.type;
-      if (type !== ElementaryStreamTypes.AUDIO || this.audioOnly && !this.altAudio) {
+      if (type !== ElementaryStreamTypes.AUDIO || !this.altAudio) {
         var mediaBuffer = (type === ElementaryStreamTypes.VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
         this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.MAIN);
         this.tick();

package/dist/hls.js.d.ts

@@ -2309,6 +2309,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private advanceAfterAssetEnded;
     private setScheduleToAssetAtTime;
     private setSchedulePosition;
+    private advanceSchedule;
     private get playbackDisabled();
     private get primaryDetails();
     private get primaryLive();