hls.js 1.6.0-beta.2.0.canary.10924 → 1.6.0-beta.2.0.canary.10926

package/src/controller/abr-controller.ts

@@ -672,8 +672,8 @@ class AbrController extends Logger implements AbrComponentAPI {
     }
     // If no matching level found, see if min auto level would be a better option
     const minLevel = hls.levels[minAutoLevel];
-    const autoLevel = hls.levels[hls.loadLevel];
-    if (minLevel?.bitrate < autoLevel?.bitrate) {
+    const autoLevel = hls.loadLevelObj;
+    if (autoLevel && minLevel?.bitrate < autoLevel.bitrate) {
       return minAutoLevel;
     }
     // or if bitrate is not lower, continue to use loadLevel

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

@@ -79,6 +79,11 @@ export const State = {
   WAITING_LEVEL: 'WAITING_LEVEL',
 };
 
+export type InFlightData = {
+  frag: Fragment | null;
+  state: (typeof State)[keyof typeof State];
+};
+
 export default class BaseStreamController
   extends TaskLoop
   implements NetworkComponentAPI
@@ -89,7 +94,7 @@ export default class BaseStreamController
   protected fragCurrent: Fragment | null = null;
   protected fragmentTracker: FragmentTracker;
   protected transmuxer: TransmuxerInterface | null = null;
-  protected _state: string = State.STOPPED;
+  protected _state: (typeof State)[keyof typeof State] = State.STOPPED;
   protected playlistType: PlaylistLevelType;
   protected media: HTMLMediaElement | null = null;
   protected mediaBuffer: Bufferable | null = null;
@@ -194,6 +199,10 @@ export default class BaseStreamController
     this.buffering = true;
   }
 
+  public get inFlightFrag(): InFlightData {
+    return { frag: this.fragCurrent, state: this.state };
+  }
+
   protected _streamEnded(
     bufferInfo: BufferInfo,
     levelDetails: LevelDetails,
@@ -395,13 +404,8 @@ export default class BaseStreamController
     // reset startPosition and lastCurrentTime to restart playback @ stream beginning
     this.log(`setting startPosition to 0 because media ended`);
     this.startPosition = this.lastCurrentTime = 0;
-    this.triggerEnded();
   };
 
-  protected triggerEnded() {
-    /* overridden in stream-controller */
-  }
-
   protected onManifestLoaded(
     event: Events.MANIFEST_LOADED,
     data: ManifestLoadedData,
@@ -1211,11 +1215,11 @@ export default class BaseStreamController
         bufferedFragAtPos &&
         (bufferInfo.nextStart <= bufferedFragAtPos.end || bufferedFragAtPos.gap)
       ) {
-        return BufferHelper.bufferInfo(
-          bufferable,
-          pos,
-          Math.max(bufferInfo.nextStart, maxBufferHole),
+        const gapDuration = Math.max(
+          Math.min(bufferInfo.nextStart, bufferedFragAtPos.end) - pos,
+          maxBufferHole,
         );
+        return BufferHelper.bufferInfo(bufferable, pos, gapDuration);
       }
     }
     return bufferInfo;
@@ -2023,7 +2027,7 @@ export default class BaseStreamController
     }
   }
 
