Patch/v1.4.14 doris

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

@@ -288,7 +288,9 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
     // Warning: (ae-forgotten-export) The symbol "RemuxedTrack" needs to be exported by the entry point hls.d.ts
     //
     // (undocumented)
-    protected bufferFragmentData(data: RemuxedTrack, frag: Fragment, part: Part | null, chunkMeta: ChunkMetadata): void;
+    protected bufferFragmentData(data: RemuxedTrack, frag: Fragment, part: Part | null, chunkMeta: ChunkMetadata, noBacktracking?: boolean): void;
+    // (undocumented)
+    protected checkLiveUpdate(details: LevelDetails): void;
     // (undocumented)
     protected clearTrackerIfNeeded(frag: Fragment): void;
     // (undocumented)

build-config.js

@@ -123,6 +123,14 @@ const babelTsWithPresetEnvTargets = ({ targets, stripConsole }) =>
                 'isFiniteNumber',
                 path.resolve('src/polyfills/number')
               );
+            } else if (
+              espath.get('callee').matchesPattern('Number.isSafeInteger')
+            ) {
+              espath.node.callee = importHelper.addNamed(
+                espath,
+                'isSafeInteger',
+                path.resolve('src/polyfills/number')
+              );
             } else if (
               espath.get('callee').matchesPattern('Number.MAX_SAFE_INTEGER')
             ) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hls.js",
-  "version": "1.4.5",
+  "version": "1.4.14",
   "license": "Apache-2.0",
   "description": "JavaScript HLS client using MediaSourceExtension",
   "homepage": "https://github.com/video-dev/hls.js",

src/controller/audio-stream-controller.ts

@@ -513,10 +513,8 @@ class AudioStreamController
     const track = levels[trackId];
     let sliding = 0;
     if (newDetails.live || track.details?.live) {
+      this.checkLiveUpdate(newDetails);
       const mainDetails = this.mainDetails;
-      if (!newDetails.fragments[0]) {
-        newDetails.deltaUpdateFailed = true;
-      }
       if (newDetails.deltaUpdateFailed || !mainDetails) {
         return;
       }

src/controller/base-playlist-controller.ts

@@ -149,6 +149,8 @@ export default class BasePlaylistController implements NetworkComponentAPI {
           `live playlist ${index} ${
             details.advanced
               ? 'REFRESHED ' + details.lastPartSn + '-' + details.lastPartIndex
+              : details.updated
+              ? 'UPDATED'
               : 'MISSED'
           }`
         );
@@ -224,7 +226,7 @@ export default class BasePlaylistController implements NetworkComponentAPI {
           this.loadPlaylist(deliveryDirectives);
           return;
         }
-      } else if (details.canBlockReload) {
+      } else if (details.canBlockReload || details.canSkipUntil) {
         deliveryDirectives = this.getDeliveryDirectives(
           details,
           data.deliveryDirectives,

src/controller/base-stream-controller.ts

@@ -434,6 +434,22 @@ export default class BaseStreamController
     }
   }
 
