hls.js 1.6.0-beta.3.0.canary.10981 → 1.6.0-beta.3.0.canary.10984

package/dist/hls.mjs

@@ -402,7 +402,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.3.0.canary.10981"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.3.0.canary.10984"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -8419,7 +8419,7 @@ class BaseStreamController extends TaskLoop {
           }
         }
       }
-      // Skip loading of fragments that overlap completely with appendInPlace interstitals
+      // Skip loading of fragments that overlap completely with appendInPlace interstitials
       const playerQueue = interstitials == null ? void 0 : interstitials.playerQueue;
       if (playerQueue) {
         for (let i = playerQueue.length; i--;) {
@@ -9938,7 +9938,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.3.0.canary.10981";
+const version = "1.6.0-beta.3.0.canary.10984";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -22998,11 +22998,11 @@ class HlsAssetPlayer {
     this.tracks = null;
     this.hasDetails = false;
     this.mediaAttached = null;
-    this.playoutOffset = 0;
     this.checkPlayout = () => {
       const interstitial = this.interstitial;
       const playoutLimit = interstitial.playoutLimit;
-      if (this.playoutOffset + this.currentTime >= playoutLimit) {
+      const currentTime = this.currentTime;
+      if (this.startOffset + currentTime >= playoutLimit) {
         this.hls.trigger(Events.PLAYOUT_LIMIT_REACHED, {});
       }
     };
@@ -23030,8 +23030,6 @@ class HlsAssetPlayer {
       this.mediaAttached = media;
       const event = this.interstitial;
       if (event.playoutLimit) {
-        var _event$assetList$even;
-        this.playoutOffset = ((_event$assetList$even = event.assetList[event.assetList.indexOf(assetItem)]) == null ? void 0 : _event$assetList$even.startOffset) || 0;
         media.addEventListener('timeupdate', this.checkPlayout);
       }
     });
@@ -23066,8 +23064,7 @@ class HlsAssetPlayer {
     return this.getAssetTime(media.currentTime);
   }
   get duration() {
-    var _this$assetItem;
-    const duration = (_this$assetItem = this.assetItem) == null ? void 0 : _this$assetItem.duration;
+    const duration = this.assetItem.duration;
     if (!duration) {
       return 0;
     }
@@ -23080,6 +23077,9 @@ class HlsAssetPlayer {
     }
     return Math.max(0, duration - this.currentTime);
   }
+  get startOffset() {
+    return this.assetItem.startOffset;
+  }
   get timelineOffset() {
     var _this$hls3;
     return ((_this$hls3 = this.hls) == null ? void 0 : _this$hls3.config.timelineOffset) || 0;
@@ -23776,7 +23776,9 @@ class InterstitialsController extends Logger {
     this.playingItem = null;
     this.bufferingItem = null;
     this.waitingItem = null;
+    this.endedItem = null;
     this.playingAsset = null;
+    this.endedAsset = null;
     this.bufferingAsset = null;
     this.shouldPlay = false;
     this.onPlay = () => {
@@ -23832,6 +23834,7 @@ class InterstitialsController extends Logger {
         if (this.playingLastItem && this.isInterstitial(playingItem)) {
           const restartAsset = playingItem.event.assetList[0];
           if (restartAsset) {
+            this.endedItem = this.playingItem;
             this.playingItem = null;
             this.setScheduleToAssetAtTime(currentTime, restartAsset);
           }
@@ -23922,7 +23925,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         const updatedPlayingItem = this.updateItem(playingItem, this.timelinePos);
         if (this.itemsMatch(playingItem, updatedPlayingItem)) {
           this.playingItem = updatedPlayingItem;
+          this.waitingItem = this.endedItem = null;
         }
+      } else {
+        // Clear waitingItem if it has been removed from the schedule
+        this.waitingItem = this.updateItem(this.waitingItem);
+        this.endedItem = this.updateItem(this.endedItem);
       }
       // Do not replace Interstitial bufferingItem without a match - used for transfering media element or source
       const bufferingItem = this.bufferingItem;
@@ -23936,8 +23944,6 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           this.clearInterstitial(bufferingItem.event, null);
         }
       }
-      // Clear waitingItem if it has been removed from the schedule
-      this.waitingItem = this.updateItem(this.waitingItem);
       removedInterstitials.forEach(interstitial => {
         interstitial.assetList.forEach(asset => {
           this.clearAssetPlayer(asset.identifier, null);
@@ -24066,7 +24072,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     addEventListener(media, 'pause', this.onPause);
   }
   onMediaAttached(event, data) {
-    const playingItem = this.playingItem;
+    const playingItem = this.effectivePlayingItem;
     const detachedMedia = this.detachedData;
     this.detachedData = null;
     if (playingItem === null) {
@@ -24079,7 +24085,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     }
   }
   clearScheduleState() {
-    this.playingItem = this.bufferingItem = this.waitingItem = this.playingAsset = this.bufferingAsset = null;
+    this.playingItem = this.bufferingItem = this.waitingItem = this.endedItem = this.playingAsset = this.endedAsset = this.bufferingAsset = null;
   }
   onMediaDetaching(event, data) {
     const transferringMedia = !!data.transferMedia;
@@ -24095,11 +24101,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     if (this.detachedData) {
       const player = this.getBufferingPlayer();
       if (player) {
-        this.playingAsset = null;
-        this.bufferingAsset = null;
-        this.bufferingItem = null;
-        this.waitingItem = null;
-        this.detachedData = null;
+        this.playingAsset = this.endedAsset = this.bufferingAsset = this.bufferingItem = this.waitingItem = this.detachedData = null;
         player.detachMedia();
       }
       this.shouldPlay = false;
@@ -24107,12 +24109,11 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
   }
   get interstitialsManager() {
     if (!this.manager) {
-      if (!this.hls || !this.schedule.events) {
+      if (!this.hls) {
         return null;
       }
       const c = this;
       const effectiveBufferingItem = () => c.bufferingItem || c.waitingItem;
-      const effectivePlayingItem = () => c.playingItem || c.waitingItem;
       const getAssetPlayer = asset => asset ? c.getAssetPlayer(asset.identifier) : asset;
       const getMappedTime = (item, timelineType, asset, controllerField, assetPlayerField) => {
         if (item) {
@@ -24150,7 +24151,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         if (value === Number.MAX_VALUE) {
           return getMappedDuration('primary');
         }
-        return value;
+        return Math.max(value, 0);
       };
       const getMappedDuration = timelineType => {
         var _c$primaryDetails;
@@ -24162,12 +24163,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       };
       const seekTo = (time, timelineType) => {
         var _item$event, _c$schedule$items2;
-        const item = effectivePlayingItem();
+        const item = c.effectivePlayingItem;
         if (item != null && (_item$event = item.event) != null && _item$event.restrictions.skip) {
           return;
         }
         c.log(`seek to ${time} "${timelineType}"`);
-        const playingItem = effectivePlayingItem();
+        const playingItem = c.effectivePlayingItem;
         const targetIndex = c.schedule.findItemIndexAtTime(time, timelineType);
         const targetItem = (_c$schedule$items2 = c.schedule.items) == null ? void 0 : _c$schedule$items2[targetIndex];
         const playingInterstitial = playingItem == null ? void 0 : playingItem.event;
@@ -24176,7 +24177,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         if (playingItem && (appendInPlace || seekInItem)) {
           // seek in asset player or primary media (appendInPlace)
           const assetPlayer = getAssetPlayer(c.playingAsset);
-          const media = (assetPlayer == null ? void 0 : assetPlayer.media) || c.hls.media;
+          const media = (assetPlayer == null ? void 0 : assetPlayer.media) || c.primaryMedia;
           if (media) {
             const currentTime = timelineType === 'primary' ? media.currentTime : getMappedTime(playingItem, timelineType, c.playingAsset, 'timelinePos', 'currentTime');
             const diff = time - currentTime;
@@ -24232,6 +24233,60 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           }
         }
       };
+      const getActiveInterstitial = () => {
+        const playingItem = c.effectivePlayingItem;
+        if (c.isInterstitial(playingItem)) {
+          return playingItem;
+        }
+        const bufferingItem = effectiveBufferingItem();
+        if (c.isInterstitial(bufferingItem)) {
+          return bufferingItem;
+        }
+        return null;
+      };
+      const interstitialPlayer = {
+        get currentTime() {
+          const interstitialItem = getActiveInterstitial();
+          const playingItem = c.effectivePlayingItem;
+          if (playingItem && playingItem === interstitialItem) {
+            return getMappedTime(playingItem, 'playout', c.effectivePlayingAsset, 'timelinePos', 'currentTime') - playingItem.playout.start;
+          }
+          return 0;
+        },
+        set currentTime(time) {
+          const interstitialItem = getActiveInterstitial();
+          const playingItem = c.effectivePlayingItem;
+          if (playingItem && playingItem === interstitialItem) {
+            seekTo(time + playingItem.playout.start, 'playout');
+          }
+        },
+        get duration() {
+          const interstitialItem = getActiveInterstitial();
+          if (interstitialItem) {
+            return interstitialItem.playout.end - interstitialItem.playout.start;
+          }
+          return 0;
+        },
+        get assetPlayers() {
+          var _getActiveInterstitia;
+          const assetList = (_getActiveInterstitia = getActiveInterstitial()) == null ? void 0 : _getActiveInterstitia.event.assetList;
+          if (assetList) {
+            return assetList.map(asset => c.getAssetPlayer(asset.identifier));
+          }
+          return [];
+        },
+        get playingIndex() {
+          var _getActiveInterstitia2;
+          const interstitial = (_getActiveInterstitia2 = getActiveInterstitial()) == null ? void 0 : _getActiveInterstitia2.event;
+          if (interstitial && c.effectivePlayingAsset) {
+            return interstitial.findAssetIndex(c.effectivePlayingAsset);
+          }
+          return -1;
+        },
+        get scheduleItem() {
+          return getActiveInterstitial();
+        }
+      };
       this.manager = {
         get events() {
           var _c$schedule, _c$schedule$events;
@@ -24241,86 +24296,79 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           var _c$schedule2, _c$schedule2$items;
           return ((_c$schedule2 = c.schedule) == null ? void 0 : (_c$schedule2$items = _c$schedule2.items) == null ? void 0 : _c$schedule2$items.slice(0)) || [];
         },
+        get interstitialPlayer() {
+          if (getActiveInterstitial()) {
+            return interstitialPlayer;
+          }
+          return null;
+        },
         get playerQueue() {
           return c.playerQueue.slice(0);
         },
-        get bufferingPlayer() {
-          return c.getBufferingPlayer();
-        },
         get bufferingAsset() {
           return c.bufferingAsset;
         },
         get bufferingItem() {
-          return c.bufferingItem;
-        },
-        get playingAsset() {
-          return c.playingAsset;
-        },
-        get playingItem() {
-          return c.playingItem;
+          return effectiveBufferingItem();
         },
         get bufferingIndex() {
           const item = effectiveBufferingItem();
           return c.findItemIndex(item);
         },
+        get playingAsset() {
+          return c.effectivePlayingAsset;
+        },
+        get playingItem() {
+          return c.effectivePlayingItem;
+        },
         get playingIndex() {
-          const item = effectivePlayingItem();
+          const item = c.effectivePlayingItem;
           return c.findItemIndex(item);
         },
-        get waitingIndex() {
-          return c.findItemIndex(c.waitingItem);
-        },
         primary: {
           get bufferedEnd() {
             return getBufferedEnd();
           },
           get currentTime() {
+            var _playingItem$event;
             const timelinePos = c.timelinePos;
+            const playingItem = c.effectivePlayingItem;
+            if (playingItem != null && (_playingItem$event = playingItem.event) != null && _playingItem$event.appendInPlace) {
+              return playingItem.start;
+            }
             return timelinePos > 0 ? timelinePos : 0;
           },
+          set currentTime(time) {
+            seekTo(time, 'primary');
+          },
           get duration() {
             return getMappedDuration('primary');
           },
           get seekableStart() {
             var _c$primaryDetails2;
             return ((_c$primaryDetails2 = c.primaryDetails) == null ? void 0 : _c$primaryDetails2.fragmentStart) || 0;
-          },
-          seekTo: time => seekTo(time, 'primary')
-        },
-        playout: {
-          get bufferedEnd() {
-            return getMappedTime(effectiveBufferingItem(), 'playout', c.bufferingAsset, 'bufferedPos', 'bufferedEnd');
-          },
-          get currentTime() {
-            return getMappedTime(effectivePlayingItem(), 'playout', c.playingAsset, 'timelinePos', 'currentTime');
-          },
-          get duration() {
-            return getMappedDuration('playout');
-          },
-          get seekableStart() {
-            var _c$primaryDetails3;
-            return findMappedTime(((_c$primaryDetails3 = c.primaryDetails) == null ? void 0 : _c$primaryDetails3.fragmentStart) || 0, 'playout');
-          },
-          seekTo: time => seekTo(time, 'playout')
+          }
         },
         integrated: {
           get bufferedEnd() {
             return getMappedTime(effectiveBufferingItem(), 'integrated', c.bufferingAsset, 'bufferedPos', 'bufferedEnd');
           },
           get currentTime() {
-            return getMappedTime(effectivePlayingItem(), 'integrated', c.playingAsset, 'timelinePos', 'currentTime');
+            return getMappedTime(c.effectivePlayingItem, 'integrated', c.effectivePlayingAsset, 'timelinePos', 'currentTime');
+          },
+          set currentTime(time) {
+            seekTo(time, 'integrated');
           },
           get duration() {
             return getMappedDuration('integrated');
           },
           get seekableStart() {
-            var _c$primaryDetails4;
-            return findMappedTime(((_c$primaryDetails4 = c.primaryDetails) == null ? void 0 : _c$primaryDetails4.fragmentStart) || 0, 'integrated');
-          },
-          seekTo: time => seekTo(time, 'integrated')
+            var _c$primaryDetails3;
+            return findMappedTime(((_c$primaryDetails3 = c.primaryDetails) == null ? void 0 : _c$primaryDetails3.fragmentStart) || 0, 'integrated');
+          }
         },
         skip: () => {
-          const item = effectivePlayingItem();
+          const item = c.effectivePlayingItem;
           const event = item == null ? void 0 : item.event;
           if (event && !event.restrictions.skip) {
             const index = c.findItemIndex(item);
@@ -24338,6 +24386,12 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
   }
 
   // Schedule getters
+  get effectivePlayingItem() {
+    return this.waitingItem || this.playingItem || this.endedItem;
+  }
+  get effectivePlayingAsset() {
+    return this.playingAsset || this.endedAsset;
+  }
   get playingLastItem() {
     var _this$schedule;
     const playingItem = this.playingItem;
@@ -24348,7 +24402,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     return this.findItemIndex(playingItem) === items.length - 1;
   }
   get playbackStarted() {
-    return this.playingItem !== null;
+    return this.effectivePlayingItem !== null;
   }
 
   // Media getters and event callbacks
@@ -24474,7 +24528,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
     // Start stepping through schedule when playback begins for the first time and we have a pre-roll
     const timelinePos = this.timelinePos;
-    const waitingItem = this.waitingItem;
+    const effectivePlayingItem = this.effectivePlayingItem;
     if (timelinePos === -1) {
       const startPosition = this.hls.startPosition;
       this.timelinePos = startPosition;
@@ -24486,8 +24540,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
         const index = schedule.findItemIndexAtTime(start);
         this.setSchedulePosition(index);
       }
-    } else if (waitingItem && !this.playingItem) {
-      const index = schedule.findItemIndex(waitingItem);
+    } else if (effectivePlayingItem && !this.playingItem) {
+      const index = schedule.findItemIndex(effectivePlayingItem);
       this.setSchedulePosition(index);
     }
   }
@@ -24542,9 +24596,10 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       const assetId = playingAsset == null ? void 0 : playingAsset.identifier;
       const player = assetId ? this.getAssetPlayer(assetId) : null;
       if (player && assetId && (!this.eventItemsMatch(currentItem, scheduledItem) || assetListIndex !== undefined && assetId !== ((_interstitial$assetLi = interstitial.assetList) == null ? void 0 : _interstitial$assetLi[assetListIndex].identifier))) {
-        this.playingAsset = null;
         const _assetListIndex = interstitial.findAssetIndex(playingAsset);
         this.log(`INTERSTITIAL_ASSET_ENDED ${_assetListIndex + 1}/${interstitial.assetList.length} ${eventAssetToString(playingAsset)}`);
+        this.endedAsset = playingAsset;
+        this.playingAsset = null;
         this.hls.trigger(Events.INTERSTITIAL_ASSET_ENDED, {
           asset: playingAsset,
           assetListIndex: _assetListIndex,
@@ -24557,9 +24612,9 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
         if (player.media && !this.detachedData) {
           player.detachMedia();
         }
-        this.clearAssetPlayer(assetId, scheduledItem);
       }
       if (!this.eventItemsMatch(currentItem, scheduledItem)) {
+        this.endedItem = currentItem;
         this.playingItem = null;
         this.log(`INTERSTITIAL_ENDED ${interstitial} ${segmentToString(currentItem)}`);
         interstitial.hasPlayed = true;
@@ -24611,7 +24666,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       const waitingItem = this.waitingItem;
       this.setBufferingItem(scheduledItem);
       let player = this.preloadAssets(interstitial, assetListIndex);
-      if (!this.eventItemsMatch(scheduledItem, currentItem || waitingItem)) {
+      if (!this.eventItemsMatch(scheduledItem, waitingItem || currentItem)) {
         this.waitingItem = scheduledItem;
         this.log(`INTERSTITIAL_STARTED ${segmentToString(scheduledItem)} ${interstitial.appendInPlace ? 'append in place' : ''}`);
         this.hls.trigger(Events.INTERSTITIAL_STARTED, {
@@ -24635,7 +24690,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
         return;
       }
       // Update schedule and asset list position now that it can start
-      this.waitingItem = null;
+      this.waitingItem = this.endedItem = null;
       this.playingItem = scheduledItem;
 
       // If asset-list is empty or missing asset index, advance to next item
@@ -24676,6 +24731,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     } 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.endedItem = null;
       this.playingItem = currentItem;
       if (!currentItem.event.appendInPlace) {
         // Media must be re-attached to resume primary schedule if not sharing source
@@ -24697,8 +24753,8 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
   resumePrimary(scheduledItem, index, fromItem) {
     var _this$detachedData3;
     this.playingItem = scheduledItem;
-    this.playingAsset = null;
-    this.waitingItem = null;
+    this.playingAsset = this.endedAsset = null;
+    this.waitingItem = this.endedItem = null;
     this.bufferedToItem(scheduledItem);
     this.log(`resuming ${segmentToString(scheduledItem)}`);
     if (!((_this$detachedData3 = this.detachedData) != null && _this$detachedData3.mediaSource)) {
@@ -24802,7 +24858,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     });
     this.mediaSelection = currentSelection;
     this.schedule.parseInterstitialDateRanges(currentSelection);
-    if (!this.playingItem && this.schedule.items) {
+    if (!this.effectivePlayingItem && this.schedule.items) {
       this.checkStart();
     }
   }
@@ -24852,9 +24908,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     this.checkBuffer();
   }
   onBufferFlushed(event, data) {
-    const {
-      playingItem
-    } = this;
+    const playingItem = this.playingItem;
     if (playingItem && !this.itemsMatch(playingItem, this.bufferingItem) && !this.isInterstitial(playingItem)) {
       const timelinePos = this.timelinePos;
       this.bufferedPos = timelinePos;
@@ -24983,7 +25037,12 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       if (!this.playbackDisabled) {
         if (isInterstitial) {
           // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
-          this.playerQueue.forEach(player => player.resumeBuffering());
+          item.event.assetList.forEach(asset => {
+            const player = this.getAssetPlayer(asset.identifier);
+            if (player) {
+              player.resumeBuffering();
+            }
+          });
         } else {
           this.hls.resumeBuffering();
           this.playerQueue.forEach(player => player.pauseBuffering());
@@ -25055,7 +25114,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
       this.log(`Load interstitial asset ${assetListIndex + 1}/${assetListLength} ${interstitial}`);
       const timelineStart = interstitial.timelineStart;
       if (interstitial.appendInPlace) {
-        this.flushFrontBuffer(timelineStart);
+        this.flushFrontBuffer(timelineStart + 0.25);
       }
       const uri = interstitial.assetUrl;
       if (uri) {
@@ -25335,6 +25394,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
     } = player;
     const assetListLength = interstitial.assetList.length;
     const playingAsset = this.playingAsset;
+    this.endedAsset = null;
     this.playingAsset = assetItem;
     if (!playingAsset || playingAsset.identifier !== assetId) {
       if (playingAsset) {
@@ -25343,7 +25403,6 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
         delete playingAsset.error;
       }
       this.log(`INTERSTITIAL_ASSET_STARTED ${assetListIndex + 1}/${assetListLength} ${player}`);
-      // player.resumeBuffering();
       this.hls.trigger(Events.INTERSTITIAL_ASSET_STARTED, {
         asset: assetItem,
         assetListIndex,
@@ -25444,7 +25503,7 @@ MediaSource ${stringify(attachMediaSourceData)} from ${logFromSource}`);
   primaryFallback(interstitial) {
     // Fallback to Primary by on current or future events by updating schedule to skip errored interstitials/assets
     const flushStart = interstitial.timelineStart;
-    const playingItem = this.playingItem || this.waitingItem;
+    const playingItem = this.effectivePlayingItem;
     // Update schedule now that interstitial/assets are flagged with `error` for fallback
     this.updateSchedule();
     if (playingItem) {
@@ -31681,7 +31740,7 @@ class StreamController extends BaseStreamController {
         // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
         hls.nextLoadLevel = startLevel;
         this.level = hls.loadLevel;
-        this._hasEnoughToStart = false;
+        this._hasEnoughToStart = !!skipSeekToStartPosition;
       }
       // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
       if (lastCurrentTime > 0 && startPosition === -1 && !skipSeekToStartPosition) {
@@ -32285,7 +32344,7 @@ class StreamController extends BaseStreamController {
     if (!media) {
       return;
     }
-    if (!this._hasEnoughToStart && media.buffered.length) {
+    if (!this._hasEnoughToStart && BufferHelper.getBuffered(media).length) {
       this._hasEnoughToStart = true;
       this.seekToStartPos();
     }
@@ -32718,7 +32777,9 @@ class StreamController extends BaseStreamController {
     this.tickImmediate();
   }
   getMainFwdBufferInfo() {
-    return this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : this.media, PlaylistLevelType.MAIN);
+    // Observe video SourceBuffer (this.mediaBuffer) only when alt-audio is used, otherwise observe combined media buffer
+    const bufferOutput = this.mediaBuffer && this.altAudio === 2 ? this.mediaBuffer : this.media;
+    return this.getFwdBufferInfo(bufferOutput, PlaylistLevelType.MAIN);
   }
   get maxBufferLength() {
     const {