hls.js 1.6.0-beta.1.0.canary.10801 → 1.6.0-beta.1.0.canary.10804

package/dist/hls.light.js

@@ -1028,7 +1028,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.1.0.canary.10801");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10804");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -2287,7 +2287,7 @@
             var forcedAutoLevel = _this3.forcedAutoLevel;
             if (i !== loadLevel && (forcedAutoLevel === -1 || forcedAutoLevel !== loadLevel)) {
               if (levelsSkipped.length) {
-                _this3.trace("Skipped level(s) " + levelsSkipped.join(',') + " of " + maxAutoLevel + " max with CODECS and VIDEO-RANGE:\"" + levels[levelsSkipped[0]].codecs + "\" " + levels[levelsSkipped[0]].videoRange + "; not compatible with \"" + level.codecs + "\" " + currentVideoRange);
+                _this3.trace("Skipped level(s) " + levelsSkipped.join(',') + " of " + maxAutoLevel + " max with CODECS and VIDEO-RANGE:\"" + levels[levelsSkipped[0]].codecs + "\" " + levels[levelsSkipped[0]].videoRange + "; not compatible with \"" + currentCodecSet + "\" " + currentVideoRange);
               }
               _this3.info("switch candidate:" + selectionBaseLevel + "->" + i + " adjustedbw(" + Math.round(adjustedbw) + ")-bitrate=" + Math.round(adjustedbw - bitrate) + " ttfb:" + ttfbEstimateSec.toFixed(1) + " avgDuration:" + avgDuration.toFixed(1) + " maxFetchDuration:" + maxFetchDuration.toFixed(1) + " fetchDuration:" + fetchDuration.toFixed(1) + " firstSelection:" + firstSelection + " codecSet:" + levelInfo.codecSet + " videoRange:" + levelInfo.videoRange + " hls.loadLevel:" + loadLevel);
             }
@@ -5911,6 +5911,23 @@
         }
         return -1;
       }