-  set state(nextState) {
+  set state(nextState: (typeof State)[keyof typeof State]) {
     const previousState = this._state;
     if (previousState !== nextState) {
       this._state = nextState;
@@ -2031,7 +2035,7 @@ export default class BaseStreamController
     }
   }
 
-  get state() {
+  get state(): (typeof State)[keyof typeof State] {
     return this._state;
   }
 }

package/src/controller/buffer-controller.ts

@@ -82,10 +82,10 @@ export default class BufferController extends Logger implements ComponentAPI {
   private bufferCodecEventsTotal: number = 0;
 
   // A reference to the attached media element
-  public media: HTMLMediaElement | null = null;
+  private media: HTMLMediaElement | null = null;
 
   // A reference to the active media source
-  public mediaSource: MediaSource | null = null;
+  private mediaSource: MediaSource | null = null;
 
   // Last MP3 audio chunk appended
   private lastMpegAudioChunk: ChunkMetadata | null = null;
@@ -152,7 +152,7 @@ export default class BufferController extends Logger implements ComponentAPI {
     this._onStartStreaming = this._onEndStreaming = null;
   }
 
-  protected registerListeners() {
+  private registerListeners() {
     const { hls } = this;
     hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
     hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
@@ -169,7 +169,7 @@ export default class BufferController extends Logger implements ComponentAPI {
     hls.on(Events.ERROR, this.onError, this);
   }
 
-  protected unregisterListeners() {
+  private unregisterListeners() {
     const { hls } = this;
     hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
     hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
@@ -247,7 +247,7 @@ export default class BufferController extends Logger implements ComponentAPI {
     this.details = null;
   }
 
-  protected onManifestParsed(
+  private onManifestParsed(
     event: Events.MANIFEST_PARSED,
     data: ManifestParsedData,
   ) {
@@ -270,7 +270,7 @@ export default class BufferController extends Logger implements ComponentAPI {
     }
   }
 
-  protected onMediaAttaching(
+  private onMediaAttaching(
     event: Events.MEDIA_ATTACHING,
     data: MediaAttachingData,
   ) {
@@ -440,6 +440,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     }
     this.hls.pauseBuffering();
   };
+
   private _onStartStreaming = (event) => {
     if (!this.hls) {
       return;
@@ -447,7 +448,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     this.hls.resumeBuffering();
   };
 
-  protected onMediaDetaching(
+  private onMediaDetaching(
     event: Events.MEDIA_DETACHING,
     data: MediaDetachingData,
   ) {
@@ -540,7 +541,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     this.hls.trigger(Events.MEDIA_DETACHED, data);
   }
 
-  protected onBufferReset() {
+  private onBufferReset() {
     this.sourceBuffers.forEach(([type]) => {
       if (type) {
         this.resetBuffer(type);
@@ -580,10 +581,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     this.operationQueue = new BufferOperationQueue(this.tracks);
   }
 
-  protected onBufferCodecs(
-    event: Events.BUFFER_CODECS,
-    data: BufferCodecsData,
-  ) {
+  private onBufferCodecs(event: Events.BUFFER_CODECS, data: BufferCodecsData) {
     const tracks = this.tracks;
     const trackNames = Object.keys(data);
     this.log(
@@ -614,7 +612,6 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
       const sbTrack = transferredTrack?.buffer ? transferredTrack : track;
       const sbCodec = sbTrack?.pendingCodec || sbTrack?.codec;
       const trackLevelCodec = sbTrack?.levelCodec;
-      const forceChangeType = !sbTrack || !!this.hls.config.assetPlayerId;
       if (!track) {
         track = tracks[trackName] = {
           buffer: undefined,
@@ -637,7 +634,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
       );
       let trackCodec = pickMostCompleteCodecName(codec, levelCodec);
       const nextCodec = trackCodec?.replace(VIDEO_CODEC_PROFILE_REPLACE, '$1');
-      if (trackCodec && (currentCodec !== nextCodec || forceChangeType)) {
+      if (trackCodec && currentCodecFull && currentCodec !== nextCodec) {
         if (trackName.slice(0, 5) === 'audio') {
           trackCodec = getCodecCompatibleName(trackCodec, this.appendSource);
         }
@@ -676,7 +673,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     }, {});
   }
 
-  protected appendChangeType(
+  private appendChangeType(
     type: SourceBufferName,
     container: string,
     codec: string,
@@ -748,7 +745,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     }
   }
 
-  protected onBufferAppending(
+  private onBufferAppending(
     event: Events.BUFFER_APPENDING,
     eventData: BufferAppendingData,
   ) {
@@ -956,7 +953,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     };
   }
 
-  protected onBufferFlushing(
+  private onBufferFlushing(
     event: Events.BUFFER_FLUSHING,
     data: BufferFlushingData,
   ) {
@@ -972,7 +969,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     }
   }
 
-  protected onFragParsed(event: Events.FRAG_PARSED, data: FragParsedData) {
+  private onFragParsed(event: Events.FRAG_PARSED, data: FragParsedData) {
     const { frag, part } = data;
     const buffersAppendedTo: SourceBufferName[] = [];
     const elementaryStreams = part
@@ -1017,7 +1014,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     this.trimBuffers();
   }
 
-  get bufferedToEnd(): boolean {
+  public get bufferedToEnd(): boolean {
     return (
       this.sourceBufferCount > 0 &&
       !this.sourceBuffers.some(
@@ -1029,7 +1026,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
 
   // on BUFFER_EOS mark matching sourcebuffer(s) as "ending" and "ended" and queue endOfStream after remaining operations(s)
   // an undefined data.type will mark all buffers as EOS.
-  protected onBufferEos(event: Events.BUFFER_EOS, data: BufferEOSData) {
+  private onBufferEos(event: Events.BUFFER_EOS, data: BufferEOSData) {
     this.sourceBuffers.forEach(([type]) => {
       if (type) {
         const track = this.tracks[type] as SourceBufferTrack;
@@ -1078,7 +1075,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     }
   }
 
-  protected onLevelUpdated(
+  private onLevelUpdated(
     event: Events.LEVEL_UPDATED,
     { details }: LevelUpdatedData,
   ) {
@@ -1321,7 +1318,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
     );
   }
 
-  protected checkPendingTracks() {
+  private checkPendingTracks() {
     const { bufferCodecEventsTotal, pendingTrackCount, tracks } = this;
     this.log(
       `checkPendingTracks (pending: ${pendingTrackCount} codec events expected: ${bufferCodecEventsTotal}) ${JSON.stringify(tracks)}`,

package/src/controller/error-controller.ts

@@ -176,7 +176,7 @@ export default class ErrorController
       case ErrorDetails.SUBTITLE_LOAD_ERROR:
       case ErrorDetails.SUBTITLE_TRACK_LOAD_TIMEOUT:
         if (context) {
-          const level = hls.levels[hls.loadLevel];
+          const level = hls.loadLevelObj;
           if (
             level &&
             ((context.type === PlaylistContextType.AUDIO_TRACK &&
@@ -200,7 +200,7 @@ export default class ErrorController
         return;
       case ErrorDetails.KEY_SYSTEM_STATUS_OUTPUT_RESTRICTED:
         {
-          const level = hls.levels[hls.loadLevel];
+          const level = hls.loadLevelObj;
           const restrictedHdcpLevel = level?.attrs['HDCP-LEVEL'];
           if (restrictedHdcpLevel) {
             data.errorAction = {

package/src/controller/fragment-tracker.ts

@@ -321,7 +321,7 @@ export class FragmentTracker implements ComponentAPI {
   /**
    * Gets the partial fragment for a certain time
    */
-  public getPartialFragment(time: number): Fragment | null {
+  public getPartialFragment(time: number): MediaFragment | null {
     let bestFragment: Fragment | null = null;
     let timePadding: number;
     let startTime: number;