hls.js 1.6.0-beta.1.0.canary.10787 → 1.6.0-beta.1.0.canary.10789

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.10787");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10789");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -5778,6 +5778,7 @@
       this.dateRanges = void 0;
       this.dateRangeTagCount = 0;
       this.live = true;
+      this.requestScheduled = -1;
       this.ageHeader = 0;
       this.advancedDateTime = void 0;
       this.updated = true;
@@ -8110,6 +8111,9 @@
       newDetails.driftEnd = oldDetails.driftEnd;
       newDetails.advancedDateTime = oldDetails.advancedDateTime;
     }
+    if (newDetails.requestScheduled === -1) {
+      newDetails.requestScheduled = oldDetails.requestScheduled;
+    }
   }
   function mergeDateRanges(oldDateRanges, newDetails) {
     var deltaDateRanges = newDetails.dateRanges,
@@ -8181,12 +8185,14 @@
     var sliding = 0;
     if (advancedOrStable && delta < oldFragments.length) {
       sliding = oldFragments[delta].start;
+    } else if (advancedOrStable && newDetails.startSN === oldDetails.endSN + 1) {
+      sliding = oldDetails.fragmentEnd;
     } else if (advancedOrStable && matchingStableVariantOrRendition) {
-      // align new start with old end (updated playlist start sequence is past end sequence of last update)
-      sliding = oldDetails.edge;
-    } else if (!newDetails.skippedSegments && newDetails.fragments[0].start === 0) {
+      // align with expected position (updated playlist start sequence is past end sequence of last update)
+      sliding = oldDetails.fragmentStart + delta * newDetails.levelTargetDuration;
+    } else if (!newDetails.skippedSegments && newDetails.fragmentStart === 0) {
       // align new start with old (playlist switch has a sequence with no overlap and should not be used for alignment)
-      sliding = oldDetails.fragments[0].start;
+      sliding = oldDetails.fragmentStart;
     } else {
       // new details already has a sliding offset or has skipped segments
       return;
@@ -16324,7 +16330,6 @@
       _this = _Logger.call(this, logPrefix, hls.logger) || this;
       _this.hls = void 0;
       _this.timer = -1;
-      _this.requestScheduled = -1;
       _this.canLoad = false;
       _this.hls = hls;
       return _this;
@@ -16344,7 +16349,6 @@
     };
     _proto.startLoad = function startLoad() {
       this.canLoad = true;
-      this.requestScheduled = -1;
       this.loadPlaylist();
     };
     _proto.stopLoad = function stopLoad() {
@@ -16389,19 +16393,27 @@
       }
     };
     _proto.loadPlaylist = function loadPlaylist(hlsUrlParameters) {
-      if (this.requestScheduled === -1) {
-        this.requestScheduled = self.performance.now();
-      }
       // Loading is handled by the subclasses
+      this.clearTimer();
+    };
+    _proto.loadingPlaylist = function loadingPlaylist(playlist, hlsUrlParameters) {
+      // Loading is handled by the subclasses
+      this.clearTimer();
     };
     _proto.shouldLoadPlaylist = function shouldLoadPlaylist(playlist) {
       return this.canLoad && !!playlist && !!playlist.url && (!playlist.details || playlist.details.live);
     };
