hls.js 1.6.0-rc.1.0.canary.11079 → 1.6.0-rc.1.0.canary.11080

package/dist/hls.light.js

@@ -1044,7 +1044,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-rc.1.0.canary.11079");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-rc.1.0.canary.11080");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -5909,18 +5909,10 @@
         return type && !((_this16$tracks$type = _this16.tracks[type]) != null && _this16$tracks$type.ended);
       });
       if (allTracksEnding) {
-        this.log("Queueing EOS");
-        this.blockUntilOpen(function () {
-          _this16.sourceBuffers.forEach(function (_ref7) {
-            var type = _ref7[0];
-            if (type !== null) {
-              var track = _this16.tracks[type];
-              if (track) {
-                track.ending = false;
-              }
-            }
-          });
-          if (allowEndOfStream) {
+        if (allowEndOfStream) {
+          this.log("Queueing EOS");
+          this.blockUntilOpen(function () {
+            _this16.tracksEnded();
             var mediaSource = _this16.mediaSource;
             if (!mediaSource || mediaSource.readyState !== 'open') {
               if (mediaSource) {
@@ -5931,11 +5923,26 @@
             _this16.log("Calling mediaSource.endOfStream()");
             // Allow this to throw and be caught by the enqueueing function
             mediaSource.endOfStream();
-          }
-          _this16.hls.trigger(Events.BUFFERED_TO_END, undefined);
-        });
+            _this16.hls.trigger(Events.BUFFERED_TO_END, undefined);
+          });
+        } else {
+          this.tracksEnded();
+          this.hls.trigger(Events.BUFFERED_TO_END, undefined);
+        }
       }
     };
+    _proto.tracksEnded = function tracksEnded() {
+      var _this17 = this;
+      this.sourceBuffers.forEach(function (_ref7) {
+        var type = _ref7[0];
+        if (type !== null) {
+          var track = _this17.tracks[type];
+          if (track) {
+            track.ending = false;
+          }
+        }
+      });
+    };
     _proto.onLevelUpdated = function onLevelUpdated(event, _ref8) {
       var details = _ref8.details;
       if (!details.fragments.length) {
@@ -5945,13 +5952,13 @@
       this.updateDuration();
     };
     _proto.updateDuration = function updateDuration() {
-      var _this17 = this;
+      var _this18 = this;
       var durationAndRange = this.getDurationAndRange();
       if (!durationAndRange) {
         return;
       }
       this.blockUntilOpen(function () {
-        return _this17.updateMediaSource(durationAndRange);
+        return _this18.updateMediaSource(durationAndRange);
       });
     };
     _proto.onError = function onError(event, data) {
@@ -5999,7 +6006,7 @@
       }
     };
     _proto.flushBackBuffer = function flushBackBuffer(currentTime, targetDuration, targetBackBufferPosition) {
-      var _this18 = this;
+      var _this19 = this;
       this.sourceBuffers.forEach(function (_ref9) {
         var type = _ref9[0],
           sb = _ref9[1];
@@ -6007,22 +6014,22 @@
           var buffered = BufferHelper.getBuffered(sb);
           // when target buffer start exceeds actual buffer start
           if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) {
-            var _this18$details;
-            _this18.hls.trigger(Events.BACK_BUFFER_REACHED, {
+            var _this19$details;
+            _this19.hls.trigger(Events.BACK_BUFFER_REACHED, {
               bufferEnd: targetBackBufferPosition
             });
 
             // Support for deprecated event:
-            var track = _this18.tracks[type];
-            if ((_this18$details = _this18.details) != null && _this18$details.live) {
-              _this18.hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
+            var track = _this19.tracks[type];
+            if ((_this19$details = _this19.details) != null && _this19$details.live) {
+              _this19.hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
                 bufferEnd: targetBackBufferPosition
               });
             } else if (track != null && track.ended) {
-              _this18.log("Cannot flush " + type + " back buffer while SourceBuffer is in ended state");
+              _this19.log("Cannot flush " + type + " back buffer while SourceBuffer is in ended state");
               return;
             }
-            _this18.hls.trigger(Events.BUFFER_FLUSHING, {
+            _this19.hls.trigger(Events.BUFFER_FLUSHING, {
               startOffset: 0,
               endOffset: targetBackBufferPosition,
               type: type
@@ -6032,7 +6039,7 @@
       });
     };
     _proto.flushFrontBuffer = function flushFrontBuffer(currentTime, targetDuration, targetFrontBufferPosition) {
-      var _this19 = this;
+      var _this20 = this;
       this.sourceBuffers.forEach(function (_ref10) {
         var type = _ref10[0],
           sb = _ref10[1];
@@ -6049,7 +6056,7 @@
           if (targetFrontBufferPosition > bufferStart || currentTime >= bufferStart && currentTime <= bufferEnd) {
             return;
           }
-          _this19.hls.trigger(Events.BUFFER_FLUSHING, {
+          _this20.hls.trigger(Events.BUFFER_FLUSHING, {
             startOffset: bufferStart,
             endOffset: Infinity,
             type: type
@@ -6144,14 +6151,14 @@
       }
     };
     _proto.bufferCreated = function bufferCreated() {
-      var _this20 = this;
+      var _this21 = this;
       if (this.sourceBufferCount) {
         var tracks = {};
         this.sourceBuffers.forEach(function (_ref12) {
           var type = _ref12[0],
             buffer = _ref12[1];
           if (type) {
-            var track = _this20.tracks[type];
+            var track = _this21.tracks[type];
             tracks[type] = {
               buffer: buffer,
               container: track.container,
@@ -6169,7 +6176,7 @@
         this.log("SourceBuffers created. Running queue: " + this.operationQueue);
         this.sourceBuffers.forEach(function (_ref13) {
           var type = _ref13[0];
-          _this20.executeNext(type);
+          _this21.executeNext(type);
         });
       } else {
         var error = new Error('could not create source buffer for media codec(s)');
@@ -6243,7 +6250,7 @@
       return '';
     };
     _proto.trackSourceBuffer = function trackSourceBuffer(type, track) {
-      var _this21 = this;
+      var _this22 = this;
       var buffer = track.buffer;
       if (!buffer) {
         return;
@@ -6269,7 +6276,7 @@
           // If media was ejected check for a change. Added ranges are redundant with changes on 'updateend' event.
           var removedRanges = event.removedRanges;
           if (removedRanges != null && removedRanges.length) {
-            _this21.hls.trigger(Events.BUFFER_FLUSHED, {
+            _this22.hls.trigger(Events.BUFFER_FLUSHED, {
               type: type
             });
           }
@@ -6369,10 +6376,10 @@
       });
     };
     _proto.isQueued = function isQueued() {
-      var _this22 = this;
+      var _this23 = this;
       return this.sourceBuffers.some(function (_ref15) {
         var type = _ref15[0];
-        return type && !!_this22.currentOp(type);
+        return type && !!_this23.currentOp(type);
       });
     };
     _proto.isPending = function isPending(track) {
@@ -6384,7 +6391,7 @@
     // upon completion, since we already do it here
     ;
     _proto.blockBuffers = function blockBuffers(onUnblocked, bufferNames) {
-      var _this23 = this;
+      var _this24 = this;
       if (bufferNames === void 0) {
         bufferNames = this.sourceBufferTypes;
       }
@@ -6397,33 +6404,33 @@
 
       // logger.debug(`[buffer-controller]: Blocking ${buffers} SourceBuffer`);
       var blockingOperations = bufferNames.map(function (type) {
-        return _this23.appendBlocker(type);
+        return _this24.appendBlocker(type);
       });
       var audioBlocked = bufferNames.length > 1 && !!this.blockedAudioAppend;
       if (audioBlocked) {
         this.unblockAudio();
       }
       Promise.all(blockingOperations).then(function (result) {
-        if (operationQueue !== _this23.operationQueue) {
+        if (operationQueue !== _this24.operationQueue) {
           return;
         }
         // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
         onUnblocked();
-        _this23.stepOperationQueue(bufferNames);
+        _this24.stepOperationQueue(bufferNames);
       });
     };
     _proto.stepOperationQueue = function stepOperationQueue(bufferNames) {
-      var _this24 = this;
+      var _this25 = this;
       bufferNames.forEach(function (type) {
-        var _this24$tracks$type;
-        var sb = (_this24$tracks$type = _this24.tracks[type]) == null ? void 0 : _this24$tracks$type.buffer;
+        var _this25$tracks$type;
+        var sb = (_this25$tracks$type = _this25.tracks[type]) == null ? void 0 : _this25$tracks$type.buffer;
         // Only cycle the queue if the SB is not updating. There's a bug in Chrome which sets the SB updating flag to
         // true when changing the MediaSource duration (https://bugs.chromium.org/p/chromium/issues/detail?id=959359&can=2&q=mediasource%20duration)
         // While this is a workaround, it's probably useful to have around
         if (!sb || sb.updating) {
           return;
         }
-        _this24.shiftAndExecuteNext(type);
+        _this25.shiftAndExecuteNext(type);
       });
     };
     _proto.append = function append(operation, type, pending) {
@@ -6492,9 +6499,9 @@
     }, {
       key: "sourceBufferTracks",
       get: function get() {
-        var _this25 = this;
+        var _this26 = this;
         return Object.keys(this.tracks).reduce(function (baseTracks, type) {
-          var track = _this25.tracks[type];
+          var track = _this26.tracks[type];
           baseTracks[type] = {
             id: track.id,
             container: track.container,
@@ -6507,11 +6514,11 @@
     }, {
       key: "bufferedToEnd",
       get: function get() {
-        var _this26 = this;
+        var _this27 = this;
         return this.sourceBufferCount > 0 && !this.sourceBuffers.some(function (_ref16) {
-          var _this26$tracks$type, _this26$tracks$type2;
+          var _this27$tracks$type, _this27$tracks$type2;
           var type = _ref16[0];
-          return type && (!((_this26$tracks$type = _this26.tracks[type]) != null && _this26$tracks$type.ended) || ((_this26$tracks$type2 = _this26.tracks[type]) == null ? void 0 : _this26$tracks$type2.ending));
+          return type && (!((_this27$tracks$type = _this27.tracks[type]) != null && _this27$tracks$type.ended) || ((_this27$tracks$type2 = _this27.tracks[type]) == null ? void 0 : _this27$tracks$type2.ending));
         });
       }
     }, {
@@ -6530,9 +6537,9 @@
     }, {
       key: "pendingTrackCount",
       get: function get() {
-        var _this27 = this;
+        var _this28 = this;
         return Object.keys(this.tracks).reduce(function (acc, type) {
-          return acc + (_this27.isPending(_this27.tracks[type]) ? 1 : 0);
+          return acc + (_this28.isPending(_this28.tracks[type]) ? 1 : 0);
         }, 0);
       }
     }, {
@@ -17416,8 +17423,8 @@
         var end = this.loadingParts ? levelDetails.partEnd : levelDetails.fragmentEnd;
         frag = this.getFragmentAtPosition(pos, end, levelDetails);
       }
-      frag = this.filterReplacedPrimary(frag, levelDetails);
-      return this.mapToInitFragWhenRequired(frag);
+      var programFrag = this.filterReplacedPrimary(frag, levelDetails);
+      return this.mapToInitFragWhenRequired(programFrag);
     };
     _proto.isLoopLoading = function isLoopLoading(frag, targetBufferTime) {
       var trackerState = this.fragmentTracker.getState(frag);
@@ -17448,7 +17455,7 @@
       if (!frag) {
         return frag;
       }
-      this.hls.config;
+      if (interstitialsEnabled(this.hls.config)) ;
       return frag;
     };
     _proto.mapToInitFragWhenRequired = function mapToInitFragWhenRequired(frag) {
@@ -17610,6 +17617,7 @@
       if (startPosition < sliding) {
         startPosition = -1;
       }
+      var timelineOffset = this.timelineOffset;
       if (startPosition === -1) {
         // Use Playlist EXT-X-START:TIME-OFFSET when set
         // Prioritize Multivariant Playlist offset so that main, audio, and subtitle stream-controller start times match
@@ -17633,9 +17641,9 @@
           this.log("setting startPosition to 0 by default");
           this.startPosition = startPosition = 0;
         }
-        this.lastCurrentTime = startPosition;
+        this.lastCurrentTime = startPosition + timelineOffset;
       }
-      this.nextLoadPosition = startPosition;
+      this.nextLoadPosition = startPosition + timelineOffset;
     };
     _proto.getLoadPosition = function getLoadPosition() {
       var _this$hls;
@@ -17932,6 +17940,22 @@
           state: this.state
         };
       }
+    }, {
+      key: "timelineOffset",
+      get: function get() {
+        var configuredTimelineOffset = this.config.timelineOffset;
+        if (configuredTimelineOffset) {
+          var _this$getLevelDetails;
+          return ((_this$getLevelDetails = this.getLevelDetails()) == null ? void 0 : _this$getLevelDetails.appliedTimelineOffset) || configuredTimelineOffset;
+        }
+        return 0;
+      }
+    }, {
+      key: "primaryPrefetch",
+      get: function get() {
+        if (interstitialsEnabled(this.hls.config)) ;
+        return false;
+      }
     }, {
       key: "state",
       get: function get() {
@@ -17946,6 +17970,9 @@
       }
     }]);
   }(TaskLoop);
+  function interstitialsEnabled(config) {
+    return false;
+  }
 
   function addEventListener(el, type, listener) {
     removeEventListener(el, type, listener);
@@ -20262,7 +20289,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-rc.1.0.canary.11079";
+  var version = "1.6.0-rc.1.0.canary.11080";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -20775,7 +20802,7 @@
           startPosition = lastCurrentTime;
         }
         this.state = State.IDLE;
-        this.nextLoadPosition = this.lastCurrentTime = startPosition;
+        this.nextLoadPosition = this.lastCurrentTime = startPosition + this.timelineOffset;
         this.startPosition = skipSeekToStartPosition ? -1 : startPosition;
         this.tick();
       } else {
@@ -20845,7 +20872,7 @@
       // if start level not parsed yet OR
       // if video not attached AND start fragment already requested OR start frag prefetch not enabled
       // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
-      if (levelLastLoaded === null || !media && (this.startFragRequested || !hls.config.startFragPrefetch)) {
+      if (levelLastLoaded === null || !media && !this.primaryPrefetch && (this.startFragRequested || !hls.config.startFragPrefetch)) {
         return;
       }
 
@@ -21454,11 +21481,11 @@
         }
 
         // Offset start position by timeline offset
-        var details = this.getLevelDetails();
-        var configuredTimelineOffset = this.config.timelineOffset;
-        if (configuredTimelineOffset && startPosition) {
-          startPosition += (details == null ? void 0 : details.appliedTimelineOffset) || configuredTimelineOffset;
+        var timelineOffset = this.timelineOffset;
+        if (timelineOffset && startPosition) {
+          startPosition += timelineOffset;
         }
+        var details = this.getLevelDetails();
         var buffered = BufferHelper.getBuffered(media);
         var bufferStart = buffered.length ? buffered.start(0) : 0;
         var delta = bufferStart - startPosition;