hls.js 1.6.0-beta.1.0.canary.10764 → 1.6.0-beta.1.0.canary.10766

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.87.0"
   },
-  "version": "1.6.0-beta.1.0.canary.10764"
+  "version": "1.6.0-beta.1.0.canary.10766"
 }

package/src/controller/abr-controller.ts

@@ -795,14 +795,15 @@ class AbrController extends Logger implements AbrComponentAPI {
           | undefined;
         if (
           typeof mediaCapabilities?.decodingInfo === 'function' &&
-          requiresMediaCapabilitiesDecodingInfo(
+          (requiresMediaCapabilitiesDecodingInfo(
             levelInfo,
             audioTracksByGroup,
             currentVideoRange,
             currentFrameRate,
             currentBw,
             audioPreference,
-          )
+          ) ||
+            levelInfo.videoCodec?.substring(0, 4) === 'hvc1') // Force media capabilities check for HEVC to avoid failure on Windows
         ) {
           levelInfo.supportedPromise = getMediaDecodingInfoPromise(
             levelInfo,
@@ -831,6 +832,9 @@ class AbrController extends Logger implements AbrComponentAPI {
               if (index > -1 && levels.length > 1) {
                 this.log(`Removing unsupported level ${index}`);
                 this.hls.removeLevel(index);
+                if (this.hls.loadLevel === -1) {
+                  this.hls.nextLoadLevel = 0;
+                }
               }
             }
           });

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

@@ -5,7 +5,7 @@ import ChunkCache from '../demux/chunk-cache';
 import TransmuxerInterface from '../demux/transmuxer-interface';
 import { ErrorDetails } from '../errors';
 import { Events } from '../events';
-import { ElementaryStreamTypes } from '../loader/fragment';
+import { ElementaryStreamTypes, isMediaFragment } from '../loader/fragment';
 import { Level } from '../types/level';
 import { PlaylistContextType, PlaylistLevelType } from '../types/loader';
 import { ChunkMetadata } from '../types/transmuxer';
@@ -409,8 +409,8 @@ class AudioStreamController
     if (
       this.startFragRequested &&
       mainFragLoading &&
-      mainFragLoading.sn !== 'initSegment' &&
-      frag.sn !== 'initSegment' &&
+      isMediaFragment(mainFragLoading) &&
+      isMediaFragment(frag) &&
       !frag.endList &&
       (!trackDetails.live ||
         (!this.loadingParts && targetBufferTime < this.hls.liveSyncPosition!))
@@ -694,7 +694,7 @@ class AudioStreamController
   private onFragLoading(event: Events.FRAG_LOADING, data: FragLoadingData) {
     if (
       data.frag.type === PlaylistLevelType.MAIN &&
-      data.frag.sn !== 'initSegment'
+      isMediaFragment(data.frag)
     ) {
       this.mainFragLoading = data;
       if (this.state === State.IDLE) {
@@ -722,8 +722,8 @@ class AudioStreamController
       );
       return;
     }
-    if (frag.sn !== 'initSegment') {
-      this.fragPrevious = frag as MediaFragment;
+    if (isMediaFragment(frag)) {
+      this.fragPrevious = frag;
       const track = this.switchingTrack;
       if (track) {
         this.bufferedTrack = track;
@@ -962,7 +962,7 @@ class AudioStreamController
       fragState === FragmentState.NOT_LOADED ||
       fragState === FragmentState.PARTIAL
     ) {
-      if (frag.sn === 'initSegment') {
+      if (!isMediaFragment(frag)) {
         this._loadInitSegment(frag, track);
       } else if (track.details?.live && !this.initPTS[frag.cc]) {
         this.log(

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

@@ -434,6 +434,7 @@ class AudioTrackController extends BasePlaylistController {
         id,
         groupId,
         deliveryDirectives: hlsUrlParameters || null,
+        track: audioTrack,
       });
     }
   }

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

@@ -1,4 +1,4 @@
-import { NetworkErrorAction } from './error-controller';
+import { ErrorActionFlags, NetworkErrorAction } from './error-controller';
 import {
   findFragmentByPDT,
   findFragmentByPTS,
@@ -8,6 +8,12 @@ import { FragmentState } from './fragment-tracker';
 import Decrypter from '../crypt/decrypter';
 import { ErrorDetails, ErrorTypes } from '../errors';
 import { Events } from '../events';
+import {
+  type Fragment,
+  isMediaFragment,
+  type MediaFragment,
+  type Part,
+} from '../loader/fragment';
 import FragmentLoader from '../loader/fragment-loader';
 import TaskLoop from '../task-loop';
 import { PlaylistLevelType } from '../types/loader';
@@ -31,7 +37,6 @@ import type { FragmentTracker } from './fragment-tracker';
 import type { HlsConfig } from '../config';
 import type TransmuxerInterface from '../demux/transmuxer-interface';
 import type Hls from '../hls';
-import type { Fragment, MediaFragment, Part } from '../loader/fragment';
 import type {
   FragmentLoadProgressCallback,
   LoadError,
@@ -714,7 +719,7 @@ export default class BaseStreamController
           : '(detached)'
       })`,
     );
-    if (frag.sn !== 'initSegment') {
+    if (isMediaFragment(frag)) {
       if (frag.type !== PlaylistLevelType.SUBTITLE) {
         const el = frag.elementaryStreams;
         if (!Object.keys(el).some((type) => !!el[type])) {
@@ -803,7 +808,7 @@ export default class BaseStreamController
 
     const fragPrevious = this.fragPrevious;
     if (
-      frag.sn !== 'initSegment' &&
+      isMediaFragment(frag) &&
       (!fragPrevious || frag.sn !== fragPrevious.sn)
     ) {
       const shouldLoadParts = this.shouldLoadParts(level.details, frag.end);
@@ -817,7 +822,7 @@ export default class BaseStreamController
       }
     }
     targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-    if (this.loadingParts && frag.sn !== 'initSegment') {
+    if (this.loadingParts && isMediaFragment(frag)) {
       const partList = details.partList;
       if (partList && progressCallback) {
         if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -885,7 +890,7 @@ export default class BaseStreamController
       }
     }
 
-    if (frag.sn !== 'initSegment' && this.loadingParts) {
+    if (isMediaFragment(frag) && this.loadingParts) {
       this.log(
         `LL-Part loading OFF after next part miss @${targetBufferTime.toFixed(
           2,
@@ -1661,7 +1666,7 @@ export default class BaseStreamController
   }
 
   private handleFragLoadAborted(frag: Fragment, part: Part | undefined) {
-    if (this.transmuxer && frag.sn !== 'initSegment' && frag.stats.aborted) {
+    if (this.transmuxer && isMediaFragment(frag) && frag.stats.aborted) {
       this.warn(
         `Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${
           frag.level
@@ -1708,12 +1713,18 @@ export default class BaseStreamController
     }
     // keep retrying until the limit will be reached
     const errorAction = data.errorAction;
-    const { action, retryCount = 0, retryConfig } = errorAction || {};
-    if (
-      errorAction &&
-      action === NetworkErrorAction.RetryRequest &&
-      retryConfig
-    ) {
+    const { action, flags, retryCount = 0, retryConfig } = errorAction || {};
+    const couldRetry = !!errorAction && !!retryConfig;
+    const retry = couldRetry && action === NetworkErrorAction.RetryRequest;
+    const noAlternate =
+      couldRetry &&
+      !errorAction.resolved &&
+      flags === ErrorActionFlags.MoveAllAlternatesMatchingHost;
+    if (!retry && noAlternate && isMediaFragment(frag) && !frag.endList) {
+      this.resetFragmentErrors(filterType);
+      this.treatAsGap(frag);
+      errorAction.resolved = true;
+    } else if ((retry || noAlternate) && retryCount < retryConfig.maxNumRetry) {
       this.resetStartWhenNotLoaded(this.levelLastLoaded);
       const delay = getRetryDelay(retryConfig, retryCount);
       this.warn(
@@ -1742,9 +1753,7 @@ export default class BaseStreamController
         );
         return;
       }
-    } else if (
-      errorAction?.action === NetworkErrorAction.SendAlternateToPenaltyBox
-    ) {
+    } else if (action === NetworkErrorAction.SendAlternateToPenaltyBox) {
       this.state = State.WAITING_LEVEL;
     } else {
       this.state = State.ERROR;
@@ -1925,10 +1934,7 @@ export default class BaseStreamController
       );
       if (level.fragmentError === 0) {
         // Mark and track the odd empty segment as a gap to avoid reloading
-        level.fragmentError++;
-        frag.gap = true;
-        this.fragmentTracker.removeFragment(frag);
-        this.fragmentTracker.fragBuffered(frag, true);
+        this.treatAsGap(frag, level);
       }
       this.warn(error.message);
       this.hls.trigger(Events.ERROR, {
@@ -1970,6 +1976,15 @@ export default class BaseStreamController
     )}]${part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : ''}`;
   }
 
+  private treatAsGap(frag: MediaFragment, level?: Level) {
+    if (level) {
+      level.fragmentError++;
+    }
+    frag.gap = true;
+    this.fragmentTracker.removeFragment(frag);
+    this.fragmentTracker.fragBuffered(frag, true);
+  }
+
   protected resetTransmuxer() {
     this.transmuxer?.reset();
   }

package/src/controller/level-controller.ts

@@ -601,7 +601,7 @@ export default class LevelController extends BasePlaylistController {
 
   protected onLevelLoaded(event: Events.LEVEL_LOADED, data: LevelLoadedData) {
     const { level, details } = data;
-    const curLevel = this._levels[level];
+    const curLevel = data.levelInfo;
 
     if (!curLevel) {
       this.warn(`Invalid level index ${level}`);
@@ -612,7 +612,7 @@ export default class LevelController extends BasePlaylistController {
     }
 
     // only process level loaded events matching with expected level
-    if (level === this.currentLevelIndex) {
+    if (curLevel === this.currentLevel) {
       // reset level load error counter on successful level loaded only if there is no issues with fragments
       if (curLevel.fragmentError === 0) {
         curLevel.loadError = 0;
@@ -665,6 +665,7 @@ export default class LevelController extends BasePlaylistController {
       this.hls.trigger(Events.LEVEL_LOADING, {
         url,
         level: currentLevelIndex,
+        levelInfo: currentLevel,
         pathwayId: currentLevel.attrs['PATHWAY-ID'],
         id: 0, // Deprecated Level urlId
         deliveryDirectives: hlsUrlParameters || null,

package/src/controller/stream-controller.ts

@@ -6,7 +6,7 @@ import TransmuxerInterface from '../demux/transmuxer-interface';
 import { ErrorDetails } from '../errors';
 import { Events } from '../events';
 import { changeTypeSupported } from '../is-supported';
-import { ElementaryStreamTypes } from '../loader/fragment';
+import { ElementaryStreamTypes, isMediaFragment } from '../loader/fragment';
 import { PlaylistContextType, PlaylistLevelType } from '../types/loader';
 import { ChunkMetadata } from '../types/transmuxer';
 import { BufferHelper } from '../utils/buffer-helper';
@@ -319,7 +319,7 @@ export default class StreamController
       this.couldBacktrack &&
       !this.fragPrevious &&
       frag &&
-      frag.sn !== 'initSegment' &&
+      isMediaFragment(frag) &&
       this.fragmentTracker.getState(frag) !== FragmentState.OK
     ) {
       const backtrackSn = (this.backtrackFragment ?? frag).sn as number;
@@ -378,7 +378,7 @@ export default class StreamController
       fragState === FragmentState.NOT_LOADED ||
       fragState === FragmentState.PARTIAL
     ) {
-      if (frag.sn === 'initSegment') {
+      if (!isMediaFragment(frag)) {
         this._loadInitSegment(frag, level);
       } else if (this.bitrateTest) {
         this.log(
@@ -646,7 +646,7 @@ export default class StreamController
     if (!levels || this.state !== State.IDLE) {
       return;
     }
-    const level = levels[data.level];
+    const level = data.levelInfo;
     if (
       !level.details ||
       (level.details.live && this.levelLastLoaded !== level) ||
@@ -674,7 +674,7 @@ export default class StreamController
       }, cc [${newDetails.startCC}, ${newDetails.endCC}] duration:${duration}`,
     );
 
-    const curLevel = levels[newLevelId];
+    const curLevel = data.levelInfo;
     const fragCurrent = this.fragCurrent;
     if (
       fragCurrent &&
@@ -963,8 +963,8 @@ export default class StreamController
       this.fragLastKbps = Math.round(
         (8 * stats.total) / (stats.buffering.end - stats.loading.first),
       );
-      if (frag.sn !== 'initSegment') {
-        this.fragPrevious = frag as MediaFragment;
+      if (isMediaFragment(frag)) {
+        this.fragPrevious = frag;
       }
       this.fragBufferedComplete(frag, part);
     }

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

@@ -3,6 +3,11 @@ import { findFragmentByPTS } from './fragment-finders';
 import { FragmentState } from './fragment-tracker';
 import { ErrorDetails, ErrorTypes } from '../errors';
 import { Events } from '../events';
+import {
+  type Fragment,
+  isMediaFragment,
+  type MediaFragment,
+} from '../loader/fragment';
 import { Level } from '../types/level';
 import { PlaylistLevelType } from '../types/loader';
 import { BufferHelper } from '../utils/buffer-helper';
@@ -15,7 +20,6 @@ import { addSliding } from '../utils/level-helper';
 import { subtitleOptionsIdentical } from '../utils/media-option-attributes';
 import type Hls from '../hls';
 import type { FragmentTracker } from './fragment-tracker';
-import type { Fragment, MediaFragment } from '../loader/fragment';
 import type KeyLoader from '../loader/key-loader';
 import type { LevelDetails } from '../loader/level-details';
 import type { NetworkComponentAPI } from '../types/component-api';
@@ -126,8 +130,8 @@ export class SubtitleStreamController
     data: SubtitleFragProcessed,
   ) {
     const { frag, success } = data;
-    if (frag.sn !== 'initSegment') {
-      this.fragPrevious = frag as MediaFragment;
+    if (isMediaFragment(frag)) {
+      this.fragPrevious = frag;
     }
     this.state = State.IDLE;
     if (!success) {
@@ -466,7 +470,7 @@ export class SubtitleStreamController
         return;
       }
       foundFrag = this.mapToInitFragWhenRequired(foundFrag) as Fragment;
-      if (foundFrag.sn !== 'initSegment') {
+      if (isMediaFragment(foundFrag)) {
         // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
         const curSNIdx = foundFrag.sn - trackDetails.startSN;
         const prevFrag = fragments[curSNIdx - 1];
@@ -492,7 +496,7 @@ export class SubtitleStreamController
     level: Level,
     targetBufferTime: number,
   ) {
-    if (frag.sn === 'initSegment') {
+    if (!isMediaFragment(frag)) {
       this._loadInitSegment(frag, level);
     } else {
       super.loadFragment(frag, level, targetBufferTime);

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

@@ -453,6 +453,7 @@ class SubtitleTrackController extends BasePlaylistController {
         id,
         groupId,
         deliveryDirectives: hlsUrlParameters || null,
+        track: currentTrack,
       });
     }
   }

package/src/loader/fragment.ts

@@ -152,6 +152,10 @@ export type MediaFragmentRef = {
   programDateTime: number | null;
 };
 
+export function isMediaFragment(frag: Fragment): frag is MediaFragment {
+  return frag.sn !== 'initSegment';
+}
+
 /**
  * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
  */
@@ -323,7 +327,7 @@ export class Fragment extends BaseSegment {
   }
 
   get ref(): MediaFragmentRef | null {
-    if (this.sn === 'initSegment') {
+    if (!isMediaFragment(this)) {
       return null;
     }
     if (!this._ref) {

package/src/loader/playlist-loader.ts

@@ -18,10 +18,11 @@ import type { NetworkComponentAPI } from '../types/component-api';
 import type {
   ErrorData,
   LevelLoadingData,
+  LevelsUpdatedData,
   ManifestLoadingData,
   TrackLoadingData,
 } from '../types/events';
-import type { LevelParsed, VariableMap } from '../types/level';
+import type { Level, LevelParsed, VariableMap } from '../types/level';
 import type {
   Loader,
   LoaderCallbacks,
@@ -31,7 +32,7 @@ import type {
   LoaderStats,
   PlaylistLoaderContext,
 } from '../types/loader';
-import type { MediaAttributes } from '../types/media-playlist';
+import type { MediaAttributes, MediaPlaylist } from '../types/media-playlist';
 
 function mapContextToLevelType(
   context: PlaylistLoaderContext,
@@ -86,6 +87,7 @@ class PlaylistLoader implements NetworkComponentAPI {
     hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
     hls.on(Events.AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
     hls.on(Events.SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
   }
 
   private unregisterListeners() {
@@ -94,6 +96,7 @@ class PlaylistLoader implements NetworkComponentAPI {
     hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
     hls.off(Events.AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
     hls.off(Events.SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
   }
 
   /**
@@ -118,7 +121,7 @@ class PlaylistLoader implements NetworkComponentAPI {
     return this.loaders[context.type];
   }
 
-  private resetInternalLoader(contextType): void {
+  private resetInternalLoader(contextType: PlaylistContextType): void {
     if (this.loaders[contextType]) {
       delete this.loaders[contextType];
     }
@@ -134,7 +137,7 @@ class PlaylistLoader implements NetworkComponentAPI {
         loader.destroy();
       }
 
-      this.resetInternalLoader(contextType);
+      this.resetInternalLoader(contextType as PlaylistContextType);
     }
   }
 
@@ -157,11 +160,12 @@ class PlaylistLoader implements NetworkComponentAPI {
       type: PlaylistContextType.MANIFEST,
       url,
       deliveryDirectives: null,
+      levelOrTrack: null,
     });
   }
 
   private onLevelLoading(event: Events.LEVEL_LOADING, data: LevelLoadingData) {
-    const { id, level, pathwayId, url, deliveryDirectives } = data;
+    const { id, level, pathwayId, url, deliveryDirectives, levelInfo } = data;
     this.load({
       id,
       level,
@@ -170,6 +174,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       type: PlaylistContextType.LEVEL,
       url,
       deliveryDirectives,
+      levelOrTrack: levelInfo,
     });
   }
 
@@ -177,7 +182,7 @@ class PlaylistLoader implements NetworkComponentAPI {
     event: Events.AUDIO_TRACK_LOADING,
     data: TrackLoadingData,
   ) {
-    const { id, groupId, url, deliveryDirectives } = data;
+    const { id, groupId, url, deliveryDirectives, track } = data;
     this.load({
       id,
       groupId,
@@ -186,6 +191,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       type: PlaylistContextType.AUDIO_TRACK,
       url,
       deliveryDirectives,
+      levelOrTrack: track,
     });
   }
 
@@ -193,7 +199,7 @@ class PlaylistLoader implements NetworkComponentAPI {
     event: Events.SUBTITLE_TRACK_LOADING,
     data: TrackLoadingData,
   ) {
-    const { id, groupId, url, deliveryDirectives } = data;
+    const { id, groupId, url, deliveryDirectives, track } = data;
     this.load({
       id,
       groupId,
@@ -202,9 +208,30 @@ class PlaylistLoader implements NetworkComponentAPI {
       type: PlaylistContextType.SUBTITLE_TRACK,
       url,
       deliveryDirectives,
+      levelOrTrack: track,
     });
   }
 
+  private onLevelsUpdated(
+    event: Events.LEVELS_UPDATED,
+    data: LevelsUpdatedData,
+  ) {
+    // abort and delete loader of removed levels
+    const loader = this.loaders[PlaylistContextType.LEVEL];
+    if (loader) {
+      const context = loader.context;
+      if (
+        context &&
+        !data.levels.some(
+          (lvl) => lvl === (context as PlaylistLoaderContext).levelOrTrack,
+        )
+      ) {
+        loader.abort();
+        delete this.loaders[PlaylistContextType.LEVEL];
+      }
+    }
+  }
+
   private load(context: PlaylistLoaderContext): void {
     const config = this.hls.config;
 
@@ -217,7 +244,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       if (
         loaderContext &&
         loaderContext.url === context.url &&
-        loaderContext.level === context.level
+        loaderContext.levelOrTrack === context.levelOrTrack
       ) {
         // same URL can't overlap
         this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
@@ -680,6 +707,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       case PlaylistContextType.LEVEL:
         hls.trigger(Events.LEVEL_LOADED, {
           details: levelDetails,
+          levelInfo: (context.levelOrTrack as Level) || hls.levels[0],
           level: levelIndex || 0,
           id: id || 0,
           stats,
@@ -690,6 +718,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       case PlaylistContextType.AUDIO_TRACK:
         hls.trigger(Events.AUDIO_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack as MediaPlaylist,
           id: id || 0,
           groupId: groupId || '',
           stats,
@@ -700,6 +729,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       case PlaylistContextType.SUBTITLE_TRACK:
         hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack as MediaPlaylist,
           id: id || 0,
           groupId: groupId || '',
           stats,

package/src/types/events.ts

@@ -188,6 +188,7 @@ export interface LevelSwitchedData {
 export interface TrackLoadingData {
   id: number;
   groupId: string;
+  track: MediaPlaylist;
   url: string;
   deliveryDirectives: HlsUrlParameters | null;
 }
@@ -195,6 +196,7 @@ export interface TrackLoadingData {
 export interface LevelLoadingData {
   id: number;
   level: number;
+  levelInfo: Level;
   pathwayId: string | undefined;
   url: string;
   deliveryDirectives: HlsUrlParameters | null;
@@ -207,12 +209,14 @@ export interface TrackLoadedData {
   networkDetails: any;
   stats: LoaderStats;
   deliveryDirectives: HlsUrlParameters | null;
+  track: MediaPlaylist;
 }
 
 export interface LevelLoadedData {
   details: LevelDetails;
   id: number;
   level: number;
+  levelInfo: Level;
   networkDetails: any;
   stats: LoaderStats;
   deliveryDirectives: HlsUrlParameters | null;

package/src/types/loader.ts

@@ -1,5 +1,6 @@
 import type { LoaderConfig } from '../config';
-import type { HlsUrlParameters } from './level';
+import type { HlsUrlParameters, Level } from './level';
+import type { MediaPlaylist } from './media-playlist';
 import type { Fragment } from '../loader/fragment';
 import type { Part } from '../loader/fragment';
 import type { KeyLoaderInfo } from '../loader/key-loader';
@@ -191,4 +192,6 @@ export interface PlaylistLoaderContext extends LoaderContext {
   levelDetails?: LevelDetails;
   // Blocking playlist request delivery directives (or null id none were added to playlist url
   deliveryDirectives: HlsUrlParameters | null;
+  // Reference to level or track object in hls.levels, hls.allAudioTracks, or hls.allSubtitleTracks (null when loading MVP)
+  levelOrTrack: Level | MediaPlaylist | null;
 }