hls.js 1.6.0-beta.3.0.canary.10986 → 1.6.0-beta.3.0.canary.10989

package/dist/hls.js

@@ -1059,7 +1059,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.0-beta.3.0.canary.10986");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.3.0.canary.10989");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16413,7 +16413,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.3.0.canary.10986";
+  var version = "1.6.0-beta.3.0.canary.10989";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -22981,8 +22981,16 @@
     };
     _proto.reset = function reset() {
       var _this$assetListLoader;
+      this.appendInPlaceStarted = false;
       (_this$assetListLoader = this.assetListLoader) == null ? void 0 : _this$assetListLoader.destroy();
-      this.assetListLoader = this.error = undefined;
+      this.assetListLoader = undefined;
+      if (!this.supplementsPrimary) {
+        this.assetListResponse = null;
+        this.assetList = [];
+        this._duration = null;
+      }
+      // `error?` is reset when seeking back over interstitial `startOffset`
+      //  using `schedule.resetErrorsInRange(start, end)`.
     };
     _proto.isAssetPastPlayoutLimit = function isAssetPastPlayoutLimit(assetIndex) {
       if (assetIndex >= this.assetList.length) {
@@ -23377,6 +23385,18 @@
       }
       this.events = this.items = null;
     };
+    _proto.resetErrorsInRange = function resetErrorsInRange(start, end) {
+      if (this.events) {
+        return this.events.reduce(function (count, interstitial) {
+          if (start <= interstitial.startOffset && end > interstitial.startOffset) {
+            delete interstitial.error;
+            return count + 1;
+          }
+          return count;
+        }, 0);
+      }
+      return 0;
+    };
     _proto.getEvent = function getEvent(identifier) {
       return identifier ? this.eventMap[identifier] || null : null;
     };
@@ -24023,13 +24043,20 @@
         var backwardSeek = diff <= -0.01;
         _this.timelinePos = currentTime;
         _this.bufferedPos = currentTime;
-        _this.checkBuffer();
 
         // Check if seeking out of an item
         var playingItem = _this.playingItem;
         if (!playingItem) {
+          _this.checkBuffer();
           return;
         }
+        if (backwardSeek) {
+          var resetCount = _this.schedule.resetErrorsInRange(currentTime, currentTime - diff);
+          if (resetCount) {
+            _this.updateSchedule();
+          }
+        }
+        _this.checkBuffer();
         if (backwardSeek && currentTime < playingItem.start || currentTime >= playingItem.end) {
           var _this$media;
           var scheduleIndex = _this.schedule.findItemIndexAtTime(_this.timelinePos);
@@ -24079,10 +24106,10 @@
         // Only allow timeupdate to advance primary position, seeking is used for jumping back
         // this prevents primaryPos from being reset to 0 after re-attach
         if (currentTime > _this.timelinePos) {
+          _this.timelinePos = currentTime;
           if (currentTime > _this.bufferedPos) {
             _this.checkBuffer();
           }
-          _this.timelinePos = currentTime;
         } else {
           return;
         }
@@ -24168,7 +24195,7 @@
             _this.bufferingItem = updatedBufferingItem;
           } 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 = null;
+            _this.bufferingItem = _this.playingItem;
             _this.clearInterstitial(bufferingItem.event, null);
           }
         }
@@ -24473,6 +24500,7 @@
           var resumptionTime = interstitial.resumeTime;
           if (this.timelinePos < resumptionTime) {
             this.timelinePos = resumptionTime;
+            this.checkBuffer();
           }
           this.setSchedulePosition(nextIndex);
         }
@@ -24533,7 +24561,6 @@
             scheduleIndex: index
           });
           // Exiting an Interstitial
