hls.js 1.6.14 → 1.6.15

package/dist/hls.d.mts

@@ -1496,6 +1496,7 @@ export declare class FragmentTracker implements ComponentAPI {
      * Partially loaded fragments will be registered as a partial fragment
      */
     detectPartialFragments(data: FragBufferedData): void;
+    private bufferedEnd;
     private removeParts;
     fragBuffered(frag: MediaFragment, force?: true): void;
     private getBufferedTimes;
@@ -2490,6 +2491,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private createAsset;
     private createAssetPlayer;
     private clearInterstitial;
+    private clearAssetPlayers;
     private resetAssetPlayer;
     private clearAssetPlayer;
     private emptyPlayerQueue;
@@ -2760,6 +2762,7 @@ export declare class LevelKey implements DecryptData {
     pssh: Uint8Array<ArrayBuffer> | null;
     static clearKeyUriToKeyIdMap(): void;
     static setKeyIdForUri(uri: string, keyId: Uint8Array<ArrayBuffer>): void;
+    static addKeyIdForUri(uri: string): Uint8Array<ArrayBuffer>;
     constructor(method: string, uri: string, format: string, formatversions?: number[], iv?: Uint8Array<ArrayBuffer> | null, keyId?: string);
     matches(key: LevelKey): boolean;
     isSupported(): boolean;

package/dist/hls.d.ts

@@ -1496,6 +1496,7 @@ export declare class FragmentTracker implements ComponentAPI {
      * Partially loaded fragments will be registered as a partial fragment
      */
     detectPartialFragments(data: FragBufferedData): void;
+    private bufferedEnd;
     private removeParts;
     fragBuffered(frag: MediaFragment, force?: true): void;
     private getBufferedTimes;
@@ -2490,6 +2491,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private createAsset;
     private createAssetPlayer;
     private clearInterstitial;
+    private clearAssetPlayers;
     private resetAssetPlayer;
     private clearAssetPlayer;
     private emptyPlayerQueue;
@@ -2760,6 +2762,7 @@ export declare class LevelKey implements DecryptData {
     pssh: Uint8Array<ArrayBuffer> | null;
     static clearKeyUriToKeyIdMap(): void;
     static setKeyIdForUri(uri: string, keyId: Uint8Array<ArrayBuffer>): void;
+    static addKeyIdForUri(uri: string): Uint8Array<ArrayBuffer>;
     constructor(method: string, uri: string, format: string, formatversions?: number[], iv?: Uint8Array<ArrayBuffer> | null, keyId?: string);
     matches(key: LevelKey): boolean;
     isSupported(): boolean;

package/dist/hls.js

@@ -1165,7 +1165,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.14");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.15");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -5583,11 +5583,7 @@
       });
       fragmentEntity.loaded = null;
       if (Object.keys(fragmentEntity.range).length) {
-        fragmentEntity.buffered = true;
-        var endList = fragmentEntity.body.endList = frag.endList || fragmentEntity.body.endList;
-        if (endList) {
-          this.endListFragments[fragmentEntity.body.type] = fragmentEntity;
-        }
+        this.bufferedEnd(fragmentEntity, frag);
         if (!isPartial(fragmentEntity)) {
           // Remove older fragment parts from lookup after frag is tracked as buffered
           this.removeParts(frag.sn - 1, frag.type);
@@ -5597,6 +5593,13 @@
         this.removeFragment(fragmentEntity.body);
       }
     };
+    _proto.bufferedEnd = function bufferedEnd(fragmentEntity, frag) {
+      fragmentEntity.buffered = true;
+      var endList = fragmentEntity.body.endList = frag.endList || fragmentEntity.body.endList;
+      if (endList) {
+        this.endListFragments[fragmentEntity.body.type] = fragmentEntity;
+      }
+    };
     _proto.removeParts = function removeParts(snToKeep, levelType) {
       var activeParts = this.activePartLists[levelType];
       if (!activeParts) {
@@ -5623,7 +5626,7 @@
       }
       if (fragmentEntity) {
         fragmentEntity.loaded = null;
-        fragmentEntity.buffered = true;
+        this.bufferedEnd(fragmentEntity, frag);
       }
     };
     _proto.getBufferedTimes = function getBufferedTimes(fragment, part, partial, timeRange) {
@@ -7810,6 +7813,14 @@
     LevelKey.setKeyIdForUri = function setKeyIdForUri(uri, keyId) {
       keyUriToKeyIdMap[uri] = keyId;
     };
+    LevelKey.addKeyIdForUri = function addKeyIdForUri(uri) {
+      var val = Object.keys(keyUriToKeyIdMap).length % Number.MAX_SAFE_INTEGER;
+      var keyId = new Uint8Array(16);
+      var dv = new DataView(keyId.buffer, 12, 4); // Just set the last 4 bytes
+      dv.setUint32(0, val);
+      keyUriToKeyIdMap[uri] = keyId;
+      return keyId;
+    };
     var _proto = LevelKey.prototype;
     _proto.matches = function matches(key) {
       return key.uri === this.uri && key.method === this.method && key.encrypted === this.encrypted && key.keyFormat === this.keyFormat && arrayValuesMatch(key.keyFormatVersions, this.keyFormatVersions) && optionalArrayValuesMatch(key.iv, this.iv) && optionalArrayValuesMatch(key.keyId, this.keyId);
@@ -9950,7 +9961,7 @@
       this.state = State.FRAG_LOADING;
 
       // Load key before streaming fragment data
-      var dataOnProgress = this.config.progressive;
+      var dataOnProgress = this.config.progressive && frag.type !== PlaylistLevelType.SUBTITLE;
       var result;
       if (dataOnProgress && keyLoadingPromise) {
         result = keyLoadingPromise.then(function (keyLoadedData) {
@@ -10776,11 +10787,12 @@
       }, false);
       if (!parsed) {
         var _this$transmuxer;
-        if (level.fragmentError === 0) {
-          // Mark and track the odd empty segment as a gap to avoid reloading
+        var mediaNotFound = ((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null;
+        if (level.fragmentError === 0 || mediaNotFound && (level.fragmentError < 2 || frag.endList)) {
+          // Mark and track the odd (or last) empty segment as a gap to avoid reloading
           this.treatAsGap(frag, level);
         }
-        if (((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null) {
+        if (mediaNotFound) {
           var error = new Error("Found no media in fragment " + frag.sn + " of " + this.playlistLabel() + " " + frag.level + " resetting transmuxer to fallback to playlist timing");
           this.warn(error.message);
           this.hls.trigger(Events.ERROR, {
@@ -16140,7 +16152,7 @@
       // Clear the track samples. This also clears the samples array in the demuxer, since the reference is shared
       track.samples = [];
       var start = (firstPTS - initTime) / inputTimeScale;
-      var end = nextAudioTs / inputTimeScale;
+      var end = this.nextAudioTs / inputTimeScale;
       var type = 'audio';
       var audioData = {
         data1: moof,
@@ -17046,7 +17058,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.14";
+  var version = "1.6.15";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -23626,6 +23638,11 @@
         }
         var keyIdArray = 'buffer' in keyId ? new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength) : new Uint8Array(keyId);
         if (mediaKeySessionContext.keySystem === KeySystems.PLAYREADY && keyIdArray.length === 16) {
+          // On some devices, the key ID has already been converted for endianness.
+          // In such cases, this key ID is the one we need to cache.
+          var originKeyIdWithStatusChange = arrayToHex(keyIdArray);
+          // Cache the original key IDs to ensure compatibility across all cases.
+          keyStatuses[originKeyIdWithStatusChange] = status;
           changeEndianness(keyIdArray);
         }
         var keyIdWithStatusChange = arrayToHex(keyIdArray);
@@ -25458,7 +25475,8 @@
         if (backwardSeek && currentTime < start || currentTime >= start + duration) {
           var _playingItem$event;
           if ((_playingItem$event = playingItem.event) != null && _playingItem$event.appendInPlace) {
-            _this.clearInterstitial(playingItem.event, playingItem);
+            // Return SourceBuffer(s) to primary player and flush
+            _this.clearAssetPlayers(playingItem.event, playingItem);
             _this.flushFrontBuffer(currentTime);
           }
           _this.setScheduleToAssetAtTime(currentTime, playingAsset);
@@ -26852,12 +26870,15 @@
       return player;
     };
     _proto.clearInterstitial = function clearInterstitial(interstitial, toSegment) {
+      this.clearAssetPlayers(interstitial, toSegment);
+      // Remove asset list and resolved duration
+      interstitial.reset();
+    };
+    _proto.clearAssetPlayers = function clearAssetPlayers(interstitial, toSegment) {
       var _this9 = this;
       interstitial.assetList.forEach(function (asset) {
         _this9.clearAssetPlayer(asset.identifier, toSegment);
       });
-      // Remove asset list and resolved duration
-      interstitial.reset();
     };
     _proto.resetAssetPlayer = function resetAssetPlayer(assetId) {
       // Reset asset player so that it's timeline can be adjusted without reloading the MVP
@@ -27047,10 +27068,10 @@
       // Fallback to Primary by on current or future events by updating schedule to skip errored interstitials/assets
       var flushStart = interstitial.timelineStart;
       var playingItem = this.effectivePlayingItem;
+      var timelinePos = this.timelinePos;
       // Update schedule now that interstitial/assets are flagged with `error` for fallback
       if (playingItem) {
-        this.log("Fallback to primary from event \"" + interstitial.identifier + "\" start: " + flushStart + " pos: " + this.timelinePos + " playing: " + segmentToString(playingItem) + " error: " + interstitial.error);
-        var timelinePos = this.timelinePos;
+        this.log("Fallback to primary from event \"" + interstitial.identifier + "\" start: " + flushStart + " pos: " + timelinePos + " playing: " + segmentToString(playingItem) + " error: " + interstitial.error);
         if (timelinePos === -1) {
           timelinePos = this.hls.startPosition;
         }
@@ -27062,14 +27083,15 @@
           this.attachPrimary(flushStart, null);
           this.flushFrontBuffer(flushStart);
         }
-        if (!this.schedule) {
-          return;
-        }
-        var scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
-        this.setSchedulePosition(scheduleIndex);
-      } else {
+      } else if (timelinePos === -1) {
         this.checkStart();
+        return;
       }
+      if (!this.schedule) {
+        return;
+      }
+      var scheduleIndex = this.schedule.findItemIndexAtTime(timelinePos);
+      this.setSchedulePosition(scheduleIndex);
     }
 
     // Asset List loading
@@ -27113,7 +27135,8 @@
             // Abandon if new duration is reduced enough to land playback in primary start
             var index = this.schedule.findItemIndexAtTime(this.timelinePos);
             if (index !== scheduleIndex) {
-              interstitial.error = new Error("Interstitial no longer within playback range " + this.timelinePos + " " + interstitial);
+              interstitial.error = new Error("Interstitial " + (assets.length ? 'no longer within playback range' : 'asset-list is empty') + " " + this.timelinePos + " " + interstitial);
+              this.log(interstitial.error.message);
               this.updateSchedule(true);
               this.primaryFallback(interstitial);
               return;
@@ -34941,7 +34964,7 @@
       var _this2 = this;
       var hls = this.hls;
       // if any URL found on new audio track, it is an alternate audio track
-      var fromAltAudio = this.altAudio === 2;
+      var fromAltAudio = this.altAudio !== 0;
       var altAudio = useAlternateAudio(data.url, hls);
       // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered
       // don't do anything if we switch to alt audio: audio stream controller is handling it.
@@ -34967,6 +34990,7 @@
         }
         // If switching from alt to main audio, flush all audio and trigger track switched
         if (fromAltAudio) {
+          this.altAudio = 0;
           this.fragmentTracker.removeAllFragments();
           hls.once(Events.BUFFER_FLUSHED, function () {
             if (!_this2.hls) {
@@ -35817,11 +35841,19 @@
               return b !== 0;
             })) {
               this.log("Using keyId found in init segment " + arrayToHex(keyId));
-              keyInfo.decryptdata.keyId = keyId;
               LevelKey.setKeyIdForUri(keyInfo.decryptdata.uri, keyId);
+            } else {
+              keyId = LevelKey.addKeyIdForUri(keyInfo.decryptdata.uri);
+              this.log("Generating keyId to patch media " + arrayToHex(keyId));
             }
+            keyInfo.decryptdata.keyId = keyId;
           }
         }
+        if (!keyInfo.decryptdata.keyId && !isMediaFragment(frag)) {
+          // Resolve so that unencrypted init segment is loaded
+          // key id is extracted from tenc box when processing key for next segment above
+          return Promise.resolve(keyLoadedData);
+        }
         var keySessionContextPromise = this.emeController.loadKey(keyLoadedData);
         return (keyInfo.keyLoadPromise = keySessionContextPromise.then(function (keySessionContext) {
           keyInfo.mediaKeySessionContext = keySessionContext;

package/dist/hls.js.d.ts

@@ -1496,6 +1496,7 @@ export declare class FragmentTracker implements ComponentAPI {
      * Partially loaded fragments will be registered as a partial fragment
      */
     detectPartialFragments(data: FragBufferedData): void;
+    private bufferedEnd;
     private removeParts;
     fragBuffered(frag: MediaFragment, force?: true): void;
     private getBufferedTimes;
@@ -2490,6 +2491,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private createAsset;
     private createAssetPlayer;
     private clearInterstitial;
+    private clearAssetPlayers;
     private resetAssetPlayer;
     private clearAssetPlayer;
     private emptyPlayerQueue;
@@ -2760,6 +2762,7 @@ export declare class LevelKey implements DecryptData {
     pssh: Uint8Array<ArrayBuffer> | null;
     static clearKeyUriToKeyIdMap(): void;
     static setKeyIdForUri(uri: string, keyId: Uint8Array<ArrayBuffer>): void;
+    static addKeyIdForUri(uri: string): Uint8Array<ArrayBuffer>;
     constructor(method: string, uri: string, format: string, formatversions?: number[], iv?: Uint8Array<ArrayBuffer> | null, keyId?: string);
     matches(key: LevelKey): boolean;
     isSupported(): boolean;