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

package/dist/hls.light.js

@@ -1030,7 +1030,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.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();
@@ -1752,8 +1752,8 @@
     }, {});
   }
   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);
   }
 
   var AbrController = /*#__PURE__*/function (_Logger) {
@@ -2173,8 +2173,8 @@
       }
       // If no matching level found, see if min auto level would be a better option
       var minLevel = hls.levels[minAutoLevel];
-      var autoLevel = hls.levels[hls.loadLevel];
-      if ((minLevel == null ? undefined : minLevel.bitrate) < (autoLevel == null ? undefined : autoLevel.bitrate)) {
+      var autoLevel = hls.loadLevelObj;
+      if (autoLevel && (minLevel == null ? undefined : minLevel.bitrate) < autoLevel.bitrate) {
         return minAutoLevel;
       }
       // or if bitrate is not lower, continue to use loadLevel
@@ -2875,7 +2875,7 @@
         case ErrorDetails.SUBTITLE_LOAD_ERROR:
         case ErrorDetails.SUBTITLE_TRACK_LOAD_TIMEOUT:
           if (context) {
-            var level = hls.levels[hls.loadLevel];
+            var 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
@@ -2888,7 +2888,7 @@
           return;
         case ErrorDetails.KEY_SYSTEM_STATUS_OUTPUT_RESTRICTED:
           {
-            var _level = hls.levels[hls.loadLevel];
+            var _level = hls.loadLevelObj;
             var restrictedHdcpLevel = _level == null ? undefined : _level.attrs['HDCP-LEVEL'];
             if (restrictedHdcpLevel) {
               data.errorAction = {
@@ -17124,7 +17124,8 @@
       if (bufferInfo.len === 0 && bufferInfo.nextStart !== undefined) {
         var bufferedFragAtPos = this.fragmentTracker.getBufferedFrag(pos, type);
         if (bufferedFragAtPos && (bufferInfo.nextStart <= bufferedFragAtPos.end || bufferedFragAtPos.gap)) {
-          return BufferHelper.bufferInfo(bufferable, pos, Math.max(bufferInfo.nextStart, maxBufferHole));
+          var gapDuration = Math.max(Math.min(bufferInfo.nextStart, bufferedFragAtPos.end) - pos, maxBufferHole);
+          return BufferHelper.bufferInfo(bufferable, pos, gapDuration);
         }
       }
       return bufferInfo;
@@ -18133,7 +18134,7 @@
       var currentTime = media.currentTime;
       var bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
       var startTime = currentTime < bufferInfo.start ? bufferInfo.start : bufferInfo.nextStart;
-      if (startTime) {
+      if (startTime && this.hls) {
         var bufferStarved = bufferInfo.len <= config.maxBufferHole;
         var waiting = bufferInfo.len > 0 && bufferInfo.len < 1 && media.readyState < 3;
         var gapLength = startTime - currentTime;
@@ -18150,6 +18151,17 @@
             if (!startGap) {
               var 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
+                var inFlightDependency = getInFlightDependency(this.hls.inFlightFragments, startTime);
+                if (inFlightDependency) {
+                  return 0;
+                }
+                // Do not seek if we can't walk tracked fragments to end of gap
                 var moreToLoad = false;
                 var pos = startProvisioned.end;
                 while (pos < startTime) {
@@ -18171,7 +18183,7 @@
           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)) {
             var error = new Error("fragment loaded with buffer holes, seeking from " + currentTime + " to " + targetTime);
             this.hls.trigger(Events.ERROR, {
               type: ErrorTypes.MEDIA_ERROR,
@@ -19631,6 +19643,11 @@
         }
         return this._levels;
       }
+    }, {
+      key: "loadLevelObj",
+      get: function get() {
+        return this.currentLevel;
+      }
     }, {
       key: "level",
       get: function get() {
@@ -19953,7 +19970,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10925";
+  var 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
@@ -20518,7 +20535,7 @@
     _proto.onTickEnd = function onTickEnd() {
       var _this$media2;
       _BaseStreamController.prototype.onTickEnd.call(this);
-      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();
@@ -23000,12 +23017,25 @@
         var levels = this.levelController.levels;
         return levels ? levels : [];
       }
+
+      /**
+       * @returns LevelDetails of last loaded level (variant) or `null` prior to loading a media playlist.
+       */
     }, {
       key: "latestLevelDetails",
       get: function get() {
         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.
+       */
+    }, {
+      key: "loadLevelObj",
+      get: function get() {
+        return this.levelController.loadLevelObj;
+      }
+
       /**
        * Index of quality level (variant) currently played
        */