-          this.clearInterstitial(interstitial, scheduledItem);
           if (interstitial.cue.once) {
             // Remove interstitial with CUE attribute value of ONCE after it has played
             this.updateSchedule();
@@ -24702,7 +24729,7 @@
       if (item) {
         this.setBufferingItem(item);
       } else {
-        this.bufferingItem = null;
+        this.bufferingItem = this.playingItem;
       }
       this.bufferingAsset = null;
       var media = this.primaryMedia;
@@ -24937,7 +24964,7 @@
         var timeRemaining = bufferingPlayer ? bufferingPlayer.remaining : bufferingLast ? bufferingLast.end - this.timelinePos : 0;
         this.log("buffered to boundary " + segmentToString(item) + (bufferingLast ? " (" + timeRemaining.toFixed(2) + " remaining)" : ''));
         this.bufferingItem = item;
-        this.bufferedPos = item.start;
+        this.bufferedPos = Math.max(item.start, Math.min(item.end, this.timelinePos));
         if (!this.playbackDisabled) {
           if (isInterstitial) {
             // primary fragment loading will exit early in base-stream-controller while `bufferingItem` is set to an Interstitial block
@@ -25036,7 +25063,6 @@
             liveStartPosition = this.hls.liveSyncPosition || 0;
           }
         }
-        interstitial.assetListResponse = null;
         var assetListLoader = this.assetListLoader.loadAssetList(interstitial, liveStartPosition);
         if (assetListLoader) {
           interstitial.assetListLoader = assetListLoader;
@@ -25280,7 +25306,8 @@
       interstitial.assetList.forEach(function (asset) {
         _this6.clearAssetPlayer(asset.identifier, toSegment);
       });
-      interstitial.appendInPlaceStarted = false;
+      // Remove asset list and resolved duration
+      interstitial.reset();
     };
     _proto.clearAssetPlayer = function clearAssetPlayer(assetId, toSegment) {
       var playerIndex = this.getAssetPlayerQueueIndex(assetId);
@@ -25568,8 +25595,9 @@
             var playingItem = c.effectivePlayingItem;
             var targetIndex = c.schedule.findItemIndexAtTime(time, timelineType);
             var targetItem = (_c$schedule$items2 = c.schedule.items) == null ? void 0 : _c$schedule$items2[targetIndex];
-            var playingInterstitial = playingItem == null ? void 0 : playingItem.event;
-            var appendInPlace = playingInterstitial == null ? void 0 : playingInterstitial.appendInPlace;
+            var bufferingPlayer = c.getBufferingPlayer();
+            var bufferingInterstitial = bufferingPlayer == null ? void 0 : bufferingPlayer.interstitial;
+            var appendInPlace = bufferingInterstitial == null ? void 0 : bufferingInterstitial.appendInPlace;
             var seekInItem = playingItem && c.itemsMatch(playingItem, targetItem);
             if (playingItem && (appendInPlace || seekInItem)) {
               // seek in asset player or primary media (appendInPlace)
@@ -25594,8 +25622,8 @@
                 _seekToTime = targetItem.start + _diff;
               }
               var targetIsPrimary = !c.isInterstitial(targetItem);
-              if (!c.isInterstitial(playingItem) && (targetIsPrimary || targetItem.event.appendInPlace)) {
-                var _media2 = c.hls.media;
+              if ((!c.isInterstitial(playingItem) || playingItem.event.appendInPlace) && (targetIsPrimary || targetItem.event.appendInPlace)) {
+                var _media2 = c.media || (appendInPlace ? bufferingPlayer == null ? void 0 : bufferingPlayer.media : null);
                 if (_media2) {
                   _media2.currentTime = _seekToTime;
                 }
@@ -25612,6 +25640,7 @@
                 var assetIndex = 0;
                 if (targetIsPrimary) {
                   c.timelinePos = _seekToTime;
+                  c.checkBuffer();
                 } else {
                   var _targetItem$event;
                   var assetList = targetItem == null ? void 0 : (_targetItem$event = targetItem.event) == null ? void 0 : _targetItem$event.assetList;