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

package/src/controller/gap-controller.ts

@@ -12,7 +12,7 @@ import type { InFlightData } from './base-stream-controller';
 import type { InFlightFragments } from '../hls';
 import type Hls from '../hls';
 import type { FragmentTracker } from './fragment-tracker';
-import type { Fragment } from '../loader/fragment';
+import type { Fragment, MediaFragment } from '../loader/fragment';
 import type { SourceBufferName } from '../types/buffer';
 import type {
   BufferAppendedData,
@@ -503,7 +503,7 @@ export default class GapController extends TaskLoop {
    * @param partial - The partial fragment found at the current time (where playback is stalling).
    * @private
    */
-  private _trySkipBufferHole(partial: Fragment | null): number {
+  private _trySkipBufferHole(partial: MediaFragment | null): number {
     const { fragmentTracker, media } = this;
     const config = this.hls?.config;
     if (!media || !fragmentTracker || !config) {
@@ -515,7 +515,7 @@ export default class GapController extends TaskLoop {
     const bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
     const startTime =
       currentTime < bufferInfo.start ? bufferInfo.start : bufferInfo.nextStart;
-    if (startTime) {
+    if (startTime && this.hls) {
       const bufferStarved = bufferInfo.len <= config.maxBufferHole;
       const waiting =
         bufferInfo.len > 0 && bufferInfo.len < 1 && media.readyState < 3;
@@ -541,6 +541,19 @@ export default class GapController extends TaskLoop {
                 PlaylistLevelType.MAIN,
               );
             if (startProvisioned) {
+              // Do not seek when selected variant playlist is unloaded
+              if (!this.hls.loadLevelObj?.details) {
+                return 0;
+              }
+              // Do not seek when required fragments are inflight or appending
+              const inFlightDependency = getInFlightDependency(
+                this.hls.inFlightFragments,
+                startTime,
+              );
+              if (inFlightDependency) {
+                return 0;
+              }
+              // Do not seek if we can't walk tracked fragments to end of gap
               let moreToLoad = false;
               let pos = startProvisioned.end;
               while (pos < startTime) {
@@ -567,7 +580,7 @@ export default class GapController extends TaskLoop {
         );
         this.moved = true;
         media.currentTime = targetTime;
-        if (!partial?.gap && this.hls) {
+        if (!partial?.gap) {
           const error = new Error(
             `fragment loaded with buffer holes, seeking from ${currentTime} to ${targetTime}`,
           );

package/src/controller/interstitials-controller.ts

@@ -1921,7 +1921,7 @@ Schedule: ${scheduleItems.map((seg) => segmentToString(seg))}`,
     const userConfig = primary.userConfig;
     let videoPreference = userConfig.videoPreference;
     const currentLevel =
-      primary.levels[primary.loadLevel] || primary.levels[primary.currentLevel];
+      primary.loadLevelObj || primary.levels[primary.currentLevel];
     if (videoPreference || currentLevel) {
       videoPreference = Object.assign({}, videoPreference);
       if (currentLevel.videoCodec) {

package/src/controller/level-controller.ts

@@ -389,6 +389,10 @@ export default class LevelController extends BasePlaylistController {
     return this._levels;
   }
 
+  get loadLevelObj(): Level | null {
+    return this.currentLevel;
+  }
+
   get level(): number {
     return this.currentLevelIndex;
   }

package/src/controller/stream-controller.ts

@@ -237,7 +237,7 @@ export default class StreamController
 
   protected onTickEnd() {
     super.onTickEnd();
-    if (this.media?.readyState) {
+    if (this.media?.readyState && this.media.seeking === false) {
       this.lastCurrentTime = this.media.currentTime;
     }
     this.checkFragmentChanged();

package/src/hls.ts

@@ -690,10 +690,20 @@ export default class Hls implements HlsEventEmitter {
     return levels ? levels : [];
   }
 
+  /**
+   * @returns LevelDetails of last loaded level (variant) or `null` prior to loading a media playlist.
+   */
   get latestLevelDetails(): LevelDetails | null {
     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.
+   */
+  get loadLevelObj(): Level | null {
+    return this.levelController.loadLevelObj;
+  }
+
   /**
    * Index of quality level (variant) currently played
    */

package/src/utils/rendition-helper.ts

@@ -502,5 +502,5 @@ export function useAlternateAudio(
   audioTrackUrl: string | undefined,
   hls: Hls,
 ): boolean {
-  return !!audioTrackUrl && audioTrackUrl !== hls.levels[hls.loadLevel]?.uri;
+  return !!audioTrackUrl && audioTrackUrl !== hls.loadLevelObj?.uri;
 }