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

package/dist/hls.mjs

@@ -400,7 +400,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.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();
@@ -6283,6 +6283,7 @@ class LevelDetails {
     this.dateRanges = void 0;
     this.dateRangeTagCount = 0;
     this.live = true;
+    this.requestScheduled = -1;
     this.ageHeader = 0;
     this.advancedDateTime = void 0;
     this.updated = true;
@@ -7678,6 +7679,9 @@ function mergeDetails(oldDetails, newDetails) {
     newDetails.driftEnd = oldDetails.driftEnd;
     newDetails.advancedDateTime = oldDetails.advancedDateTime;
   }
+  if (newDetails.requestScheduled === -1) {
+    newDetails.requestScheduled = oldDetails.requestScheduled;
+  }
 }
 function mergeDateRanges(oldDateRanges, newDetails) {
   const {
@@ -7748,12 +7752,14 @@ function adjustSliding(oldDetails, newDetails, matchingStableVariantOrRendition
   let 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;
@@ -9147,12 +9153,13 @@ class BaseStreamController extends TaskLoop {
     this.nextLoadPosition = startPosition;
   }
   getLoadPosition() {
+    var _this$hls;
     const {
       media
     } = this;
     // if we have not yet loaded any fragment, start loading from start position
     let 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;
@@ -9806,7 +9813,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10787";
+const 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
@@ -16876,7 +16883,6 @@ class BasePlaylistController extends Logger {
     super(logPrefix, hls.logger);
     this.hls = void 0;
     this.timer = -1;
-    this.requestScheduled = -1;
     this.canLoad = false;
     this.hls = hls;
   }
@@ -16893,7 +16899,6 @@ class BasePlaylistController extends Logger {
   }
   startLoad() {
     this.canLoad = true;
-    this.requestScheduled = -1;
     this.loadPlaylist();
   }
   stopLoad() {
@@ -16938,16 +16943,25 @@ class BasePlaylistController extends Logger {
     }
   }
   loadPlaylist(hlsUrlParameters) {
-    if (this.requestScheduled === -1) {
-      this.requestScheduled = self.performance.now();
-    }
     // Loading is handled by the subclasses
+    this.clearTimer();
+  }
+  loadingPlaylist(playlist, hlsUrlParameters) {
+    // Loading is handled by the subclasses
+    this.clearTimer();
   }
   shouldLoadPlaylist(playlist) {
     return this.canLoad && !!playlist && !!playlist.url && (!playlist.details || playlist.details.live);
   }
-  shouldReloadPlaylist(playlist) {
-    return this.timer === -1 && this.requestScheduled === -1 && this.shouldLoadPlaylist(playlist);
+  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;
   }
   playlistLoaded(index, data, previousDetails) {
     const {
@@ -16972,10 +16986,9 @@ class BasePlaylistController extends Logger {
 
     // if current playlist is a live playlist, arm a timer to reload it
     if (details.live || previousDetails != null && previousDetails.live) {
+      const 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);
@@ -17031,50 +17044,64 @@ class BasePlaylistController extends Logger {
         }
         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;
+      }
       const bufferInfo = this.hls.mainForwardBufferInfo;
       const position = bufferInfo ? bufferInfo.end - bufferInfo.len : 0;
       const distanceToLiveEdgeMs = (details.edge - position) * 1000;
       const 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;
-      }
-      let 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(() => this.loadPlaylist(deliveryDirectives), estimatedTimeUntilUpdate);
+      if (details.requestScheduled + reloadInterval < now) {
+        details.requestScheduled = now;
+      } else {
+        details.requestScheduled += reloadInterval;
+      }
+      this.scheduleLoading(levelOrTrack, deliveryDirectives);
     } else {
       this.clearTimer();
     }
   }
+  scheduleLoading(levelOrTrack, deliveryDirectives) {
+    const details = levelOrTrack.details;
+    if (!details) {
+      this.loadingPlaylist(levelOrTrack, deliveryDirectives);
+      return;
+    }
+    const now = self.performance.now();
+    const requestScheduled = details.requestScheduled;
+    if (now >= requestScheduled) {
+      this.loadingPlaylist(levelOrTrack, deliveryDirectives);
+      return;
+    }
+    const 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(() => this.loadingPlaylist(levelOrTrack, deliveryDirectives), estimatedTimeUntilUpdate);
+  }
   getDeliveryDirectives(details, previousDeliveryDirectives, msn, part) {
     let skip = getSkipValue(details);
     if (previousDeliveryDirectives != null && previousDeliveryDirectives.skip && details.deltaUpdateFailed) {
@@ -17096,7 +17123,6 @@ class BasePlaylistController extends Logger {
     const 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;
       }
@@ -17259,9 +17285,6 @@ class AudioTrackController extends BasePlaylistController {
           error
         });
       }
-    } else if (this.shouldReloadPlaylist(currentTrack)) {
-      // Retry playlist loading if no playlist is or has been loaded yet
-      this.setAudioTrack(this.trackId);
     }
   }
   onError(event, data) {
@@ -17269,7 +17292,6 @@ class AudioTrackController extends BasePlaylistController {
       return;
     }
     if (data.context.type === PlaylistContextType.AUDIO_TRACK && data.context.id === this.trackId && (!this.groupIds || this.groupIds.indexOf(data.context.groupId) !== -1)) {
-      this.requestScheduled = -1;
       this.checkRetry(data);
     }
   }
@@ -17339,9 +17361,6 @@ class AudioTrackController extends BasePlaylistController {
       this.warn(`Invalid audio track id: ${newId}`);
       return;
     }
-
-    // stopping live reloading timer if any
-    this.clearTimer();
     this.selectDefaultTrack = false;
     const lastTrack = this.currentTrack;
     const track = tracks[newId];
@@ -17410,35 +17429,32 @@ class AudioTrackController extends BasePlaylistController {
   }
   loadPlaylist(hlsUrlParameters) {
     var _this$hls$levels$this;
+    super.loadPlaylist();
     const audioTrack = this.currentTrack;
-    if (!audioTrack) {
+    if (!this.shouldLoadPlaylist(audioTrack)) {
       return;
     }
-    let url = audioTrack.url;
-    if (this.shouldLoadPlaylist(audioTrack) && url !== ((_this$hls$levels$this = this.hls.levels[this.hls.loadLevel]) == null ? void 0 : _this$hls$levels$this.uri)) {
-      super.loadPlaylist();
-      const id = audioTrack.id;
-      const groupId = audioTrack.groupId;
-      if (hlsUrlParameters) {
-        try {
-          url = hlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
-        }
-      }
-      // track not retrieved yet, or live playlist we need to (re)load it
-      const details = audioTrack.details;
-      const age = details == null ? void 0 : details.age;
-      this.log(`Loading audio-track ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
-      this.clearTimer();
-      this.hls.trigger(Events.AUDIO_TRACK_LOADING, {
-        url,
-        id,
-        groupId,
-        deliveryDirectives: hlsUrlParameters || null,
-        track: audioTrack
-      });
+    if (audioTrack.url === ((_this$hls$levels$this = this.hls.levels[this.hls.loadLevel]) == null ? void 0 : _this$hls$levels$this.uri)) {
+      // Do not load audio rendition with URI matching main variant URI
+      return;
     }
+    this.scheduleLoading(audioTrack, hlsUrlParameters);
+  }
+  loadingPlaylist(audioTrack, hlsUrlParameters) {
+    super.loadingPlaylist(audioTrack, hlsUrlParameters);
+    const id = audioTrack.id;
+    const groupId = audioTrack.groupId;
+    const url = this.getUrlWithDirectives(audioTrack.url, hlsUrlParameters);
+    const details = audioTrack.details;
+    const age = details == null ? void 0 : details.age;
+    this.log(`Loading audio-track ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
+    this.hls.trigger(Events.AUDIO_TRACK_LOADING, {
+      url,
+      id,
+      groupId,
+      deliveryDirectives: hlsUrlParameters || null,
+      track: audioTrack
+    });
   }
 }
 
@@ -22378,9 +22394,6 @@ class SubtitleTrackController extends BasePlaylistController {
       if (trackId !== -1 && this.trackId === -1) {
         this.setSubtitleTrack(trackId);
       }
-    } else if (this.shouldReloadPlaylist(currentTrack)) {
-      // Retry playlist loading if no playlist is or has been loaded yet
-      this.setSubtitleTrack(this.trackId);
     }
   }
   findTrackId(currentTrack) {
@@ -22486,29 +22499,25 @@ class SubtitleTrackController extends BasePlaylistController {
   }
   loadPlaylist(hlsUrlParameters) {
     super.loadPlaylist();
-    const currentTrack = this.currentTrack;
-    if (this.shouldLoadPlaylist(currentTrack) && currentTrack) {
-      const id = currentTrack.id;
-      const groupId = currentTrack.groupId;
-      let url = currentTrack.url;
-      if (hlsUrlParameters) {
-        try {
-          url = hlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
-        }
-      }
-      const details = currentTrack.details;
-      const age = details == null ? void 0 : details.age;
-      this.log(`Loading subtitle ${id} "${currentTrack.name}" lang:${currentTrack.lang} group:${groupId}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
-      this.hls.trigger(Events.SUBTITLE_TRACK_LOADING, {
-        url,
-        id,
-        groupId,
-        deliveryDirectives: hlsUrlParameters || null,
-        track: currentTrack
-      });
-    }
+    if (this.shouldLoadPlaylist(this.currentTrack)) {
+      this.scheduleLoading(this.currentTrack, hlsUrlParameters);
+    }
+  }
+  loadingPlaylist(currentTrack, hlsUrlParameters) {
+    super.loadingPlaylist(currentTrack, hlsUrlParameters);
+    const id = currentTrack.id;
+    const groupId = currentTrack.groupId;
+    const url = this.getUrlWithDirectives(currentTrack.url, hlsUrlParameters);
+    const details = currentTrack.details;
+    const age = details == null ? void 0 : details.age;
+    this.log(`Loading subtitle ${id} "${currentTrack.name}" lang:${currentTrack.lang} group:${groupId}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
+    this.hls.trigger(Events.SUBTITLE_TRACK_LOADING, {
+      url,
+      id,
+      groupId,
+      deliveryDirectives: hlsUrlParameters || null,
+      track: currentTrack
+    });
   }
 
   /**
@@ -22566,9 +22575,6 @@ class SubtitleTrackController extends BasePlaylistController {
       this.warn(`Invalid subtitle track id: ${newId}`);
       return;
     }
-
-    // stopping live reloading timer if any
-    this.clearTimer();
     this.selectDefaultTrack = false;
     const lastTrack = this.currentTrack;
     const track = tracks[newId] || null;
@@ -30461,9 +30467,7 @@ class LevelController extends BasePlaylistController {
     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 : ''}`);
     const levelSwitchingData = {
@@ -30557,10 +30561,7 @@ class LevelController extends BasePlaylistController {
       return;
     }
     if (data.context.type === PlaylistContextType.LEVEL && data.context.level === this.level) {
-      const retry = this.checkRetry(data);
-      if (!retry) {
-        this.requestScheduled = -1;
-      }
+      this.checkRetry(data);
     }
   }
 
@@ -30615,36 +30616,28 @@ class LevelController extends BasePlaylistController {
   }
   loadPlaylist(hlsUrlParameters) {
     super.loadPlaylist();
-    const currentLevelIndex = this.currentLevelIndex;
-    const currentLevel = this.currentLevel;
-    if (currentLevel && this.shouldLoadPlaylist(currentLevel)) {
-      let url = currentLevel.uri;
-      if (hlsUrlParameters) {
-        try {
-          url = hlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
-        }
-      }
-      const pathwayId = currentLevel.attrs['PATHWAY-ID'];
-      const details = currentLevel.details;
-      const 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,
-        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);
     }
   }
+  loadingPlaylist(currentLevel, hlsUrlParameters) {
+    super.loadingPlaylist(currentLevel, hlsUrlParameters);
+    const url = this.getUrlWithDirectives(currentLevel.uri, hlsUrlParameters);
+    const currentLevelIndex = this.currentLevelIndex;
+    const pathwayId = currentLevel.attrs['PATHWAY-ID'];
+    const details = currentLevel.details;
+    const 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,
+      level: currentLevelIndex,
+      levelInfo: currentLevel,
+      pathwayId: currentLevel.attrs['PATHWAY-ID'],
+      id: 0,
+      // Deprecated Level urlId
+      deliveryDirectives: hlsUrlParameters || null
+    });
+  }
   get nextLoadLevel() {
     if (this.manualLevelIndex !== -1) {
       return this.manualLevelIndex;