Handle ManagedMediaSource endStreaming events without aborting requests

Fixes #6918

(cherry picked from #6186 commit 6de6587)

api-extractor/report/hls.js.api.md

@@ -327,6 +327,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected bufferFragmentData(data: RemuxedTrack, frag: Fragment, part: Part | null, chunkMeta: ChunkMetadata, noBacktracking?: boolean): void;
     // (undocumented)
+    protected buffering: boolean;
+    // (undocumented)
     protected checkLiveUpdate(details: LevelDetails): void;
     // (undocumented)
     protected clearTrackerIfNeeded(frag: Fragment): void;
@@ -453,6 +455,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected onvseeking: EventListener | null;
     // (undocumented)
+    pauseBuffering(): void;
+    // (undocumented)
     protected playlistType: PlaylistLevelType;
     // (undocumented)
     protected recoverWorkerError(data: ErrorData): void;
@@ -475,6 +479,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // (undocumented)
     protected resetWhenMissingContext(chunkMeta: ChunkMetadata): void;
     // (undocumented)
+    resumeBuffering(): void;
+    // (undocumented)
     protected retryDate: number;
     // (undocumented)
     protected seekToStartPos(): void;
@@ -2917,6 +2923,10 @@ export type MP4RemuxerConfig = {
 //
 // @public (undocumented)
 export interface NetworkComponentAPI extends ComponentAPI {
+    // (undocumented)
+    pauseBuffering?(): void;
+    // (undocumented)
+    resumeBuffering?(): void;
     // (undocumented)
     startLoad(startPosition: number): void;
     // (undocumented)

src/controller/audio-stream-controller.ts

@@ -281,12 +281,14 @@ class AudioStreamController
     const { hls, levels, media, trackId } = this;
     const config = hls.config;
 
-    // 1. if video not attached AND
+    // 1. if buffering is suspended
+    // 2. if video not attached AND
     //    start fragment already requested OR start frag prefetch not enabled
-    // 2. if tracks or track not loaded and selected
+    // 3. if tracks or track not loaded and selected
     // then exit loop
     // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
     if (
+      !this.buffering ||
       (!media && (this.startFragRequested || !config.startFragPrefetch)) ||
       !levels?.[trackId]
     ) {

src/controller/base-stream-controller.ts

@@ -97,6 +97,7 @@ export default class BaseStreamController
   protected startFragRequested: boolean = false;
   protected decrypter: Decrypter;
   protected initPTS: RationalTimestamp[] = [];
+  protected buffering: boolean = true;
   protected onvseeking: EventListener | null = null;
   protected onvended: EventListener | null = null;
 
@@ -150,6 +151,14 @@ export default class BaseStreamController
     this.state = State.STOPPED;
   }
 
+  public pauseBuffering() {
+    this.buffering = false;
+  }
+
+  public resumeBuffering() {
+    this.buffering = true;
+  }
+
   protected _streamEnded(
     bufferInfo: BufferInfo,
     levelDetails: LevelDetails,

src/controller/buffer-controller.ts

@@ -309,6 +309,7 @@ export default class BufferController implements ComponentAPI {
       this.resetBuffer(type);
     });
     this._initSourceBuffer();
+    this.hls.resumeBuffering();
   }
 
   private resetBuffer(type: SourceBufferName) {

src/controller/stream-controller.ts

@@ -237,7 +237,7 @@ export default class StreamController
       return;
     }
 
-    const level = hls.nextLoadLevel;
+    const level = this.buffering ? hls.nextLoadLevel : hls.loadLevel;
     if (!levels?.[level]) {
       return;
     }
@@ -262,6 +262,9 @@ export default class StreamController
       this.state = State.ENDED;
       return;
     }
+    if (!this.buffering) {
+      return;
+    }
 
     // set next load level : this will trigger a playlist load if needed
     if (hls.loadLevel !== level && hls.manualLevel === -1) {

src/hls.ts

@@ -430,9 +430,13 @@ export default class Hls implements HlsEventEmitter {
   startLoad(startPosition: number = -1) {
     logger.log(`startLoad(${startPosition})`);
     this.started = true;
-    this.networkControllers.forEach((controller) => {
-      controller.startLoad(startPosition);
-    });
+    this.resumeBuffering();
+    for (let i = 0; i < this.networkControllers.length; i++) {
+      this.networkControllers[i].startLoad(startPosition);
+      if (!this.started || !this.networkControllers) {
+        break;
+      }
+    }
   }
 
   /**
@@ -441,32 +445,35 @@ export default class Hls implements HlsEventEmitter {
   stopLoad() {
     logger.log('stopLoad');
     this.started = false;
-    this.networkControllers.forEach((controller) => {
-      controller.stopLoad();
-    });
+    for (let i = 0; i < this.networkControllers.length; i++) {
+      this.networkControllers[i].stopLoad();
+      if (this.started || !this.networkControllers) {
+        break;
+      }
+    }
   }
 
   /**
-   * Resumes stream controller segment loading if previously started.
+   * Resumes stream controller segment loading after `pauseBuffering` has been called.
    */
   resumeBuffering() {
-    if (this.started) {
-      this.networkControllers.forEach((controller) => {
-        if ('fragmentLoader' in controller) {
-          controller.startLoad(-1);
-        }
-      });
-    }
+    logger.log(`resume buffering`);
+    this.networkControllers.forEach((controller) => {
+      if (controller.resumeBuffering) {
+        controller.resumeBuffering();
+      }
+    });
   }
 
   /**
-   * Stops stream controller segment loading without changing 'started' state like stopLoad().
+   * Prevents stream controller from loading new segments until `resumeBuffering` is called.
    * This allows for media buffering to be paused without interupting playlist loading.
    */
   pauseBuffering() {
+    logger.log(`pause buffering`);
     this.networkControllers.forEach((controller) => {
-      if ('fragmentLoader' in controller) {
-        controller.stopLoad();
+      if (controller.pauseBuffering) {
+        controller.pauseBuffering();
       }
     });
   }

src/types/component-api.ts

@@ -15,4 +15,6 @@ export interface AbrComponentAPI extends ComponentAPI {
 export interface NetworkComponentAPI extends ComponentAPI {
   startLoad(startPosition: number): void;
   stopLoad(): void;
+  pauseBuffering?(): void;
+  resumeBuffering?(): void;
 }