hls.js 1.6.0-beta.1.0.canary.10788 → 1.6.0-beta.1.0.canary.10791

package/src/controller/audio-track-controller.ts

@@ -208,9 +208,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);
     }
   }
 
@@ -224,7 +221,6 @@ class AudioTrackController extends BasePlaylistController {
       data.context.id === this.trackId &&
       (!this.groupIds || this.groupIds.indexOf(data.context.groupId) !== -1)
     ) {
-      this.requestScheduled = -1;
       this.checkRetry(data);
     }
   }
@@ -319,9 +315,6 @@ class AudioTrackController extends BasePlaylistController {
       return;
     }
 
-    // stopping live reloading timer if any
-    this.clearTimer();
-
     this.selectDefaultTrack = false;
     const lastTrack = this.currentTrack;
     const track = tracks[newId];
@@ -403,49 +396,42 @@ class AudioTrackController extends BasePlaylistController {
   }
 
   protected loadPlaylist(hlsUrlParameters?: HlsUrlParameters): void {
+    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.hls.loadLevel]?.uri
-    ) {
-      super.loadPlaylist();
-      const id = audioTrack.id;
-      const groupId = audioTrack.groupId as string;
-      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?.age;
-      this.log(
-        `Loading audio-track ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}${
-          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.hls.loadLevel]?.uri) {
+      // Do not load audio rendition with URI matching main variant URI
+      return;
     }
+    this.scheduleLoading(audioTrack, hlsUrlParameters);
+  }
+
+  protected loadingPlaylist(
+    audioTrack: MediaPlaylist,
+    hlsUrlParameters: HlsUrlParameters | undefined,
+  ) {
+    super.loadingPlaylist(audioTrack, hlsUrlParameters);
+    const id = audioTrack.id;
+    const groupId = audioTrack.groupId as string;
+    const url = this.getUrlWithDirectives(audioTrack.url, hlsUrlParameters);
+    const details = audioTrack.details;
+    const age = details?.age;
+    this.log(
+      `Loading audio-track ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}${
+        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,
+    });
   }
 }
 

package/src/controller/base-playlist-controller.ts

@@ -24,35 +24,33 @@ export default class BasePlaylistController
   implements NetworkComponentAPI
 {
   protected hls: Hls;
-  protected timer: number = -1;
-  protected requestScheduled: number = -1;
-  protected canLoad: boolean = false;
+  private timer: number = -1;
+  private canLoad: boolean = false;
 
   constructor(hls: Hls, logPrefix: string) {
     super(logPrefix, hls.logger);
     this.hls = hls;
   }
 
-  public destroy(): void {
+  public destroy() {
     this.clearTimer();
     // @ts-ignore
     this.hls = this.log = this.warn = null;
   }
 
-  protected clearTimer(): void {
+  private clearTimer() {
     if (this.timer !== -1) {
       self.clearTimeout(this.timer);
       this.timer = -1;
     }
   }
 
-  public startLoad(): void {
+  public startLoad() {
     this.canLoad = true;
-    this.requestScheduled = -1;
     this.loadPlaylist();
   }
 
-  public stopLoad(): void {
+  public stopLoad() {
     this.canLoad = false;
     this.clearTimer();
   }
@@ -104,16 +102,22 @@ export default class BasePlaylistController
     }
   }
 
-  protected loadPlaylist(hlsUrlParameters?: HlsUrlParameters): void {
-    if (this.requestScheduled === -1) {
-      this.requestScheduled = self.performance.now();
-    }
+  protected loadPlaylist(hlsUrlParameters?: HlsUrlParameters) {
+    // Loading is handled by the subclasses
+    this.clearTimer();
+  }
+
+  protected loadingPlaylist(
+    playlist: Level | MediaPlaylist,
+    hlsUrlParameters?: HlsUrlParameters,
+  ) {
     // Loading is handled by the subclasses
+    this.clearTimer();
   }
 
   protected shouldLoadPlaylist(
     playlist: Level | MediaPlaylist | null | undefined,
-  ): boolean {
+  ): playlist is Level | MediaPlaylist {
     return (
       this.canLoad &&
       !!playlist &&
@@ -122,14 +126,20 @@ export default class BasePlaylistController
     );
   }
 
-  protected shouldReloadPlaylist(
-    playlist: Level | MediaPlaylist | null | undefined,
-  ): boolean {
-    return (
-      this.timer === -1 &&
-      this.requestScheduled === -1 &&
-      this.shouldLoadPlaylist(playlist)
-    );
+  protected getUrlWithDirectives(
+    uri: string,
+    hlsUrlParameters: HlsUrlParameters | undefined,
+  ): string {
+    if (hlsUrlParameters) {
+      try {
+        return hlsUrlParameters.addDirectives(uri);
+      } catch (error) {
+        this.warn(
+          `Could not construct new URL with HLS Delivery Directives: ${error}`,
+        );
+      }
+    }
+    return uri;
   }
 
   protected playlistLoaded(
@@ -158,18 +168,17 @@ export default class BasePlaylistController
 
     // if current playlist is a live playlist, arm a timer to reload it
     if (details.live || 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);
@@ -250,7 +259,7 @@ export default class BasePlaylistController
           part,
         );
         if (lowLatencyMode || !lastPart) {
-          this.loadPlaylist(deliveryDirectives);
+          this.loadingPlaylist(levelOrTrack, deliveryDirectives);
           return;
         }
       } else if (details.canBlockReload || details.canSkipUntil) {
@@ -261,6 +270,12 @@ export default class BasePlaylistController
           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;
@@ -268,55 +283,61 @@ export default class BasePlaylistController
         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;
+      if (details.requestScheduled + reloadInterval < now) {
+        details.requestScheduled = now;
+      } else {
+        details.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,
-      );
+      this.scheduleLoading(levelOrTrack, deliveryDirectives);
     } else {
       this.clearTimer();
     }
   }
 
+  protected scheduleLoading(
+    levelOrTrack: Level | MediaPlaylist,
+    deliveryDirectives?: HlsUrlParameters,
+  ) {
+    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,
+    );
+  }
+
   private getDeliveryDirectives(
     details: LevelDetails,
     previousDeliveryDirectives: HlsUrlParameters | null,
@@ -344,7 +365,6 @@ export default class BasePlaylistController
         (!errorAction.resolved &&
           action === NetworkErrorAction.SendAlternateToPenaltyBox));
     if (retry) {
-      this.requestScheduled = -1;
       if (retryCount >= retryConfig.maxNumRetry) {
         return false;
       }

package/src/controller/base-stream-controller.ts

@@ -1663,7 +1663,7 @@ export default class BaseStreamController
     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?.hasEnoughToStart && media) {
       pos = media.currentTime;
     } else if (this.nextLoadPosition >= 0) {
       pos = this.nextLoadPosition;

package/src/controller/level-controller.ts

@@ -442,9 +442,7 @@ export default class LevelController extends BasePlaylistController {
       lastLevel &&
       lastPathwayId === pathwayId
     ) {
-      if (level.details || this.requestScheduled !== -1) {
-        return;
-      }
+      return;
     }
 
     this.log(
@@ -572,10 +570,7 @@ export default class LevelController extends BasePlaylistController {
       data.context.type === PlaylistContextType.LEVEL &&
       data.context.level === this.level
     ) {
-      const retry = this.checkRetry(data);
-      if (!retry) {
-        this.requestScheduled = -1;
-      }
+      this.checkRetry(data);
     }
   }
 
@@ -632,47 +627,37 @@ export default class LevelController extends BasePlaylistController {
 
   protected loadPlaylist(hlsUrlParameters?: 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}`,
-          );
-        }
-      }
+    if (this.shouldLoadPlaylist(this.currentLevel)) {
+      this.scheduleLoading(this.currentLevel, hlsUrlParameters);
+    }
+  }
 
-      const pathwayId = currentLevel.attrs['PATHWAY-ID'];
-      const details = currentLevel.details;
-      const age = details?.age;
-      this.log(
-        `Loading level index ${currentLevelIndex}${
-          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}`,
-      );
+  protected loadingPlaylist(
+    currentLevel: Level,
+    hlsUrlParameters: HlsUrlParameters | undefined,
+  ) {
+    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?.age;
+    this.log(
+      `Loading level index ${currentLevelIndex}${
+        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,
-      });
-    }
+    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() {

package/src/controller/subtitle-track-controller.ts

@@ -292,9 +292,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);
     }
   }
 
