hls.js 1.6.3-0.canary.11230 → 1.6.3-0.canary.11233

package/dist/hls.d.mts

@@ -2446,6 +2446,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private onMediaEnded;
     private onScheduleUpdate;
     private updateItem;
+    private trimInPlace;
     private itemsMatch;
     private eventItemsMatch;
     private findItemIndex;

package/dist/hls.d.ts

@@ -2446,6 +2446,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private onMediaEnded;
     private onScheduleUpdate;
     private updateItem;
+    private trimInPlace;
     private itemsMatch;
     private eventItemsMatch;
     private findItemIndex;

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.3-0.canary.11230");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11233");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16677,7 +16677,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11230";
+  var version = "1.6.3-0.canary.11233";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24616,7 +24616,7 @@
         if (interstitialsUpdated) {
           _this.log("INTERSTITIALS_UPDATED (" + interstitialEvents.length + "): " + interstitialEvents + "\nSchedule: " + scheduleItems.map(function (seg) {
             return segmentToString(seg);
-          }));
+          }) + " pos: " + _this.timelinePos);
         }
         if (removedIds.length) {
           _this.log("Removed events " + removedIds);
@@ -24639,11 +24639,15 @@
 
         // Update schedule item references
         // Do not replace Interstitial playingItem without a match - used for INTERSTITIAL_ASSET_ENDED and INTERSTITIAL_ENDED
+        var trimInPlaceForPlayout = null;
         if (playingItem) {
           var updatedPlayingItem = _this.updateItem(playingItem, _this.timelinePos);
           if (_this.itemsMatch(playingItem, updatedPlayingItem)) {
             _this.playingItem = updatedPlayingItem;
             _this.waitingItem = _this.endedItem = null;
+            trimInPlaceForPlayout = function trimInPlaceForPlayout() {
+              return _this.trimInPlace(updatedPlayingItem, playingItem);
+            };
           }
         } else {
           // Clear waitingItem if it has been removed from the schedule
@@ -24656,6 +24660,9 @@
           var updatedBufferingItem = _this.updateItem(bufferingItem, _this.bufferedPos);
           if (_this.itemsMatch(bufferingItem, updatedBufferingItem)) {
             _this.bufferingItem = updatedBufferingItem;
+            trimInPlaceForPlayout || (trimInPlaceForPlayout = function trimInPlaceForPlayout() {
+              return _this.trimInPlace(updatedBufferingItem, bufferingItem);
+            });
           } else if (bufferingItem.event) {
             // Interstitial removed from schedule (Live -> VOD or other scenario where Start Date is outside the range of VOD Playlist)
             _this.bufferingItem = _this.playingItem;
@@ -24679,6 +24686,9 @@
             _this.primaryFallback(playingItem.event);
             return;
           }
+          if (trimInPlaceForPlayout) {
+            trimInPlaceForPlayout();
+          }
 
           // Check is buffered to new Interstitial event boundary
           // (Live update publishes Interstitial with new segment)
@@ -25369,6 +25379,22 @@
       }
       return null;
     };
+    _proto.trimInPlace = function trimInPlace(updatedItem, itemBeforeUpdate) {
+      var _this4 = this;
+      if (this.isInterstitial(updatedItem) && updatedItem.event.appendInPlace && itemBeforeUpdate.end - updatedItem.end > 0.25) {
+        updatedItem.event.assetList.forEach(function (asset, index) {
+          if (updatedItem.event.isAssetPastPlayoutLimit(index)) {
+            _this4.clearAssetPlayer(asset.identifier, null);
+          }
+        });
+        var flushStart = updatedItem.end + 0.25;
+        var bufferInfo = BufferHelper.bufferInfo(this.primaryMedia, flushStart, 0);
+        if (bufferInfo.end > flushStart || (bufferInfo.nextStart || 0) > flushStart) {
+          this.attachPrimary(flushStart, null);
+          this.flushFrontBuffer(flushStart);
+        }
+      }
+    };
     _proto.itemsMatch = function itemsMatch(a, b) {
       return !!b && (a === b || a.event && b.event && this.eventItemsMatch(a, b) || !a.event && !b.event && this.findItemIndex(a) === this.findItemIndex(b));
     };