-    _proto.shouldReloadPlaylist = function shouldReloadPlaylist(playlist) {
-      return this.timer === -1 && this.requestScheduled === -1 && this.shouldLoadPlaylist(playlist);
+    _proto.getUrlWithDirectives = function getUrlWithDirectives(uri, hlsUrlParameters) {
+      if (hlsUrlParameters) {
+        try {
+          return hlsUrlParameters.addDirectives(uri);
+        } catch (error) {
+          this.warn("Could not construct new URL with HLS Delivery Directives: " + error);
+        }
+      }
+      return uri;
     };
     _proto.playlistLoaded = function playlistLoaded(index, data, previousDetails) {
-      var _this2 = this;
       var details = data.details,
         stats = data.stats;
 
@@ -16422,10 +16434,9 @@
 
       // if current playlist is a live playlist, arm a timer to reload it
       if (details.live || previousDetails != null && previousDetails.live) {
+        var levelOrTrack = 'levelInfo' in data ? data.levelInfo : data.track;
         details.reloaded(previousDetails);
-        if (previousDetails) {
-          this.log("live playlist " + index + " " + (details.advanced ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex : details.updated ? 'UPDATED' : 'MISSED'));
-        }
+        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);
@@ -16481,52 +16492,67 @@
           }
           deliveryDirectives = this.getDeliveryDirectives(details, data.deliveryDirectives, msn, part);
           if (lowLatencyMode || !lastPart) {
-            this.loadPlaylist(deliveryDirectives);
+            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.updated && now > this.requestScheduled + reloadInterval) {
-          this.requestScheduled = stats.loading.start;
-        }
-        if (msn !== undefined && details.canBlockReload) {
-          this.requestScheduled = stats.loading.first + reloadInterval - (details.partTarget * 1000 || 1000);
-        } else if (this.requestScheduled === -1 || this.requestScheduled + reloadInterval < now) {
-          this.requestScheduled = now;
-        } else if (this.requestScheduled - now <= 0) {
-          this.requestScheduled += reloadInterval;
-        }
-        var estimatedTimeUntilUpdate = this.requestScheduled - now;
-        estimatedTimeUntilUpdate = Math.max(0, estimatedTimeUntilUpdate);
-        this.log("reload live playlist " + index + " 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.timer = self.setTimeout(function () {
-          return _this2.loadPlaylist(deliveryDirectives);
-        }, estimatedTimeUntilUpdate);
+        if (details.requestScheduled + reloadInterval < now) {
+          details.requestScheduled = now;
+        } else {
+          details.requestScheduled += reloadInterval;
+        }
+        this.scheduleLoading(levelOrTrack, deliveryDirectives);
       } else {
         this.clearTimer();
       }
     };