+    }, {
+      key: "maxPartIndex",
+      get: function get() {
+        var partList = this.partList;
+        if (partList) {
+          var lastIndex = this.lastPartIndex;
+          if (lastIndex !== -1) {
+            for (var i = partList.length; i--;) {
+              if (partList[i].index > lastIndex) {
+                return partList[i].index;
+              }
+            }
+            return lastIndex;
+          }
+        }
+        return 0;
+      }
     }, {
       key: "lastPartSn",
       get: function get() {
@@ -8270,10 +8287,14 @@
   }
   function reassignFragmentLevelIndexes(levels) {
     levels.forEach(function (level, index) {
-      var details = level.details;
-      if (details != null && details.fragments) {
-        details.fragments.forEach(function (fragment) {
+      var _level$details;
+      var fragments = (_level$details = level.details) == null ? void 0 : _level$details.fragments;
+      if (fragments) {
+        fragments.forEach(function (fragment) {
           fragment.level = index;
+          if (fragment.initSegment) {
+            fragment.initSegment.level = index;
+          }
         });
       }
     });
@@ -16329,8 +16350,8 @@
       var _this;
       _this = _Logger.call(this, logPrefix, hls.logger) || this;
       _this.hls = void 0;
-      _this.timer = -1;
       _this.canLoad = false;
+      _this.timer = -1;
       _this.hls = hls;
       return _this;
     }
@@ -16436,11 +16457,23 @@
       if (details.live || previousDetails != null && previousDetails.live) {
         var levelOrTrack = 'levelInfo' in data ? data.levelInfo : data.track;
         details.reloaded(previousDetails);
-        this.log("live playlist " + index + " " + (details.advanced ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex : details.updated ? 'UPDATED' : 'MISSED'));
         // Merge live playlists to adjust fragment starts and fill in delta playlist skipped segments
         if (previousDetails && details.fragments.length > 0) {
           mergeDetails(previousDetails, details);
         }
+        if (details.requestScheduled === -1) {
+          details.requestScheduled = stats.loading.start;
+        }
+        var bufferInfo = this.hls.mainForwardBufferInfo;
+        var position = bufferInfo ? bufferInfo.end - bufferInfo.len : 0;
+        var distanceToLiveEdgeMs = (details.edge - position) * 1000;
+        var reloadInterval = computeReloadInterval(details, distanceToLiveEdgeMs);
+        if (details.requestScheduled + reloadInterval < now) {
+          details.requestScheduled = now;
+        } else {
+          details.requestScheduled += reloadInterval;
+        }
+        this.log("live playlist " + index + " " + (details.advanced ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex : details.updated ? 'UPDATED' : 'MISSED'));
         if (!this.canLoad || !details.live) {
           return;
         }
@@ -16454,12 +16487,16 @@
           var endSn = details.endSN;
           var lastPartIndex = details.lastPartIndex;
           var hasParts = lastPartIndex !== -1;
-          var lastPart = lastPartSn === endSn;
-          // When low latency mode is disabled, we'll skip part requests once the last part index is found
-          var nextSnStartIndex = lowLatencyMode ? 0 : lastPartIndex;
+          var atLastPartOfSegment = lastPartSn === endSn;
           if (hasParts) {
-            msn = lastPart ? endSn + 1 : lastPartSn;
-            part = lastPart ? nextSnStartIndex : lastPartIndex + 1;
+            // When low latency mode is disabled, request the last part of the next segment
+            if (atLastPartOfSegment) {
+              msn = endSn + 1;
+              part = lowLatencyMode ? 0 : lastPartIndex;
+            } else {
+              msn = lastPartSn;
+              part = lowLatencyMode ? lastPartIndex + 1 : details.maxPartIndex;
+            }
           } else {
             msn = endSn + 1;
           }
@@ -16491,36 +16528,25 @@
             details.tuneInGoal = currentGoal;
           }
           deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
-          if (lowLatencyMode || !lastPart) {
+          if (lowLatencyMode || !atLastPartOfSegment) {
+            details.requestScheduled = now;
             this.loadingPlaylist(levelOrTrack, deliveryDirectives);
             return;
           }
         } else if (details.canBlockReload || details.canSkipUntil) {
           deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
         }
-        if (details.requestScheduled === -1) {
-          details.requestScheduled = stats.loading.start;
-        }
         if (deliveryDirectives && msn !== undefined && details.canBlockReload) {
-          details.requestScheduled -= details.partTarget * 1000 || 1000;
-        }
-        var bufferInfo = this.hls.mainForwardBufferInfo;
-        var position = bufferInfo ? bufferInfo.end - bufferInfo.len : 0;
-        var distanceToLiveEdgeMs = (details.edge - position) * 1000;
-        var reloadInterval = computeReloadInterval(details, distanceToLiveEdgeMs);
-        if (details.requestScheduled + reloadInterval < now) {
-          details.requestScheduled = now;
-        } else {
-          details.requestScheduled += reloadInterval;
+          details.requestScheduled = stats.loading.first + Math.max(reloadInterval - elapsed * 2, reloadInterval / 2);
         }
-        this.scheduleLoading(levelOrTrack, deliveryDirectives);
+        this.scheduleLoading(levelOrTrack, deliveryDirectives, details);
       } else {
         this.clearTimer();
       }
     };
-    _proto.scheduleLoading = function scheduleLoading(levelOrTrack, deliveryDirectives) {
+    _proto.scheduleLoading = function scheduleLoading(levelOrTrack, deliveryDirectives, updatedDetails) {
       var _this2 = this;
-      var details = levelOrTrack.details;
+      var details = updatedDetails || levelOrTrack.details;
       if (!details) {
         this.loadingPlaylist(levelOrTrack, deliveryDirectives);
         return;
@@ -16533,22 +16559,7 @@
       }
       var estimatedTimeUntilUpdate = requestScheduled - now;
       this.log("reload live playlist " + (levelOrTrack.name || levelOrTrack.bitrate + 'bps') + " in " + Math.round(estimatedTimeUntilUpdate) + " ms");
-      // this.log(
-      //   `live reload ${details.updated ? 'REFRESHED' : 'MISSED'}
-      // reload in ${estimatedTimeUntilUpdate / 1000}
-      // round trip ${(stats.loading.end - stats.loading.start) / 1000}
-      // diff ${
-      //   (reloadInterval -
-      //     (estimatedTimeUntilUpdate +
-      //       stats.loading.end -
-      //       stats.loading.start)) /
-      //   1000
-      // }
-      // reload interval ${reloadInterval / 1000}
-      // target duration ${details.targetduration}
-      // distance to edge ${distanceToLiveEdgeMs / 1000}`
-      // );
-
+      this.clearTimer();
       this.timer = self.setTimeout(function () {
         return _this2.loadingPlaylist(levelOrTrack, deliveryDirectives);
       }, estimatedTimeUntilUpdate);
@@ -16585,6 +16596,7 @@
         } else {
           var delay = getRetryDelay(retryConfig, retryCount);
           // Schedule level/track reload
+          this.clearTimer();
           this.timer = self.setTimeout(function () {
             return _this3.loadPlaylist();
           }, delay);
@@ -16880,17 +16892,6 @@
         })
       };
       this.hls.trigger(Events.MANIFEST_PARSED, edata);
-
-      // Initiate loading after all controllers have received MANIFEST_PARSED
-      var _this$hls = this.hls,
-        _this$hls$config = _this$hls.config,
-        autoStartLoad = _this$hls$config.autoStartLoad,
-        startPosition = _this$hls$config.startPosition,
-        forceStartLoad = _this$hls.forceStartLoad;
-      if (autoStartLoad || forceStartLoad) {
-        this.log((autoStartLoad ? 'auto' : 'force') + " startLoad with configured startPosition " + startPosition);
-        this.hls.startLoad(startPosition);
-      }
     };
     _proto.onError = function onError(event, data) {
       if (data.fatal || !data.context) {
@@ -16933,8 +16934,8 @@
         return;
       }
 
-      // only process level loaded events matching with expected level
-      if (curLevel === this.currentLevel) {
+      // only process level loaded events matching with expected level or prior to switch when media playlist is loaded directly
+      if (curLevel === this.currentLevel || data.withoutMultiVariant) {
         // reset level load error counter on successful level loaded only if there is no issues with fragments
         if (curLevel.fragmentError === 0) {
           curLevel.loadError = 0;
@@ -16977,6 +16978,9 @@
     _proto.removeLevel = function removeLevel(levelIndex) {
       var _this4 = this,
         _this$currentLevel;
+      if (this._levels.length === 1) {
+        return;
+      }
       var levels = this._levels.filter(function (level, index) {
         if (index !== levelIndex) {
           return true;
@@ -17000,6 +17004,14 @@
       if (this.currentLevelIndex > -1 && (_this$currentLevel = this.currentLevel) != null && _this$currentLevel.details) {
         this.currentLevelIndex = this.currentLevel.details.fragments[0].level;
       }
+      if (this.manualLevelIndex > -1) {
+        this.manualLevelIndex = this.currentLevelIndex;
+      }
+      var maxLevel = levels.length - 1;
+      this._firstLevel = Math.min(this._firstLevel, maxLevel);
+      if (this._startLevel) {
+        this._startLevel = Math.min(this._startLevel, maxLevel);
+      }
       this.hls.trigger(Events.LEVELS_UPDATED, {
         levels: levels
       });
@@ -17009,10 +17021,10 @@
       this._levels = levels;
     };
     _proto.checkMaxAutoUpdated = function checkMaxAutoUpdated() {
-      var _this$hls2 = this.hls,
-        autoLevelCapping = _this$hls2.autoLevelCapping,
-        maxAutoLevel = _this$hls2.maxAutoLevel,
-        maxHdcpLevel = _this$hls2.maxHdcpLevel;
+      var _this$hls = this.hls,
+        autoLevelCapping = _this$hls.autoLevelCapping,
+        maxAutoLevel = _this$hls.maxAutoLevel,
+        maxHdcpLevel = _this$hls.maxHdcpLevel;
       if (this._maxAutoLevel !== maxAutoLevel) {
         this._maxAutoLevel = maxAutoLevel;
         this.hls.trigger(Events.MAX_AUTO_LEVEL_UPDATED, {
@@ -19744,7 +19756,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10801";
+  var version = "1.6.0-beta.1.0.canary.10804";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -20935,6 +20947,9 @@
     _proto.onLevelsUpdated = function onLevelsUpdated(event, data) {
       if (this.level > -1 && this.fragCurrent) {
         this.level = this.fragCurrent.level;
+        if (this.level === -1) {
+          this.resetWhenMissingContext(this.fragCurrent);
+        }
       }
       this.levels = data.levels;
     };
@@ -21835,7 +21850,7 @@
         if (loaderContext && loaderContext.levelOrTrack === context.levelOrTrack && (loaderContext.url === context.url || loaderContext.deliveryDirectives && !context.deliveryDirectives)) {
           // same URL can't overlap, or wait for blocking request
           if (loaderContext.url === context.url) {
-            logger.log("[playlist-loader]: playlist request ongoing");
+            logger.log("[playlist-loader]: ignore " + context.url + " ongoing request");
           } else {
             logger.log("[playlist-loader]: ignore " + context.url + " in favor of " + loaderContext.url);
           }
@@ -21901,7 +21916,7 @@
             return;
           }
           stats.parsing.start = performance.now();
-          if (M3U8Parser.isMediaPlaylist(string)) {
+          if (M3U8Parser.isMediaPlaylist(string) || context.type !== PlaylistContextType.MANIFEST) {
             _this.handleTrackOrLevelPlaylist(response, stats, context, networkDetails || null, loader);
           } else {
             _this.handleMasterPlaylist(response, stats, context, networkDetails);
@@ -21919,6 +21934,20 @@
 
       loader.load(context, loaderConfig, loaderCallbacks);
     };
+    _proto.checkAutostartLoad = function checkAutostartLoad() {
+      if (!this.hls) {
+        return;
+      }
+      var _this$hls = this.hls,
+        _this$hls$config = _this$hls.config,
+        autoStartLoad = _this$hls$config.autoStartLoad,
+        startPosition = _this$hls$config.startPosition,
+        forceStartLoad = _this$hls.forceStartLoad;
+      if (autoStartLoad || forceStartLoad) {
+        this.hls.logger.log((autoStartLoad ? 'auto' : 'force') + " startLoad with configured startPosition " + startPosition);
+        this.hls.startLoad(startPosition);
+      }
+    };
     _proto.handleMasterPlaylist = function handleMasterPlaylist(response, stats, context, networkDetails) {
       var hls = this.hls;
       var string = response.data;
@@ -21980,6 +22009,7 @@
         startTimeOffset: startTimeOffset,
         variableList: variableList
       });
+      this.checkAutostartLoad();
     };
     _proto.handleTrackOrLevelPlaylist = function handleTrackOrLevelPlaylist(response, stats, context, networkDetails, loader) {
       var hls = this.hls;
@@ -22023,6 +22053,9 @@
       // extend the context with the new levelDetails property
       context.levelDetails = levelDetails;
       this.handlePlaylistLoaded(levelDetails, response, stats, context, networkDetails, loader);
+      if (type === PlaylistContextType.MANIFEST && (!levelDetails.playlistParsingError || !levelDetails.fragments.length && levelDetails.live)) {
+        this.checkAutostartLoad();
+      }
     };
     _proto.handleManifestParsingError = function handleManifestParsingError(response, context, error, networkDetails, stats) {
       this.hls.trigger(Events.ERROR, {
@@ -22106,7 +22139,7 @@
       var parent = mapContextToLevelType(context);
       var levelIndex = typeof context.level === 'number' && parent === PlaylistLevelType.MAIN ? level : undefined;
       if (!levelDetails.fragments.length) {
-        var _error = new Error('No Segments found in Playlist');
+        var _error = levelDetails.playlistParsingError = new Error('No Segments found in Playlist');
         hls.trigger(Events.ERROR, {
           type: ErrorTypes.NETWORK_ERROR,
           details: ErrorDetails.LEVEL_EMPTY_ERROR,
@@ -22162,7 +22195,8 @@
             id: id || 0,
             stats: stats,
             networkDetails: networkDetails,
-            deliveryDirectives: deliveryDirectives
+            deliveryDirectives: deliveryDirectives,
+            withoutMultiVariant: type === PlaylistContextType.MANIFEST
           });
           break;
         case PlaylistContextType.AUDIO_TRACK:
@@ -22337,8 +22371,9 @@
       this.cmcdController = void 0;
       this._media = null;
       this._url = null;
-      this.triggeringException = void 0;
       this._sessionId = void 0;
+      this.triggeringException = void 0;
+      this.started = false;
       var logger = this.logger = enableLogs(userConfig.debug || false, 'Hls instance', userConfig.assetPlayerId);
       var config = this.config = mergeConfig(Hls.DefaultConfig, userConfig, logger);
       this.userConfig = userConfig;
@@ -22611,10 +22646,14 @@
         startPosition = -1;
       }
       this.logger.log("startLoad(" + (startPosition + (skipSeekToStartPosition ? ', <skip seek to start>' : '')) + ")");
+      this.started = true;
       this.resumeBuffering();
-      this.networkControllers.forEach(function (controller) {
-        controller.startLoad(startPosition, skipSeekToStartPosition);
-      });
+      for (var i = 0; i < this.networkControllers.length; i++) {
+        this.networkControllers[i].startLoad(startPosition, skipSeekToStartPosition);
+        if (!this.started || !this.networkControllers) {
+          break;
+        }
+      }
     }
 
     /**
@@ -22622,13 +22661,17 @@
      */;
     _proto.stopLoad = function stopLoad() {
       this.logger.log('stopLoad');
-      this.networkControllers.forEach(function (controller) {
-        controller.stopLoad();
-      });
+      this.started = false;
+      for (var i = 0; i < this.networkControllers.length; i++) {
+        this.networkControllers[i].stopLoad();
+        if (this.started || !this.networkControllers) {
+          break;
+        }
+      }
     }
 
     /**
-     * Returns state of fragment loading toggled by calling `pauseBuffering()` and `resumeBuffering()`.
+     * Returns whether loading, toggled with `startLoad()` and `stopLoad()`, is active or not`.
      */;
     /**
      * Resumes stream controller segment loading after `pauseBuffering` has been called.
@@ -22745,6 +22788,15 @@
       get: function get() {
         return this.streamController.startPositionValue;
       }
+    }, {
+      key: "loadingEnabled",
+      get: function get() {
+        return this.started;
+      }
+
+      /**
+       * Returns state of fragment loading toggled by calling `pauseBuffering()` and `resumeBuffering()`.
+       */
     }, {
       key: "bufferingEnabled",
       get: function get() {