@@ -25446,18 +25472,18 @@
       }
     };
     _proto.assetsBuffered = function assetsBuffered(item, media) {
-      var _this4 = this;
+      var _this5 = this;
       var assetList = item.event.assetList;
       if (assetList.length === 0) {
         return false;
       }
       return !item.event.assetList.some(function (asset) {
-        var player = _this4.getAssetPlayer(asset.identifier);
+        var player = _this5.getAssetPlayer(asset.identifier);
         return !(player != null && player.bufferedInPlaceToEnd(media));
       });
     };
     _proto.setBufferingItem = function setBufferingItem(item) {
-      var _this5 = this;
+      var _this6 = this;
       var bufferingLast = this.bufferingItem;
       var schedule = this.schedule;
       if (!this.itemsMatch(item, bufferingLast)) {
@@ -25476,7 +25502,7 @@
           if (isInterstitial) {
             // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
             item.event.assetList.forEach(function (asset) {
-              var player = _this5.getAssetPlayer(asset.identifier);
+              var player = _this6.getAssetPlayer(asset.identifier);
               if (player) {
                 player.resumeBuffering();
               }
@@ -25599,7 +25625,7 @@
       return null;
     };
     _proto.flushFrontBuffer = function flushFrontBuffer(startOffset) {
-      var _this6 = this;
+      var _this7 = this;
       // Force queued flushing of all buffers
       var requiredTracks = this.requiredTracks;
       if (!requiredTracks) {
@@ -25608,7 +25634,7 @@
       this.log("Removing front buffer starting at " + startOffset);
       var sourceBufferNames = Object.keys(requiredTracks);
       sourceBufferNames.forEach(function (type) {
-        _this6.hls.trigger(Events.BUFFER_FLUSHING, {
+        _this7.hls.trigger(Events.BUFFER_FLUSHING, {
           startOffset: startOffset,
           endOffset: Infinity,
           type: type
@@ -25655,7 +25681,7 @@
       return this.createAssetPlayer(interstitial, assetItem, assetListIndex);
     };
     _proto.createAssetPlayer = function createAssetPlayer(interstitial, assetItem, assetListIndex) {
-      var _this7 = this;
+      var _this8 = this;
       this.log("create HLSAssetPlayer for " + eventAssetToString(assetItem));
       var primary = this.hls;
       var userConfig = primary.userConfig;
@@ -25725,17 +25751,17 @@
             details: ErrorDetails.INTERSTITIAL_ASSET_ITEM_ERROR,
             error: error
           };
-          _this7.handleAssetItemError(errorData, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
+          _this8.handleAssetItemError(errorData, interstitial, _this8.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
           return;
         }
         // Get time at end of last fragment
         var duration = details.edge - details.fragmentStart;
         var currentAssetDuration = assetItem.duration;
         if (currentAssetDuration === null || duration > currentAssetDuration) {
-          _this7.log("Interstitial asset \"" + assetId + "\" duration change " + currentAssetDuration + " > " + duration);
+          _this8.log("Interstitial asset \"" + assetId + "\" duration change " + currentAssetDuration + " > " + duration);
           assetItem.duration = duration;
           // Update schedule with new event and asset duration
-          _this7.updateSchedule();
+          _this8.updateSchedule();
         }
       };
       player.on(Events.LEVEL_UPDATED, function (event, _ref) {
@@ -25747,37 +25773,37 @@
         return updateAssetPlayerDetails(details);
       });
       var _onBufferCodecs = function onBufferCodecs(event, data) {
-        var inQueuPlayer = _this7.getAssetPlayer(assetId);
+        var inQueuPlayer = _this8.getAssetPlayer(assetId);
         if (inQueuPlayer && data.tracks) {
           inQueuPlayer.off(Events.BUFFER_CODECS, _onBufferCodecs);
           inQueuPlayer.tracks = data.tracks;
-          var media = _this7.primaryMedia;
-          if (_this7.bufferingAsset === inQueuPlayer.assetItem && media && !inQueuPlayer.media) {
-            _this7.bufferAssetPlayer(inQueuPlayer, media);
+          var media = _this8.primaryMedia;
+          if (_this8.bufferingAsset === inQueuPlayer.assetItem && media && !inQueuPlayer.media) {
+            _this8.bufferAssetPlayer(inQueuPlayer, media);
           }
         }
       };
       player.on(Events.BUFFER_CODECS, _onBufferCodecs);
       var bufferedToEnd = function bufferedToEnd() {
-        var _this7$schedule$items;
-        var inQueuPlayer = _this7.getAssetPlayer(assetId);
-        _this7.log("buffered to end of asset " + inQueuPlayer);
+        var _this8$schedule$items;
+        var inQueuPlayer = _this8.getAssetPlayer(assetId);
+        _this8.log("buffered to end of asset " + inQueuPlayer);
         if (!inQueuPlayer) {
           return;
         }
         // Preload at end of asset
-        var scheduleIndex = _this7.schedule.findEventIndex(interstitial.identifier);
+        var scheduleIndex = _this8.schedule.findEventIndex(interstitial.identifier);
         var assetListIndex = interstitial.findAssetIndex(assetItem);
         var nextAssetIndex = assetListIndex + 1;
-        var item = (_this7$schedule$items = _this7.schedule.items) == null ? void 0 : _this7$schedule$items[scheduleIndex];
-        if (_this7.isInterstitial(item)) {
+        var item = (_this8$schedule$items = _this8.schedule.items) == null ? void 0 : _this8$schedule$items[scheduleIndex];
+        if (_this8.isInterstitial(item)) {
           if (assetListIndex !== -1 && !interstitial.isAssetPastPlayoutLimit(nextAssetIndex) && !interstitial.assetList[nextAssetIndex].error) {
-            _this7.bufferedToItem(item, nextAssetIndex);
+            _this8.bufferedToItem(item, nextAssetIndex);
           } else {
-            var _this7$schedule$items2;
-            var nextItem = (_this7$schedule$items2 = _this7.schedule.items) == null ? void 0 : _this7$schedule$items2[scheduleIndex + 1];
+            var _this8$schedule$items2;
+            var nextItem = (_this8$schedule$items2 = _this8.schedule.items) == null ? void 0 : _this8$schedule$items2[scheduleIndex + 1];
             if (nextItem) {
-              _this7.bufferedToItem(nextItem);
+              _this8.bufferedToItem(nextItem);
             }
           }
         }
@@ -25785,38 +25811,38 @@
       player.on(Events.BUFFERED_TO_END, bufferedToEnd);
       var endedWithAssetIndex = function endedWithAssetIndex(assetIndex) {
         return function () {
-          var inQueuPlayer = _this7.getAssetPlayer(assetId);
+          var inQueuPlayer = _this8.getAssetPlayer(assetId);
           if (!inQueuPlayer) {
             return;
           }
-          _this7.shouldPlay = true;
-          var scheduleIndex = _this7.schedule.findEventIndex(interstitial.identifier);
-          _this7.advanceAfterAssetEnded(interstitial, scheduleIndex, assetIndex);
+          _this8.shouldPlay = true;
+          var scheduleIndex = _this8.schedule.findEventIndex(interstitial.identifier);
+          _this8.advanceAfterAssetEnded(interstitial, scheduleIndex, assetIndex);
         };
       };
       player.once(Events.MEDIA_ENDED, endedWithAssetIndex(assetListIndex));
       player.once(Events.PLAYOUT_LIMIT_REACHED, endedWithAssetIndex(Infinity));
       player.on(Events.ERROR, function (event, data) {
-        var inQueuPlayer = _this7.getAssetPlayer(assetId);
+        var inQueuPlayer = _this8.getAssetPlayer(assetId);
         if (data.details === ErrorDetails.BUFFER_STALLED_ERROR) {
           if (inQueuPlayer != null && inQueuPlayer.media) {
             var assetCurrentTime = inQueuPlayer.currentTime;
             var distanceFromEnd = inQueuPlayer.duration - assetCurrentTime;
             if (assetCurrentTime && interstitial.appendInPlace && distanceFromEnd / inQueuPlayer.media.playbackRate < 0.5) {
-              _this7.log("Advancing buffer past end of asset " + assetId + " " + interstitial + " at " + inQueuPlayer.media.currentTime);
+              _this8.log("Advancing buffer past end of asset " + assetId + " " + interstitial + " at " + inQueuPlayer.media.currentTime);
               bufferedToEnd();
             } else {
-              _this7.warn("Stalled at " + assetCurrentTime + " of " + (assetCurrentTime + distanceFromEnd) + " in asset " + assetId + " " + interstitial);
-              _this7.onTimeupdate();
-              _this7.checkBuffer(true);
+              _this8.warn("Stalled at " + assetCurrentTime + " of " + (assetCurrentTime + distanceFromEnd) + " in asset " + assetId + " " + interstitial);
+              _this8.onTimeupdate();
+              _this8.checkBuffer(true);
             }
           }
           return;
         }
-        _this7.handleAssetItemError(data, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
+        _this8.handleAssetItemError(data, interstitial, _this8.schedule.findEventIndex(interstitial.identifier), assetListIndex, "Asset player error " + data.error + " " + interstitial);
       });
       player.on(Events.DESTROYING, function () {
-        var inQueuPlayer = _this7.getAssetPlayer(assetId);
+        var inQueuPlayer = _this8.getAssetPlayer(assetId);
         if (!inQueuPlayer) {
           return;
         }
@@ -25827,7 +25853,7 @@
           details: ErrorDetails.INTERSTITIAL_ASSET_ITEM_ERROR,
           error: error
         };
-        _this7.handleAssetItemError(errorData, interstitial, _this7.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
+        _this8.handleAssetItemError(errorData, interstitial, _this8.schedule.findEventIndex(interstitial.identifier), assetListIndex, error.message);
       });
       this.hls.trigger(Events.INTERSTITIAL_ASSET_PLAYER_CREATED, {
         asset: assetItem,
@@ -25838,9 +25864,9 @@
       return player;
     };
     _proto.clearInterstitial = function clearInterstitial(interstitial, toSegment) {
-      var _this8 = this;
+      var _this9 = this;
       interstitial.assetList.forEach(function (asset) {
-        _this8.clearAssetPlayer(asset.identifier, toSegment);
+        _this9.clearAssetPlayer(asset.identifier, toSegment);
       });
       // Remove asset list and resolved duration
       interstitial.reset();
@@ -25985,10 +26011,6 @@
       this.updateSchedule();
       if (playingItem) {
         this.log("Fallback to primary from event \"" + interstitial.identifier + "\" start: " + flushStart + " pos: " + this.timelinePos + " playing: " + (playingItem ? segmentToString(playingItem) : '<none>') + " error: " + interstitial.error);
-        if (interstitial.appendInPlace) {
-          this.attachPrimary(flushStart, null);
-          this.flushFrontBuffer(flushStart);
-        }
         var timelinePos = this.timelinePos;
         if (timelinePos === -1) {
           timelinePos = this.hls.startPosition;
@@ -26000,6 +26022,10 @@
         } else {
           this.clearInterstitial(interstitial, null);
         }
+        if (interstitial.appendInPlace) {
+          this.attachPrimary(flushStart, null);
+          this.flushFrontBuffer(flushStart);
+        }
       } else {
         this.checkStart();
       }
@@ -26008,7 +26034,7 @@
     // Asset List loading
     ;
     _proto.onAssetListLoaded = function onAssetListLoaded(event, data) {
-      var _this9 = this,
+      var _this0 = this,
         _this$bufferingItem;
       var interstitial = data.event;
       var interstitialId = interstitial.identifier;
@@ -26022,7 +26048,7 @@
       var sumDuration = 0;
       assets.forEach(function (asset, assetListIndex) {
         var duration = parseFloat(asset.DURATION);
-        _this9.createAsset(interstitial, assetListIndex, sumDuration, eventStart + sumDuration, duration, asset.URI);
+        _this0.createAsset(interstitial, assetListIndex, sumDuration, eventStart + sumDuration, duration, asset.URI);
         sumDuration += duration;
       });
       interstitial.duration = sumDuration;

package/dist/hls.js.d.ts

@@ -2446,6 +2446,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private onMediaEnded;
     private onScheduleUpdate;
     private updateItem;
+    private trimInPlace;
     private itemsMatch;
     private eventItemsMatch;
     private findItemIndex;