+    _proto.scheduleLoading = function scheduleLoading(levelOrTrack, deliveryDirectives) {
+      var _this2 = this;
+      var details = levelOrTrack.details;
+      if (!details) {
+        this.loadingPlaylist(levelOrTrack, deliveryDirectives);
+        return;
+      }
+      var now = self.performance.now();
+      var requestScheduled = details.requestScheduled;
+      if (now >= requestScheduled) {
+        this.loadingPlaylist(levelOrTrack, deliveryDirectives);
+        return;
+      }
+      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.timer = self.setTimeout(function () {
+        return _this2.loadingPlaylist(levelOrTrack, deliveryDirectives);
+      }, estimatedTimeUntilUpdate);
+    };
     _proto.getDeliveryDirectives = function getDeliveryDirectives(details, previousDeliveryDirectives, msn, part) {
       var skip = getSkipValue(details);
       if (previousDeliveryDirectives != null && previousDeliveryDirectives.skip && details.deltaUpdateFailed) {
@@ -16549,7 +16575,6 @@
       var retry = !!errorAction && !!retryConfig && (action === NetworkErrorAction.RetryRequest || !errorAction.resolved && action === NetworkErrorAction.SendAlternateToPenaltyBox);
       if (retry) {
         var _errorEvent$context;
-        this.requestScheduled = -1;
         if (retryCount >= retryConfig.maxNumRetry) {
           return false;
         }
@@ -16872,10 +16897,7 @@
         return;
       }
       if (data.context.type === PlaylistContextType.LEVEL && data.context.level === this.level) {
-        var retry = this.checkRetry(data);
-        if (!retry) {
-          this.requestScheduled = -1;
-        }
+        this.checkRetry(data);
       }
     }
 
@@ -16930,36 +16952,28 @@
     };
     _proto.loadPlaylist = function loadPlaylist(hlsUrlParameters) {
       _BasePlaylistControll.prototype.loadPlaylist.call(this);
-      var currentLevelIndex = this.currentLevelIndex;
-      var currentLevel = this.currentLevel;
-      if (currentLevel && this.shouldLoadPlaylist(currentLevel)) {
-        var url = currentLevel.uri;
-        if (hlsUrlParameters) {
-          try {
-            url = hlsUrlParameters.addDirectives(url);
-          } catch (error) {
-            this.warn("Could not construct new URL with HLS Delivery Directives: " + error);
-          }
-        }
-        var pathwayId = currentLevel.attrs['PATHWAY-ID'];
-        var details = currentLevel.details;
-        var age = details == null ? void 0 : details.age;
-        this.log("Loading level index " + currentLevelIndex + ((hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : '') + (pathwayId ? ' Pathway ' + pathwayId : '') + (age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : '') + " " + url);
-
-        // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId);
-        // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
-        this.clearTimer();
-        this.hls.trigger(Events.LEVEL_LOADING, {
-          url: url,
-          level: currentLevelIndex,
-          levelInfo: currentLevel,
-          pathwayId: currentLevel.attrs['PATHWAY-ID'],
-          id: 0,
-          // Deprecated Level urlId
-          deliveryDirectives: hlsUrlParameters || null
-        });
+      if (this.shouldLoadPlaylist(this.currentLevel)) {
+        this.scheduleLoading(this.currentLevel, hlsUrlParameters);
       }
     };
+    _proto.loadingPlaylist = function loadingPlaylist(currentLevel, hlsUrlParameters) {
+      _BasePlaylistControll.prototype.loadingPlaylist.call(this, currentLevel, hlsUrlParameters);
+      var url = this.getUrlWithDirectives(currentLevel.uri, hlsUrlParameters);
+      var currentLevelIndex = this.currentLevelIndex;
+      var pathwayId = currentLevel.attrs['PATHWAY-ID'];
+      var details = currentLevel.details;
+      var age = details == null ? void 0 : details.age;
+      this.log("Loading level index " + currentLevelIndex + ((hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : '') + (pathwayId ? ' Pathway ' + pathwayId : '') + (age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : '') + " " + url);
+      this.hls.trigger(Events.LEVEL_LOADING, {
+        url: url,
+        level: currentLevelIndex,
+        levelInfo: currentLevel,
+        pathwayId: currentLevel.attrs['PATHWAY-ID'],
+        id: 0,
+        // Deprecated Level urlId
+        deliveryDirectives: hlsUrlParameters || null
+      });
+    };
     _proto.removeLevel = function removeLevel(levelIndex) {
       var _this4 = this,
         _this$currentLevel;
@@ -17054,9 +17068,7 @@
         this.currentLevelIndex = newLevel;
         this.currentLevel = level;
         if (lastLevelIndex === newLevel && lastLevel && lastPathwayId === pathwayId) {
-          if (level.details || this.requestScheduled !== -1) {
-            return;
-          }
+          return;
         }
         this.log("Switching to level " + newLevel + " (" + (level.height ? level.height + 'p ' : '') + (level.videoRange ? level.videoRange + ' ' : '') + (level.codecSet ? level.codecSet + ' ' : '') + "@" + level.bitrate + ")" + (pathwayId ? ' with Pathway ' + pathwayId : '') + " from level " + lastLevelIndex + (lastPathwayId ? ' with Pathway ' + lastPathwayId : ''));
         var levelSwitchingData = {
@@ -18934,10 +18946,11 @@
       this.nextLoadPosition = startPosition;
     };
     _proto.getLoadPosition = function getLoadPosition() {
+      var _this$hls;
       var media = this.media;
       // if we have not yet loaded any fragment, start loading from start position
       var pos = 0;
-      if (this.hls.hasEnoughToStart && media) {
+      if ((_this$hls = this.hls) != null && _this$hls.hasEnoughToStart && media) {
         pos = media.currentTime;
       } else if (this.nextLoadPosition >= 0) {
         pos = this.nextLoadPosition;
@@ -19731,7 +19744,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10787";
+  var version = "1.6.0-beta.1.0.canary.10789";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js