@@ -433,42 +430,37 @@ class SubtitleTrackController extends BasePlaylistController {
 
   protected loadPlaylist(hlsUrlParameters?: HlsUrlParameters): void {
     super.loadPlaylist();
-    const currentTrack = this.currentTrack;
-    if (this.shouldLoadPlaylist(currentTrack) && currentTrack) {
-      const id = currentTrack.id;
-      const groupId = currentTrack.groupId as string;
-      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?.age;
-      this.log(
-        `Loading subtitle ${id} "${currentTrack.name}" lang:${currentTrack.lang} group:${groupId}${
-          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);
     }
   }
 
+  protected loadingPlaylist(
+    currentTrack: MediaPlaylist,
+    hlsUrlParameters: HlsUrlParameters | undefined,
+  ) {
+    super.loadingPlaylist(currentTrack, hlsUrlParameters);
+    const id = currentTrack.id;
+    const groupId = currentTrack.groupId as string;
+    const url = this.getUrlWithDirectives(currentTrack.url, hlsUrlParameters);
+    const details = currentTrack.details;
+    const age = details?.age;
+    this.log(
+      `Loading subtitle ${id} "${currentTrack.name}" lang:${currentTrack.lang} group:${groupId}${
+        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,
+    });
+  }
+
   /**
    * Disables the old subtitleTrack and sets current mode on the next subtitleTrack.
    * This operates on the DOM textTracks.
@@ -528,9 +520,6 @@ class SubtitleTrackController extends BasePlaylistController {
       return;
     }
 
-    // stopping live reloading timer if any
-    this.clearTimer();
-
     this.selectDefaultTrack = false;
     const lastTrack = this.currentTrack;
     const track: MediaPlaylist | null = tracks[newId] || null;

package/src/loader/level-details.ts

@@ -20,6 +20,7 @@ export class LevelDetails {
   public dateRanges: Record<string, DateRange>;
   public dateRangeTagCount: number = 0;
   public live: boolean = true;
+  public requestScheduled: number = -1;
   public ageHeader: number = 0;
   public advancedDateTime?: number;
   public updated: boolean = true;

package/src/utils/level-helper.ts

@@ -315,6 +315,9 @@ export function mergeDetails(
     newDetails.driftEnd = oldDetails.driftEnd;
     newDetails.advancedDateTime = oldDetails.advancedDateTime;
   }
+  if (newDetails.requestScheduled === -1) {
+    newDetails.requestScheduled = oldDetails.requestScheduled;
+  }
 }
 
 function mergeDateRanges(