Maintain startup event order using autoStartLoad for expected level a…

…nd audioTrack getter results on MANIFEST_LOADING Resolves #6891
video-dev · Dec 6, 2024 · 93dfd4f · 93dfd4f
1 parent 0af1391
commit 93dfd4f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/api-extractor/report/hls.js.api.md b/api-extractor/report/hls.js.api.md
@@ -3646,6 +3646,8 @@ export interface ManifestLoadedData {
     // (undocumented)
     contentSteering: ContentSteeringOptions | null;
     // (undocumented)
+    isMediaPlaylist?: boolean;
+    // (undocumented)
     levels: LevelParsed[];
     // (undocumented)
     networkDetails: any;

diff --git a/src/hls.ts b/src/hls.ts
@@ -300,6 +300,12 @@ export default class Hls implements HlsEventEmitter {
     if (typeof onErrorOut === 'function') {
       this.on(Events.ERROR, onErrorOut, errorController);
     }
+    // Autostart load handler
+    this.on(
+      Events.MANIFEST_LOADED,
+      playListLoader.onManifestLoaded,
+      playListLoader,
+    );
   }
 
   createController(ControllerClass, components) {

diff --git a/src/loader/playlist-loader.ts b/src/loader/playlist-loader.ts
@@ -19,6 +19,7 @@ import type {
   ErrorData,
   LevelLoadingData,
   LevelsUpdatedData,
+  ManifestLoadedData,
   ManifestLoadingData,
   TrackLoadingData,
 } from '../types/events';
@@ -495,8 +496,12 @@ class PlaylistLoader implements NetworkComponentAPI {
       startTimeOffset,
       variableList,
     });
+  }
 
-    this.checkAutostartLoad();
+  onManifestLoaded(event: Events.MANIFEST_LOADED, data: ManifestLoadedData) {
+    if (!data.isMediaPlaylist) {
+      this.checkAutostartLoad();
+    }
   }
 
   private handleTrackOrLevelPlaylist(
@@ -549,6 +554,7 @@ class PlaylistLoader implements NetworkComponentAPI {
         contentSteering: null,
         startTimeOffset: null,
         variableList: null,
+        isMediaPlaylist: true,
       });
     }
 

diff --git a/src/types/events.ts b/src/types/events.ts
@@ -7,8 +7,6 @@ import type {
   SourceBufferName,
   SourceBufferTrackSet,
 } from './buffer';
-import type { ChunkMetadata } from './transmuxer';
-import type { ErrorDetails, ErrorTypes } from '../errors';
 import type { MetadataSample, UserdataSample } from './demuxer';
 import type {
   HdcpLevel,
@@ -27,13 +25,15 @@ import type {
   PlaylistLoaderContext,
 } from './loader';
 import type { MediaPlaylist, MediaPlaylistType } from './media-playlist';
+import type { ChunkMetadata } from './transmuxer';
 import type { SteeringManifest } from '../controller/content-steering-controller';
 import type { IErrorAction } from '../controller/error-controller';
 import type { HlsAssetPlayer } from '../controller/interstitial-player';
 import type {
   InterstitialScheduleDurations,
   InterstitialScheduleItem,
 } from '../controller/interstitials-schedule';
+import type { ErrorDetails, ErrorTypes } from '../errors';
 import type { HlsListeners } from '../events';
 import type { Fragment, MediaFragment, Part } from '../loader/fragment';
 import type {
@@ -138,6 +138,7 @@ export interface ManifestLoadedData {
   subtitles?: MediaPlaylist[];
   url: string;
   variableList: VariableMap | null;
+  isMediaPlaylist?: boolean;
 }
 
 export interface ManifestParsedData {