hls.js 1.6.0-beta.2.0.canary.10925 → 1.6.0-beta.2.0.canary.10926

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.2.0.canary.10925"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10926"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1307,8 +1307,8 @@ function searchDownAndUpList(arr, searchIndex, predicate) {
   return -1;
 }
 function useAlternateAudio(audioTrackUrl, hls) {
-  var _hls$levels$hls$loadL;
-  return !!audioTrackUrl && audioTrackUrl !== ((_hls$levels$hls$loadL = hls.levels[hls.loadLevel]) == null ? undefined : _hls$levels$hls$loadL.uri);
+  var _hls$loadLevelObj;
+  return !!audioTrackUrl && audioTrackUrl !== ((_hls$loadLevelObj = hls.loadLevelObj) == null ? undefined : _hls$loadLevelObj.uri);
 }
 
 class AbrController extends Logger {
@@ -1802,8 +1802,8 @@ class AbrController extends Logger {
     }
     // If no matching level found, see if min auto level would be a better option
     const minLevel = hls.levels[minAutoLevel];
-    const autoLevel = hls.levels[hls.loadLevel];
-    if ((minLevel == null ? undefined : minLevel.bitrate) < (autoLevel == null ? undefined : autoLevel.bitrate)) {
+    const autoLevel = hls.loadLevelObj;
+    if (autoLevel && (minLevel == null ? undefined : minLevel.bitrate) < autoLevel.bitrate) {
       return minAutoLevel;
     }
     // or if bitrate is not lower, continue to use loadLevel
@@ -2344,7 +2344,7 @@ class ErrorController extends Logger {
       case ErrorDetails.SUBTITLE_LOAD_ERROR:
       case ErrorDetails.SUBTITLE_TRACK_LOAD_TIMEOUT:
         if (context) {
-          const level = hls.levels[hls.loadLevel];
+          const level = hls.loadLevelObj;
           if (level && (context.type === PlaylistContextType.AUDIO_TRACK && level.hasAudioGroup(context.groupId) || context.type === PlaylistContextType.SUBTITLE_TRACK && level.hasSubtitleGroup(context.groupId))) {
             // Perform Pathway switch or Redundant failover if possible for fastest recovery
             // otherwise allow playlist retry count to reach max error retries
@@ -2357,7 +2357,7 @@ class ErrorController extends Logger {
         return;
       case ErrorDetails.KEY_SYSTEM_STATUS_OUTPUT_RESTRICTED:
         {
-          const level = hls.levels[hls.loadLevel];
+          const level = hls.loadLevelObj;
           const restrictedHdcpLevel = level == null ? undefined : level.attrs['HDCP-LEVEL'];
           if (restrictedHdcpLevel) {
             data.errorAction = {
@@ -8892,7 +8892,8 @@ class BaseStreamController extends TaskLoop {
     if (bufferInfo.len === 0 && bufferInfo.nextStart !== undefined) {
       const bufferedFragAtPos = this.fragmentTracker.getBufferedFrag(pos, type);
       if (bufferedFragAtPos && (bufferInfo.nextStart <= bufferedFragAtPos.end || bufferedFragAtPos.gap)) {
-        return BufferHelper.bufferInfo(bufferable, pos, Math.max(bufferInfo.nextStart, maxBufferHole));
+        const gapDuration = Math.max(Math.min(bufferInfo.nextStart, bufferedFragAtPos.end) - pos, maxBufferHole);
+        return BufferHelper.bufferInfo(bufferable, pos, gapDuration);
       }
     }
     return bufferInfo;
@@ -9859,7 +9860,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10925";
+const version = "1.6.0-beta.2.0.canary.10926";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -25047,7 +25048,7 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     const primary = this.hls;
     const userConfig = primary.userConfig;
     let videoPreference = userConfig.videoPreference;
-    const currentLevel = primary.levels[primary.loadLevel] || primary.levels[primary.currentLevel];
+    const currentLevel = primary.loadLevelObj || primary.levels[primary.currentLevel];
     if (videoPreference || currentLevel) {
       videoPreference = _extends({}, videoPreference);
       if (currentLevel.videoCodec) {
@@ -30139,7 +30140,7 @@ class GapController extends TaskLoop {
     const currentTime = media.currentTime;
     const bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
     const startTime = currentTime < bufferInfo.start ? bufferInfo.start : bufferInfo.nextStart;
-    if (startTime) {
+    if (startTime && this.hls) {
       const bufferStarved = bufferInfo.len <= config.maxBufferHole;
       const waiting = bufferInfo.len > 0 && bufferInfo.len < 1 && media.readyState < 3;
       const gapLength = startTime - currentTime;
@@ -30156,6 +30157,17 @@ class GapController extends TaskLoop {
           if (!startGap) {
             const startProvisioned = partial || fragmentTracker.getAppendedFrag(currentTime, PlaylistLevelType.MAIN);
             if (startProvisioned) {
+              var _this$hls$loadLevelOb;
+              // Do not seek when selected variant playlist is unloaded
+              if (!((_this$hls$loadLevelOb = this.hls.loadLevelObj) != null && _this$hls$loadLevelOb.details)) {
+                return 0;
+              }
+              // Do not seek when required fragments are inflight or appending
+              const inFlightDependency = getInFlightDependency(this.hls.inFlightFragments, startTime);
+              if (inFlightDependency) {
+                return 0;
+              }
+              // Do not seek if we can't walk tracked fragments to end of gap
               let moreToLoad = false;
               let pos = startProvisioned.end;
               while (pos < startTime) {
@@ -30177,7 +30189,7 @@ class GapController extends TaskLoop {
         this.warn(`skipping hole, adjusting currentTime from ${currentTime} to ${targetTime}`);
         this.moved = true;
         media.currentTime = targetTime;
-        if (!(partial != null && partial.gap) && this.hls) {
+        if (!(partial != null && partial.gap)) {
           const error = new Error(`fragment loaded with buffer holes, seeking from ${currentTime} to ${targetTime}`);
           this.hls.trigger(Events.ERROR, {
             type: ErrorTypes.MEDIA_ERROR,
@@ -31131,6 +31143,9 @@ class LevelController extends BasePlaylistController {
     }
     return this._levels;
   }
+  get loadLevelObj() {
+    return this.currentLevel;
+  }
   get level() {
     return this.currentLevelIndex;
   }
@@ -31616,7 +31631,7 @@ class StreamController extends BaseStreamController {
   onTickEnd() {
     var _this$media2;
     super.onTickEnd();
-    if ((_this$media2 = this.media) != null && _this$media2.readyState) {
+    if ((_this$media2 = this.media) != null && _this$media2.readyState && this.media.seeking === false) {
       this.lastCurrentTime = this.media.currentTime;
     }
     this.checkFragmentChanged();
@@ -34000,10 +34015,21 @@ class Hls {
     const levels = this.levelController.levels;
     return levels ? levels : [];
   }
+
+  /**
+   * @returns LevelDetails of last loaded level (variant) or `null` prior to loading a media playlist.
+   */
   get latestLevelDetails() {
     return this.streamController.getLevelDetails() || null;
   }
 
+  /**
+   * @returns Level object of selected level (variant) or `null` prior to selecting a level or once the level is removed.
+   */
+  get loadLevelObj() {
+    return this.levelController.loadLevelObj;
+  }
+
   /**
    * Index of quality level (variant) currently played
    */