+  protected checkLiveUpdate(details: LevelDetails) {
+    if (details.updated && !details.live) {
+      // Live stream ended, update fragment tracker
+      const lastFragment = details.fragments[details.fragments.length - 1];
+      this.fragmentTracker.detectPartialFragments({
+        frag: lastFragment,
+        part: null,
+        stats: lastFragment.stats,
+        id: lastFragment.type,
+      });
+    }
+    if (!details.fragments[0]) {
+      details.deltaUpdateFailed = true;
+    }
+  }
+
   protected flushMainBuffer(
     startOffset: number,
     endOffset: number,
@@ -884,7 +900,8 @@ export default class BaseStreamController
     data: RemuxedTrack,
     frag: Fragment,
     part: Part | null,
-    chunkMeta: ChunkMetadata
+    chunkMeta: ChunkMetadata,
+    noBacktracking?: boolean
   ) {
     if (!data || this.state !== State.PARSING) {
       return;
@@ -912,6 +929,9 @@ export default class BaseStreamController
     this.hls.trigger(Events.BUFFER_APPENDING, segment);
 
     if (data.dropped && data.independent && !part) {
+      if (noBacktracking) {
+        return;
+      }
       // Clear buffer so that we reload previous segments sequentially if required
       this.flushBufferGap(frag);
     }
@@ -1520,10 +1540,7 @@ export default class BaseStreamController
       action === NetworkErrorAction.RetryRequest &&
       retryConfig
     ) {
-      if (!this.loadedmetadata) {
-        this.startFragRequested = false;
-        this.nextLoadPosition = this.startPosition;
-      }
+      this.resetStartWhenNotLoaded(this.levelLastLoaded ?? frag.level);
       const delay = getRetryDelay(retryConfig, retryCount);
       this.warn(
         `Fragment ${frag.sn} of ${filterType} ${frag.level} errored with ${
@@ -1547,6 +1564,10 @@ export default class BaseStreamController
           `${data.details} reached or exceeded max retry (${retryCount})`
         );
       }
+    } else if (
+      errorAction?.action === NetworkErrorAction.SendAlternateToPenaltyBox
+    ) {
+      this.state = State.WAITING_LEVEL;
     } else {
       this.state = State.ERROR;
     }
@@ -1652,7 +1673,7 @@ export default class BaseStreamController
       `The loading context changed while buffering fragment ${chunkMeta.sn} of level ${chunkMeta.level}. This chunk will not be buffered.`
     );
     this.removeUnbufferedFrags();
-    this.resetStartWhenNotLoaded(chunkMeta.level);
+    this.resetStartWhenNotLoaded(this.levelLastLoaded ?? chunkMeta.level);
     this.resetLoadingState();
   }
 
@@ -1720,8 +1741,15 @@ export default class BaseStreamController
       level.fragmentError = 0;
     } else if (this.transmuxer?.error === null) {
       const error = new Error(
-        `Found no media in fragment ${frag.sn} of level ${level.id} resetting transmuxer to fallback to playlist timing`
+        `Found no media in fragment ${frag.sn} of level ${frag.level} resetting transmuxer to fallback to playlist timing`
       );
+      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.warn(error.message);
       this.hls.trigger(Events.ERROR, {
         type: ErrorTypes.MEDIA_ERROR,
@@ -1750,7 +1778,11 @@ export default class BaseStreamController
 
   protected recoverWorkerError(data: ErrorData) {
     if (data.event === 'demuxerWorker') {
+      this.fragmentTracker.removeAllFragments();
       this.resetTransmuxer();
+      this.resetStartWhenNotLoaded(
+        this.levelLastLoaded ?? this.fragCurrent?.level ?? 0
+      );
       this.resetLoadingState();
     }
   }

src/controller/error-controller.ts

@@ -128,8 +128,17 @@ export default class ErrorController implements NetworkComponentAPI {
       case ErrorDetails.KEY_LOAD_TIMEOUT:
         data.errorAction = this.getFragRetryOrSwitchAction(data);
         return;
-      case ErrorDetails.FRAG_GAP:
       case ErrorDetails.FRAG_PARSING_ERROR:
+        // ignore empty segment errors marked as gap
+        if (data.frag?.gap) {
+          data.errorAction = {
+            action: NetworkErrorAction.DoNothing,
+            flags: ErrorActionFlags.None,
+          };
+          return;
+        }
+      // falls through
+      case ErrorDetails.FRAG_GAP:
       case ErrorDetails.FRAG_DECRYPT_ERROR: {
         // Switch level if possible, otherwise allow retry count to reach max error retries
         data.errorAction = this.getFragRetryOrSwitchAction(data);
@@ -330,14 +339,16 @@ export default class ErrorController implements NetworkComponentAPI {
       if (hls.autoLevelEnabled) {
         // Search for next level to retry
         let nextLevel = -1;
-        const levels = hls.levels;
+        const { levels, loadLevel, minAutoLevel, maxAutoLevel } = hls;
         const fragErrorType = data.frag?.type;
         const { type: playlistErrorType, groupId: playlistErrorGroupId } =
           data.context ?? {};
         for (let i = levels.length; i--; ) {
-          const candidate = (i + hls.loadLevel) % levels.length;
+          const candidate = (i + loadLevel) % levels.length;
           if (
-            candidate !== hls.loadLevel &&
+            candidate !== loadLevel &&
+            candidate >= minAutoLevel &&
+            candidate <= maxAutoLevel &&
             levels[candidate].loadError === 0
           ) {
             const levelCandidate = levels[candidate];

src/controller/fragment-tracker.ts

@@ -185,7 +185,7 @@ export class FragmentTracker implements ComponentAPI {
 
     const fragKey = getFragmentKey(frag);
     const fragmentEntity = this.fragments[fragKey];
-    if (!fragmentEntity) {
+    if (!fragmentEntity || (fragmentEntity.buffered && frag.gap)) {
       return;
     }
     const isFragHint = !frag.relurl;
@@ -206,7 +206,9 @@ export class FragmentTracker implements ComponentAPI {
     fragmentEntity.loaded = null;
     if (Object.keys(fragmentEntity.range).length) {
       fragmentEntity.buffered = true;
-      if (fragmentEntity.body.endList) {
+      const endList = (fragmentEntity.body.endList =
+        frag.endList || fragmentEntity.body.endList);
+      if (endList) {
         this.endListFragments[fragmentEntity.body.type] = fragmentEntity;
       }
       if (!isPartial(fragmentEntity)) {

src/controller/id3-track-controller.ts

@@ -26,15 +26,13 @@ declare global {
   }
 }
 
-type Cue = VTTCue | TextTrackCue;
-
 const MIN_CUE_DURATION = 0.25;
 
 const isPlayStation4 = () => {
   return /PlayStation 4/i.test(navigator.userAgent);
 };
 
-function getCueClass() {
+function getCueClass(): typeof VTTCue | typeof TextTrackCue | undefined {
   if (typeof self === 'undefined') return undefined;
 
   // Attempt to recreate Safari functionality by creating
@@ -47,12 +45,35 @@ function getCueClass() {
     self.TextTrackCue) as any;
 }
 
+function createCueWithDataFields(
+  Cue: typeof VTTCue | typeof TextTrackCue,
+  startTime: number,
+  endTime: number,
+  data: Object,
+  type?: string
+): VTTCue | TextTrackCue | undefined {
+  let cue = new Cue(startTime, endTime, '');
+  try {
+    (cue as any).value = data;
+    if (type) {
+      (cue as any).type = type;
+    }
+  } catch (e) {
+    cue = new Cue(
+      startTime,
+      endTime,
+      JSON.stringify(type ? { type, ...data } : data)
+    );
+  }
+  return cue;
+}
+
 // VTTCue latest draft allows an infinite duration, fallback
 // to MAX_VALUE if necessary
 const MAX_CUE_ENDTIME = (() => {
   const Cue = getCueClass();
   try {
-    new Cue(0, Number.POSITIVE_INFINITY, '');
+    Cue && new Cue(0, Number.POSITIVE_INFINITY, '');
   } catch (e) {
     return Number.MAX_VALUE;
   }
@@ -78,7 +99,11 @@ class ID3TrackController implements ComponentAPI {
   private media: HTMLMediaElement | null = null;
   private dateRangeCuesAppended: Record<
     string,
-    { cues: Record<string, Cue>; dateRange: DateRange; durationKnown: boolean }
+    {
+      cues: Record<string, VTTCue | TextTrackCue>;
+      dateRange: DateRange;
+      durationKnown: boolean;
+    }
   > = {};
 
   constructor(hls) {
@@ -185,6 +210,9 @@ class ID3TrackController implements ComponentAPI {
     }
 
     const Cue = getCueClass();
+    if (!Cue) {
+      return;
+    }
 
     for (let i = 0; i < samples.length; i++) {
       const type = samples[i].type;
@@ -214,26 +242,33 @@ class ID3TrackController implements ComponentAPI {
           // Safari doesn't put the timestamp frame in the TextTrack
           if (!ID3.isTimeStampFrame(frame)) {
             // add a bounds to any unbounded cues
-            this.updateId3CueEnds(startTime);
-
-            const cue = new Cue(startTime, endTime, '');
-            cue.value = frame;
-            if (type) {
-              cue.type = type;
+            this.updateId3CueEnds(startTime, type);
+            const cue = createCueWithDataFields(
+              Cue,
+              startTime,
+              endTime,
+              frame,
+              type
+            );
+            if (cue) {
+              this.id3Track.addCue(cue);
             }
-            this.id3Track.addCue(cue);
           }
         }
       }
     }
   }
 
-  updateId3CueEnds(startTime: number) {
+  updateId3CueEnds(startTime: number, type: MetadataSchema) {
     const cues = this.id3Track?.cues;
     if (cues) {
       for (let i = cues.length; i--; ) {
         const cue = cues[i] as any;
-        if (cue.startTime < startTime && cue.endTime === MAX_CUE_ENDTIME) {
+        if (
+          cue.type === type &&
+          cue.startTime < startTime &&
+          cue.endTime === MAX_CUE_ENDTIME
+        ) {
           cue.endTime = startTime;
         }
       }
@@ -354,22 +389,28 @@ class ID3TrackController implements ComponentAPI {
         if (!isDateRangeCueAttribute(key)) {
           continue;
         }
-        let cue = cues[key] as any;
+        const cue = cues[key];
         if (cue) {
           if (durationKnown && !appendedDateRangeCues.durationKnown) {
             cue.endTime = endTime;
           }
-        } else {
+        } else if (Cue) {
           let data = dateRange.attr[key];
-          cue = new Cue(startTime, endTime, '');
           if (isSCTE35Attribute(key)) {
             data = hexToArrayBuffer(data);
           }
-          cue.value = { key, data };
-          cue.type = MetadataSchema.dateRange;
-          cue.id = id;
-          this.id3Track.addCue(cue);
-          cues[key] = cue;
+          const cue = createCueWithDataFields(
+            Cue,
+            startTime,
+            endTime,
+            { key, data },
+            MetadataSchema.dateRange
+          );
+          if (cue) {
+            cue.id = id;
+            this.id3Track.addCue(cue);
+            cues[key] = cue;
+          }
         }
       }
       dateRangeCuesAppended[id] = {