hls.js 1.5.12-0.canary.10366 → 1.5.12-0.canary.10367

package/dist/hls.light.js

@@ -493,7 +493,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.5.12-0.canary.10366");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.12-0.canary.10367");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3713,10 +3713,9 @@
         level = context.level,
         type = context.type;
       var url = getResponseUrl(response, context);
-      var levelUrlId = 0;
       var levelId = isFiniteNumber(level) ? level : isFiniteNumber(id) ? id : 0;
       var levelType = mapContextToLevelType(context);
-      var levelDetails = M3U8Parser.parseLevelPlaylist(response.data, url, levelId, levelType, levelUrlId, this.variableList);
+      var levelDetails = M3U8Parser.parseLevelPlaylist(response.data, url, levelId, levelType, 0, this.variableList);
 
       // We have done our first request (Manifest-type) and receive
       // not a master playlist but a chunk-list (track/level)
@@ -5504,8 +5503,7 @@
     }
     return Math.round(reloadInterval);
   }
-  function getFragmentWithSN(level, sn, fragCurrent) {
-    var details = level == null ? void 0 : level.details;
+  function getFragmentWithSN(details, sn, fragCurrent) {
     if (!details) {
       return null;
     }
@@ -5522,12 +5520,11 @@
     }
     return null;
   }
-  function getPartWith(level, sn, partIndex) {
-    var _level$details;
-    if (!(level != null && level.details)) {
+  function getPartWith(details, sn, partIndex) {
+    if (!details) {
       return null;
     }
-    return findPart((_level$details = level.details) == null ? void 0 : _level$details.partList, sn, partIndex);
+    return findPart(details.partList, sn, partIndex);
   }
   function findPart(partList, sn, partIndex) {
     if (partList) {
@@ -5678,12 +5675,15 @@
     }
     var fragNext = null;
     if (fragPrevious) {
-      fragNext = fragments[fragPrevious.sn - fragments[0].sn + 1] || null;
+      fragNext = fragments[1 + fragPrevious.sn - fragments[0].sn] || null;
       // check for buffer-end rounding error
       var bufferEdgeError = fragPrevious.endDTS - bufferEnd;
       if (bufferEdgeError > 0 && bufferEdgeError < 0.0000015) {
         bufferEnd += 0.0000015;
       }
+      if (fragNext && fragPrevious.level !== fragNext.level && fragNext.end <= fragPrevious.end) {
+        fragNext = fragments[2 + fragPrevious.sn - fragments[0].sn] || null;
+      }
     } else if (bufferEnd === 0 && fragments[0].start === 0) {
       fragNext = fragments[0];
     }
@@ -5845,7 +5845,7 @@
       this.playlistError = 0;
     };
     _proto.onError = function onError(event, data) {
-      var _data$frag, _data$level;
+      var _data$frag;
       if (data.fatal) {
         return;
       }
@@ -5861,10 +5861,7 @@
         case ErrorDetails.FRAG_PARSING_ERROR:
           // ignore empty segment errors marked as gap
           if ((_data$frag = data.frag) != null && _data$frag.gap) {
-            data.errorAction = {
-              action: NetworkErrorAction.DoNothing,
-              flags: ErrorActionFlags.None
-            };
+            data.errorAction = createDoNothingErrorAction();
             return;
           }
         // falls through
@@ -5931,7 +5928,11 @@
         case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
         case ErrorDetails.REMUX_ALLOC_ERROR:
         case ErrorDetails.BUFFER_APPEND_ERROR:
-          data.errorAction = this.getLevelSwitchAction(data, (_data$level = data.level) != null ? _data$level : hls.loadLevel);
+          // Buffer-controller can set errorAction when append errors can be ignored or resolved locally
+          if (!data.errorAction) {
+            var _data$level;
+            data.errorAction = this.getLevelSwitchAction(data, (_data$level = data.level) != null ? _data$level : hls.loadLevel);
+          }
           return;
         case ErrorDetails.INTERNAL_EXCEPTION:
         case ErrorDetails.BUFFER_APPENDING_ERROR:
@@ -5940,10 +5941,7 @@
         case ErrorDetails.BUFFER_STALLED_ERROR:
         case ErrorDetails.BUFFER_SEEK_OVER_HOLE:
         case ErrorDetails.BUFFER_NUDGE_ON_STALL:
-          data.errorAction = {
-            action: NetworkErrorAction.DoNothing,
-            flags: ErrorActionFlags.None
-          };
+          data.errorAction = createDoNothingErrorAction();
           return;
       }
       if (data.type === ErrorTypes.KEY_SYSTEM_ERROR) {
@@ -6162,6 +6160,13 @@
     };
     return ErrorController;
   }(Logger);
+  function createDoNothingErrorAction(resolved) {
+    var errorAction = {
+      action: NetworkErrorAction.DoNothing,
+      flags: ErrorActionFlags.None
+    };
+    return errorAction;
+  }
 
   var BasePlaylistController = /*#__PURE__*/function (_Logger) {
     function BasePlaylistController(hls, logPrefix) {
@@ -6637,6 +6642,7 @@
     if (!hasCurrentVideoRange) {
       currentVideoRange = undefined;
     }
+    var hasMultipleSets = codecSets.length > 1;
     var codecSet = codecSets.reduce(function (selected, candidate) {
       // Remove candiates which do not meet bitrate, default audio, stereo or channels preference, 1080p or lower, 30fps or lower, or SDR/HDR selection if present
       var candidateTier = codecTiers[candidate];
@@ -6646,48 +6652,50 @@
       videoRanges = hasCurrentVideoRange ? allowedVideoRanges.filter(function (range) {
         return candidateTier.videoRanges[range] > 0;
       }) : [];
-      if (candidateTier.minBitrate > currentBw) {
-        logStartCodecCandidateIgnored(candidate, "min bitrate of " + candidateTier.minBitrate + " > current estimate of " + currentBw);
-        return selected;
-      }
-      if (!candidateTier.hasDefaultAudio) {
-        logStartCodecCandidateIgnored(candidate, "no renditions with default or auto-select sound found");
-        return selected;
-      }
-      if (audioCodecPreference && candidate.indexOf(audioCodecPreference.substring(0, 4)) % 5 !== 0) {
-        logStartCodecCandidateIgnored(candidate, "audio codec preference \"" + audioCodecPreference + "\" not found");
-        return selected;
-      }
-      if (channelsPreference && !preferStereo) {
-        if (!candidateTier.channels[channelsPreference]) {
-          logStartCodecCandidateIgnored(candidate, "no renditions with " + channelsPreference + " channel sound found (channels options: " + Object.keys(candidateTier.channels) + ")");
+      if (hasMultipleSets) {
+        if (candidateTier.minBitrate > currentBw) {
+          logStartCodecCandidateIgnored(candidate, "min bitrate of " + candidateTier.minBitrate + " > current estimate of " + currentBw);
+          return selected;
+        }
+        if (!candidateTier.hasDefaultAudio) {
+          logStartCodecCandidateIgnored(candidate, "no renditions with default or auto-select sound found");
+          return selected;
+        }
+        if (audioCodecPreference && candidate.indexOf(audioCodecPreference.substring(0, 4)) % 5 !== 0) {
+          logStartCodecCandidateIgnored(candidate, "audio codec preference \"" + audioCodecPreference + "\" not found");
+          return selected;
+        }
+        if (channelsPreference && !preferStereo) {
+          if (!candidateTier.channels[channelsPreference]) {
+            logStartCodecCandidateIgnored(candidate, "no renditions with " + channelsPreference + " channel sound found (channels options: " + Object.keys(candidateTier.channels) + ")");
+            return selected;
+          }
+        } else if ((!audioCodecPreference || preferStereo) && hasStereo && candidateTier.channels['2'] === 0) {
+          logStartCodecCandidateIgnored(candidate, "no renditions with stereo sound found");
+          return selected;
+        }
+        if (candidateTier.minHeight > maxHeight) {
+          logStartCodecCandidateIgnored(candidate, "min resolution of " + candidateTier.minHeight + " > maximum of " + maxHeight);
+          return selected;
+        }
+        if (candidateTier.minFramerate > maxFramerate) {
+          logStartCodecCandidateIgnored(candidate, "min framerate of " + candidateTier.minFramerate + " > maximum of " + maxFramerate);
+          return selected;
+        }
+        if (!videoRanges.some(function (range) {
+          return candidateTier.videoRanges[range] > 0;
+        })) {
+          logStartCodecCandidateIgnored(candidate, "no variants with VIDEO-RANGE of " + JSON.stringify(videoRanges) + " found");
+          return selected;
+        }
+        if (videoCodecPreference && candidate.indexOf(videoCodecPreference.substring(0, 4)) % 5 !== 0) {
+          logStartCodecCandidateIgnored(candidate, "video codec preference \"" + videoCodecPreference + "\" not found");
+          return selected;
+        }
+        if (candidateTier.maxScore < selectedScore) {
+          logStartCodecCandidateIgnored(candidate, "max score of " + candidateTier.maxScore + " < selected max of " + selectedScore);
           return selected;
         }
-      } else if ((!audioCodecPreference || preferStereo) && hasStereo && candidateTier.channels['2'] === 0) {
-        logStartCodecCandidateIgnored(candidate, "no renditions with stereo sound found");
-        return selected;
-      }
-      if (candidateTier.minHeight > maxHeight) {
-        logStartCodecCandidateIgnored(candidate, "min resolution of " + candidateTier.minHeight + " > maximum of " + maxHeight);
-        return selected;
-      }
-      if (candidateTier.minFramerate > maxFramerate) {
-        logStartCodecCandidateIgnored(candidate, "min framerate of " + candidateTier.minFramerate + " > maximum of " + maxFramerate);
-        return selected;
-      }
-      if (!videoRanges.some(function (range) {
-        return candidateTier.videoRanges[range] > 0;
-      })) {
-        logStartCodecCandidateIgnored(candidate, "no variants with VIDEO-RANGE of " + JSON.stringify(videoRanges) + " found");
-        return selected;
-      }
-      if (videoCodecPreference && candidate.indexOf(videoCodecPreference.substring(0, 4)) % 5 !== 0) {
-        logStartCodecCandidateIgnored(candidate, "video codec preference \"" + videoCodecPreference + "\" not found");
-        return selected;
-      }
-      if (candidateTier.maxScore < selectedScore) {
-        logStartCodecCandidateIgnored(candidate, "max score of " + candidateTier.maxScore + " < selected max of " + selectedScore);
-        return selected;
       }
       // Remove candiates with less preferred codecs or more errors
       if (selected && (codecsSetSelectionPreferenceValue(candidate) >= codecsSetSelectionPreferenceValue(selected) || candidateTier.fragmentError > codecTiers[selected].fragmentError)) {
@@ -7288,7 +7296,7 @@
               if (levelsSkipped.length) {
                 _this3.trace("Skipped level(s) " + levelsSkipped.join(',') + " of " + maxAutoLevel + " max with CODECS and VIDEO-RANGE:\"" + levels[levelsSkipped[0]].codecs + "\" " + levels[levelsSkipped[0]].videoRange + "; not compatible with \"" + level.codecs + "\" " + currentVideoRange);
               }
-              _this3.info("switch candidate:" + selectionBaseLevel + "->" + i + " adjustedbw(" + Math.round(adjustedbw) + ")-bitrate=" + Math.round(adjustedbw - bitrate) + " ttfb:" + ttfbEstimateSec.toFixed(1) + " avgDuration:" + avgDuration.toFixed(1) + " maxFetchDuration:" + maxFetchDuration.toFixed(1) + " fetchDuration:" + fetchDuration.toFixed(1) + " firstSelection:" + firstSelection + " codecSet:" + level.codecSet + " videoRange:" + level.videoRange + " hls.loadLevel:" + loadLevel);
+              _this3.info("switch candidate:" + selectionBaseLevel + "->" + i + " adjustedbw(" + Math.round(adjustedbw) + ")-bitrate=" + Math.round(adjustedbw - bitrate) + " ttfb:" + ttfbEstimateSec.toFixed(1) + " avgDuration:" + avgDuration.toFixed(1) + " maxFetchDuration:" + maxFetchDuration.toFixed(1) + " fetchDuration:" + fetchDuration.toFixed(1) + " firstSelection:" + firstSelection + " codecSet:" + levelInfo.codecSet + " videoRange:" + levelInfo.videoRange + " hls.loadLevel:" + loadLevel);
             }
             if (firstSelection) {
               _this3.firstSelection = i;
@@ -7704,6 +7712,7 @@
       hls.on(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
       hls.on(Events.FRAG_PARSED, this.onFragParsed, this);
       hls.on(Events.FRAG_CHANGED, this.onFragChanged, this);
+      hls.on(Events.ERROR, this.onError, this);
     };
     _proto.unregisterListeners = function unregisterListeners() {
       var hls = this.hls;
@@ -7719,6 +7728,7 @@
       hls.off(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
       hls.off(Events.FRAG_PARSED, this.onFragParsed, this);
       hls.off(Events.FRAG_CHANGED, this.onFragChanged, this);
+      hls.off(Events.ERROR, this.onError, this);
     };
     _proto._initSourceBuffer = function _initSourceBuffer() {
       this.sourceBuffer = {};
@@ -7728,11 +7738,7 @@
         video: [],
         audiovideo: []
       };
-      this.appendErrors = {
-        audio: 0,
-        video: 0,
-        audiovideo: 0
-      };
+      this.resetAppendErrors();
       this.lastMpegAudioChunk = null;
       this.blockedAudioAppend = null;
       this.lastVideoAppendEnd = 0;
@@ -8262,6 +8268,22 @@
         this.updateMediaSource(durationAndRange);
       }
     };
+    _proto.onError = function onError(event, data) {
+      if (data.details === ErrorDetails.BUFFER_APPEND_ERROR && data.frag) {
+        var _data$errorAction;
+        var nextAutoLevel = (_data$errorAction = data.errorAction) == null ? void 0 : _data$errorAction.nextAutoLevel;
+        if (isFiniteNumber(nextAutoLevel) && nextAutoLevel !== data.frag.level) {
+          this.resetAppendErrors();
+        }
+      }
+    };
+    _proto.resetAppendErrors = function resetAppendErrors() {
+      this.appendErrors = {
+        audio: 0,
+        video: 0,
+        audiovideo: 0
+      };
+    };
     _proto.trimBuffers = function trimBuffers() {
       var hls = this.hls,
         details = this.details,
@@ -10963,12 +10985,14 @@
     var _proto = FragmentTracker.prototype;
     _proto._registerListeners = function _registerListeners() {
       var hls = this.hls;
+      hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.on(Events.BUFFER_APPENDED, this.onBufferAppended, this);
       hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
       hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
     };
     _proto._unregisterListeners = function _unregisterListeners() {
       var hls = this.hls;
+      hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.off(Events.BUFFER_APPENDED, this.onBufferAppended, this);
       hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
       hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
@@ -11032,7 +11056,7 @@
      * The browser will unload parts of the buffer to free up memory for new buffer data
      * Fragments will need to be reloaded when the buffer is freed up, removing partial fragments will allow them to reload(since there might be parts that are still playable)
      */;
-    _proto.detectEvictedFragments = function detectEvictedFragments(elementaryStream, timeRange, playlistType, appendedPart) {
+    _proto.detectEvictedFragments = function detectEvictedFragments(elementaryStream, timeRange, playlistType, appendedPart, removeAppending) {
       var _this = this;
       if (this.timeRanges) {
         this.timeRanges[elementaryStream] = timeRange;
@@ -11048,7 +11072,7 @@
         if (appendedPartSn >= fragmentEntity.body.sn) {
           return;
         }
-        if (!fragmentEntity.buffered && !fragmentEntity.loaded) {
+        if (!fragmentEntity.buffered && (!fragmentEntity.loaded || removeAppending)) {
           if (fragmentEntity.body.type === playlistType) {
             _this.removeFragment(fragmentEntity.body);
           }
@@ -11058,6 +11082,10 @@
         if (!esData) {
           return;
         }
+        if (esData.time.length === 0) {
+          _this.removeFragment(fragmentEntity.body);
+          return;
+        }
         esData.time.some(function (time) {
           var isNotBuffered = !_this.isTimeBuffered(time.startPTS, time.endPTS, timeRange);
           if (isNotBuffered) {
@@ -11245,6 +11273,9 @@
       }
       return false;
     };
+    _proto.onManifestLoading = function onManifestLoading() {
+      this.removeAllFragments();
+    };
     _proto.onFragLoaded = function onFragLoaded(event, data) {
       // don't track initsegment (for which sn is not a number)
       // don't track frags used for bitrateTest, they're irrelevant.
@@ -11291,6 +11322,20 @@
       var fragKey = getFragmentKey(fragment);
       return !!this.fragments[fragKey];
     };
+    _proto.hasFragments = function hasFragments(type) {
+      var fragments = this.fragments;
+      var keys = Object.keys(fragments);
+      if (!type) {
+        return keys.length > 0;
+      }
+      for (var i = keys.length; i--;) {
+        var fragmentEntity = fragments[keys[i]];
+        if ((fragmentEntity == null ? void 0 : fragmentEntity.body.type) === type) {
+          return true;
+        }
+      }
+      return false;
+    };
     _proto.hasParts = function hasParts(type) {
       var _this$activePartLists;
       return !!((_this$activePartLists = this.activePartLists[type]) != null && _this$activePartLists.length);
@@ -11399,8 +11444,9 @@
             frag.gap = false;
           }
         }
-        var loader = _this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
+        var loader = _this.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
         var loaderContext = createLoaderContext(frag);
+        frag.loader = loader;
         var loadPolicy = getLoaderConfigWithoutReties(config.fragLoadPolicy.default);
         var loaderConfig = {
           loadPolicy: loadPolicy,
@@ -11494,8 +11540,9 @@
           reject(createGapLoadError(frag, part));
           return;
         }
-        var loader = _this2.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
+        var loader = _this2.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
         var loaderContext = createLoaderContext(frag, part);
+        frag.loader = loader;
         // Should we define another load policy for parts?
         var loadPolicy = getLoaderConfigWithoutReties(config.fragLoadPolicy.default);
         var loaderConfig = {
@@ -12767,6 +12814,7 @@
       _this.initPTS = [];
       _this.buffering = true;
       _this.loadingParts = false;
+      _this.loopSn = void 0;
       _this.onMediaSeeking = function () {
         var _this2 = _this,
           config = _this2.config,
@@ -12865,6 +12913,9 @@
     ;
     _proto.startLoad = function startLoad(startPosition) {};
     _proto.stopLoad = function stopLoad() {
+      if (this.state === State.STOPPED) {
+        return;
+      }
       this.fragmentLoader.abort();
       this.keyLoader.abort(this.playlistType);
       var frag = this.fragCurrent;
@@ -12938,15 +12989,20 @@
         this.keyLoader.detach();
       }
       this.media = this.mediaBuffer = null;
-      this.loadedmetadata = false;
+      this.loopSn = undefined;
+      this.startFragRequested = this.loadedmetadata = this.loadingParts = false;
       this.fragmentTracker.removeAllFragments();
       this.stopLoad();
     };
-    _proto.onManifestLoading = function onManifestLoading() {};
+    _proto.onManifestLoading = function onManifestLoading() {
+      this.initPTS = [];
+      this.levels = this.levelLastLoaded = this.fragCurrent = null;
+      this.lastCurrentTime = this.startPosition = 0;
+      this.startFragRequested = false;
+    };
     _proto.onError = function onError(event, data) {};
     _proto.onManifestLoaded = function onManifestLoaded(event, data) {
       this.startTimeOffset = data.startTimeOffset;
-      this.initPTS = [];
     };
     _proto.onHandlerDestroying = function onHandlerDestroying() {
       this.stopLoad();
@@ -12969,6 +13025,7 @@
       _TaskLoop.prototype.onHandlerDestroyed.call(this);
     };
     _proto.loadFragment = function loadFragment(frag, level, targetBufferTime) {
+      this.startFragRequested = true;
       this._loadFragForPlayback(frag, level, targetBufferTime);
     };
     _proto._loadFragForPlayback = function _loadFragForPlayback(frag, level, targetBufferTime) {
@@ -13197,6 +13254,7 @@
       if (targetBufferTime === void 0) {
         targetBufferTime = null;
       }
+      this.fragCurrent = frag;
       var details = level == null ? void 0 : level.details;
       if (!this.levels || !details) {
         throw new Error("frag load aborted, missing level" + (details ? '' : ' detail') + "s");
@@ -13334,7 +13392,7 @@
             partsLoaded[part.index] = partLoadedData;
             var loadedPart = partLoadedData.part;
             _this6.hls.trigger(Events.FRAG_LOADED, partLoadedData);
-            var nextPart = getPartWith(level, frag.sn, part.index + 1) || findPart(initialPartList, frag.sn, part.index + 1);
+            var nextPart = getPartWith(level.details, frag.sn, part.index + 1) || findPart(initialPartList, frag.sn, part.index + 1);
             if (nextPart) {
               loadPart(nextPart);
             } else {
@@ -13423,8 +13481,9 @@
         return null;
       }
       var level = levels[levelIndex];
-      var part = partIndex > -1 ? getPartWith(level, sn, partIndex) : null;
-      var frag = part ? part.fragment : getFragmentWithSN(level, sn, fragCurrent);
+      var levelDetails = level.details;
+      var part = partIndex > -1 ? getPartWith(levelDetails, sn, partIndex) : null;
+      var frag = part ? part.fragment : getFragmentWithSN(levelDetails, sn, fragCurrent);
       if (!frag) {
         return null;
       }
@@ -13531,7 +13590,11 @@
       return false;
     };
     _proto.getAppendedFrag = function getAppendedFrag(position, playlistType) {
-      var fragOrPart = this.fragmentTracker.getAppendedFrag(position, PlaylistLevelType.MAIN);
+      var _this$fragmentTracker;
+      if (playlistType === void 0) {
+        playlistType = PlaylistLevelType.MAIN;
+      }
+      var fragOrPart = (_this$fragmentTracker = this.fragmentTracker) == null ? void 0 : _this$fragmentTracker.getAppendedFrag(position, playlistType);
       if (fragOrPart && 'fragment' in fragOrPart) {
         return fragOrPart.fragment;
       }
@@ -13584,22 +13647,25 @@
       return (trackerState === FragmentState.OK || trackerState === FragmentState.PARTIAL && !!frag.gap) && this.nextLoadPosition > targetBufferTime;
     };
     _proto.getNextFragmentLoopLoading = function getNextFragmentLoopLoading(frag, levelDetails, bufferInfo, playlistType, maxBufLen) {
-      var gapStart = frag.gap;
-      var nextFragment = this.getNextFragment(this.nextLoadPosition, levelDetails);
-      if (nextFragment === null) {
-        return nextFragment;
-      }
-      frag = nextFragment;
-      if (gapStart && frag && !frag.gap && bufferInfo.nextStart) {
-        // Media buffered after GAP tags should not make the next buffer timerange exceed forward buffer length
-        var nextbufferInfo = this.getFwdBufferInfoAtPos(this.mediaBuffer ? this.mediaBuffer : this.media, bufferInfo.nextStart, playlistType);
-        if (nextbufferInfo !== null && bufferInfo.len + nextbufferInfo.len >= maxBufLen) {
-          // Returning here might result in not finding an audio and video candiate to skip to
-          this.log("buffer full after gaps in \"" + playlistType + "\" playlist starting at sn: " + frag.sn);
-          return null;
+      var nextFragment = null;
+      if (frag.gap) {
+        nextFragment = this.getNextFragment(this.nextLoadPosition, levelDetails);
+        if (nextFragment && !nextFragment.gap && bufferInfo.nextStart) {
+          // Media buffered after GAP tags should not make the next buffer timerange exceed forward buffer length
+          var nextbufferInfo = this.getFwdBufferInfoAtPos(this.mediaBuffer ? this.mediaBuffer : this.media, bufferInfo.nextStart, playlistType);
+          if (nextbufferInfo !== null && bufferInfo.len + nextbufferInfo.len >= maxBufLen) {
+            // Returning here might result in not finding an audio and video candiate to skip to
+            var sn = nextFragment.sn;
+            if (this.loopSn !== sn) {
+              this.log("buffer full after gaps in \"" + playlistType + "\" playlist starting at sn: " + sn);
+              this.loopSn = sn;
+            }
+            return null;
+          }
         }
       }
-      return frag;
+      this.loopSn = undefined;
+      return nextFragment;
     };
     _proto.mapToInitFragWhenRequired = function mapToInitFragWhenRequired(frag) {
       // If an initSegment is present, it must be buffered first
@@ -13794,7 +13860,7 @@
         if (startTimeOffset !== null && isFiniteNumber(startTimeOffset)) {
           startPosition = sliding + startTimeOffset;
           if (startTimeOffset < 0) {
-            startPosition += details.totalduration;
+            startPosition += details.edge;
           }
           startPosition = Math.min(Math.max(sliding, startPosition), sliding + details.totalduration);
           this.log("Start time offset " + startTimeOffset + " found in " + (offsetInMultivariantPlaylist ? 'multivariant' : 'media') + " playlist, adjust startPosition to " + startPosition);
@@ -17395,10 +17461,11 @@
         if (this.ISGenerated) {
           var _videoTrack$pixelRati, _config$pixelRatio, _videoTrack$pixelRati2, _config$pixelRatio2;
           var config = this.videoTrackConfig;
-          if (config && (videoTrack.width !== config.width || videoTrack.height !== config.height || ((_videoTrack$pixelRati = videoTrack.pixelRatio) == null ? void 0 : _videoTrack$pixelRati[0]) !== ((_config$pixelRatio = config.pixelRatio) == null ? void 0 : _config$pixelRatio[0]) || ((_videoTrack$pixelRati2 = videoTrack.pixelRatio) == null ? void 0 : _videoTrack$pixelRati2[1]) !== ((_config$pixelRatio2 = config.pixelRatio) == null ? void 0 : _config$pixelRatio2[1]))) {
+          if (config && (videoTrack.width !== config.width || videoTrack.height !== config.height || ((_videoTrack$pixelRati = videoTrack.pixelRatio) == null ? void 0 : _videoTrack$pixelRati[0]) !== ((_config$pixelRatio = config.pixelRatio) == null ? void 0 : _config$pixelRatio[0]) || ((_videoTrack$pixelRati2 = videoTrack.pixelRatio) == null ? void 0 : _videoTrack$pixelRati2[1]) !== ((_config$pixelRatio2 = config.pixelRatio) == null ? void 0 : _config$pixelRatio2[1])) || !config && enoughVideoSamples || this.nextAudioPts === null && enoughAudioSamples) {
             this.resetInitSegment();
           }
-        } else {
+        }
+        if (!this.ISGenerated) {
           initSegment = this.generateIS(audioTrack, videoTrack, timeOffset, accurateTimeOffset);
         }
         var isVideoContiguous = this.isVideoContiguous;
@@ -18316,7 +18383,7 @@
       if (isInvalidInitPts(initPTS, decodeTime, timeOffset, duration) || initSegment.timescale !== initPTS.timescale && accurateTimeOffset) {
         initSegment.initPTS = decodeTime - timeOffset;
         if (initPTS && initPTS.timescale === 1) {
-          logger.warn("Adjusting initPTS by " + (initSegment.initPTS - initPTS.baseTime));
+          logger.warn("Adjusting initPTS @" + timeOffset + " from " + initPTS.baseTime / initPTS.timescale + " to " + initSegment.initPTS);
         }
         this.initPTS = initPTS = {
           baseTime: initSegment.initPTS,
@@ -20171,7 +20238,6 @@
     _proto.loadFragment = function loadFragment(frag, level, targetBufferTime) {
       // Check if fragment is not loaded
       var fragState = this.fragmentTracker.getState(frag);
-      this.fragCurrent = frag;
       if (fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
         if (frag.sn === 'initSegment') {
           this._loadInitSegment(frag, level);
@@ -20179,7 +20245,6 @@
           this.log("Fragment " + frag.sn + " of level " + frag.level + " is being downloaded to test bitrate and will not be buffered");
           this._loadBitrateTestFrag(frag, level);
         } else {
-          this.startFragRequested = true;
           _BaseStreamController.prototype.loadFragment.call(this, frag, level, targetBufferTime);
         }
       } else {
@@ -20309,14 +20374,14 @@
       _BaseStreamController.prototype.onMediaDetaching.call(this);
     };
     _proto.onManifestLoading = function onManifestLoading() {
+      _BaseStreamController.prototype.onManifestLoading.call(this);
       // reset buffer on manifest loading
       this.log('Trigger BUFFER_RESET');
       this.hls.trigger(Events.BUFFER_RESET, undefined);
-      this.fragmentTracker.removeAllFragments();
       this.couldBacktrack = false;
-      this.startPosition = this.lastCurrentTime = this.fragLastKbps = 0;
-      this.levels = this.fragPlaying = this.backtrackFragment = this.levelLastLoaded = null;
-      this.altAudio = this.audioOnly = this.startFragRequested = false;
+      this.fragLastKbps = 0;
+      this.fragPlaying = this.backtrackFragment = null;
+      this.altAudio = this.audioOnly = false;
     };
     _proto.onManifestParsed = function onManifestParsed(event, data) {
       // detect if we have different kind of audio codecs used amongst playlists
@@ -20601,7 +20666,7 @@
       // in that case, reset startFragRequested flag
       if (!this.loadedmetadata) {
         this.startFragRequested = false;
-        this.nextLoadPosition = this.startPosition;
+        this.nextLoadPosition = this.lastCurrentTime;
       }
       this.tickImmediate();
     };
@@ -20685,7 +20750,7 @@
     };
     _proto._handleTransmuxComplete = function _handleTransmuxComplete(transmuxResult) {
       var _id3$samples;
-      var id = 'main';
+      var id = this.playlistType;
       var hls = this.hls;
       var remuxResult = transmuxResult.remuxResult,
         chunkMeta = transmuxResult.chunkMeta;
@@ -20875,31 +20940,38 @@
         audio.levelCodec = audioCodec;
         audio.id = 'main';
         this.log("Init audio buffer, container:" + audio.container + ", codecs[selected/level/parsed]=[" + (audioCodec || '') + "/" + (currentLevel.audioCodec || '') + "/" + audio.codec + "]");
+        delete tracks.audiovideo;
       }
       if (video) {
         video.levelCodec = currentLevel.videoCodec;
         video.id = 'main';
         this.log("Init video buffer, container:" + video.container + ", codecs[level/parsed]=[" + (currentLevel.videoCodec || '') + "/" + video.codec + "]");
+        delete tracks.audiovideo;
       }
       if (audiovideo) {
         this.log("Init audiovideo buffer, container:" + audiovideo.container + ", codecs[level/parsed]=[" + currentLevel.codecs + "/" + audiovideo.codec + "]");
+        delete tracks.video;
+        delete tracks.audio;
+      }
+      var trackTypes = Object.keys(tracks);
+      if (trackTypes.length) {
+        this.hls.trigger(Events.BUFFER_CODECS, tracks);
+        // loop through tracks that are going to be provided to bufferController
+        trackTypes.forEach(function (trackName) {
+          var track = tracks[trackName];
+          var initSegment = track.initSegment;
+          if (initSegment != null && initSegment.byteLength) {
+            _this3.hls.trigger(Events.BUFFER_APPENDING, {
+              type: trackName,
+              data: initSegment,
+              frag: frag,
+              part: null,
+              chunkMeta: chunkMeta,
+              parent: frag.type
+            });
+          }
+        });
       }
-      this.hls.trigger(Events.BUFFER_CODECS, tracks);
-      // loop through tracks that are going to be provided to bufferController
-      Object.keys(tracks).forEach(function (trackName) {
-        var track = tracks[trackName];
-        var initSegment = track.initSegment;
-        if (initSegment != null && initSegment.byteLength) {
-          _this3.hls.trigger(Events.BUFFER_APPENDING, {
-            type: trackName,
-            data: initSegment,
-            frag: frag,
-            part: null,
-            chunkMeta: chunkMeta,
-            parent: frag.type
-          });
-        }
-      });
       // trigger handler right now
       this.tickImmediate();
     };
@@ -20980,22 +21052,30 @@
     }, {
       key: "currentFrag",
       get: function get() {
-        var media = this.media;
-        if (media) {
-          return this.fragPlaying || this.getAppendedFrag(media.currentTime);
+        var _this$media2;
+        if (this.fragPlaying) {
+          return this.fragPlaying;
+        }
+        var currentTime = ((_this$media2 = this.media) == null ? void 0 : _this$media2.currentTime) || this.lastCurrentTime;
+        if (isFiniteNumber(currentTime)) {
+          return this.getAppendedFrag(currentTime);
         }
         return null;
       }
     }, {
       key: "currentProgramDateTime",
       get: function get() {
-        var media = this.media;
-        if (media) {
-          var currentTime = media.currentTime;
-          var frag = this.currentFrag;
-          if (frag && isFiniteNumber(currentTime) && isFiniteNumber(frag.programDateTime)) {
-            var epocMs = frag.programDateTime + (currentTime - frag.start) * 1000;
-            return new Date(epocMs);
+        var _this$media3;
+        var currentTime = ((_this$media3 = this.media) == null ? void 0 : _this$media3.currentTime) || this.lastCurrentTime;
+        if (isFiniteNumber(currentTime)) {
+          var details = this.getLevelDetails();
+          var frag = this.currentFrag || (details ? findFragmentByPTS(null, details.fragments, currentTime) : null);
+          if (frag) {
+            var programDateTime = frag.programDateTime;
+            if (programDateTime !== null) {
+              var epocMs = programDateTime + (currentTime - frag.start) * 1000;
+              return new Date(epocMs);
+            }
           }
         }
         return null;
@@ -21113,7 +21193,7 @@
       if (AudioStreamControllerClass) {
         networkControllers.push(new AudioStreamControllerClass(this, fragmentTracker, keyLoader));
       }
-      // subtitleTrackController must be defined before subtitleStreamController because the order of event handling is important
+      // Instantiate subtitleTrackController before SubtitleStreamController to receive level events first
       this.subtitleTrackController = this.createController(config.subtitleTrackController, networkControllers);
       var SubtitleStreamControllerClass = config.subtitleStreamController;
       if (SubtitleStreamControllerClass) {
@@ -21909,7 +21989,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.12-0.canary.10366";
+        return "1.5.12-0.canary.10367";
       }
     }, {
       key: "Events",