hls.js 1.5.3 → 1.5.5-0.canary.9977

package/dist/hls.js

@@ -5,6 +5,21 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Hls = factory());
 })(this, (function () { 'use strict';
 
+  function _construct(t, e, r) {
+    if (_isNativeReflectConstruct()) return Reflect.construct.apply(null, arguments);
+    var o = [null];
+    o.push.apply(o, e);
+    var p = new (t.bind.apply(t, o))();
+    return r && _setPrototypeOf(p, r.prototype), p;
+  }
+  function _isNativeReflectConstruct() {
+    try {
+      var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
+    } catch (t) {}
+    return (_isNativeReflectConstruct = function () {
+      return !!t;
+    })();
+  }
   function ownKeys(e, r) {
     var t = Object.keys(e);
     if (Object.getOwnPropertySymbols) {
@@ -103,32 +118,6 @@
     };
     return _setPrototypeOf(o, p);
   }
-  function _isNativeReflectConstruct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
-    try {
-      Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }
-  function _construct(Parent, args, Class) {
-    if (_isNativeReflectConstruct()) {
-      _construct = Reflect.construct.bind();
-    } else {
-      _construct = function _construct(Parent, args, Class) {
-        var a = [null];
-        a.push.apply(a, args);
-        var Constructor = Function.bind.apply(Parent, a);
-        var instance = new Constructor();
-        if (Class) _setPrototypeOf(instance, Class.prototype);
-        return instance;
-      };
-    }
-    return _construct.apply(null, arguments);
-  }
   function _isNativeFunction(fn) {
     try {
       return Function.toString.call(fn).indexOf("[native code]") !== -1;
@@ -394,6 +383,7 @@
     Events["MEDIA_ATTACHED"] = "hlsMediaAttached";
     Events["MEDIA_DETACHING"] = "hlsMediaDetaching";
     Events["MEDIA_DETACHED"] = "hlsMediaDetached";
+    Events["MEDIA_ENDED"] = "hlsMediaEnded";
     Events["BUFFER_RESET"] = "hlsBufferReset";
     Events["BUFFER_CODECS"] = "hlsBufferCodecs";
     Events["BUFFER_CREATED"] = "hlsBufferCreated";
@@ -507,6 +497,21 @@
     return ErrorDetails;
   }({});
 
+  var Logger = function Logger(label, logger) {
+    this.trace = void 0;
+    this.debug = void 0;
+    this.log = void 0;
+    this.warn = void 0;
+    this.info = void 0;
+    this.error = void 0;
+    var lb = "[" + label + "]:";
+    this.trace = noop;
+    this.debug = logger.debug.bind(null, lb);
+    this.log = logger.log.bind(null, lb);
+    this.warn = logger.warn.bind(null, lb);
+    this.info = logger.info.bind(null, lb);
+    this.error = logger.error.bind(null, lb);
+  };
   var noop = function noop() {};
   var fakeLogger = {
     trace: noop,
@@ -516,7 +521,9 @@
     info: noop,
     error: noop
   };
-  var exportedLogger = fakeLogger;
+  function createLogger() {
+    return _extends({}, fakeLogger);
+  }
 
   // let lastCallTime;
   // function formatMsgWithTimeInfo(type, msg) {
@@ -527,38 +534,36 @@
   //   return msg;
   // }
 
-  function consolePrintFn(type) {
+  function consolePrintFn(type, id) {
     var func = self.console[type];
-    if (func) {
-      return func.bind(self.console, "[" + type + "] >");
-    }
-    return noop;
+    return func ? func.bind(self.console, (id ? '[' + id + '] ' : '') + "[" + type + "] >") : noop;
   }
-  function exportLoggerFunctions(debugConfig) {
-    for (var _len = arguments.length, functions = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-      functions[_key - 1] = arguments[_key];
-    }
-    functions.forEach(function (type) {
-      exportedLogger[type] = debugConfig[type] ? debugConfig[type].bind(debugConfig) : consolePrintFn(type);
-    });
+  function getLoggerFn(key, debugConfig, id) {
+    return debugConfig[key] ? debugConfig[key].bind(debugConfig) : consolePrintFn(key, id);
   }
-  function enableLogs(debugConfig, id) {
+  var exportedLogger = createLogger();
+  function enableLogs(debugConfig, context, id) {
     // check that console is available
+    var newLogger = createLogger();
     if (typeof console === 'object' && debugConfig === true || typeof debugConfig === 'object') {
-      exportLoggerFunctions(debugConfig,
+      var keys = [
       // Remove out from list here to hard-disable a log-level
       // 'trace',
-      'debug', 'log', 'info', 'warn', 'error');
+      'debug', 'log', 'info', 'warn', 'error'];
+      keys.forEach(function (key) {
+        newLogger[key] = getLoggerFn(key, debugConfig, id);
+      });
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.5.3");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.5-0.canary.9977");
       } catch (e) {
-        exportedLogger = fakeLogger;
+        /* log fn threw an exception. All logger methods are no-ops. */
+        return createLogger();
       }
-    } else {
-      exportedLogger = fakeLogger;
     }
+    exportedLogger = newLogger;
+    return newLogger;
   }
   var logger = exportedLogger;
 
@@ -1253,6 +1258,26 @@
     });
   }
 
+  var DecrypterAesMode = {
+    cbc: 0,
+    ctr: 1
+  };
+
+  function isFullSegmentEncryption(method) {
+    return method === 'AES-128' || method === 'AES-256' || method === 'AES-256-CTR';
+  }
+  function getAesModeFromFullSegmentMethod(method) {
+    switch (method) {
+      case 'AES-128':
+      case 'AES-256':
+        return DecrypterAesMode.cbc;
+      case 'AES-256-CTR':
+        return DecrypterAesMode.ctr;
+      default:
+        throw new Error("invalid full segment method " + method);
+    }
+  }
+
   /** returns `undefined` is `self` is missing, e.g. in node */
   var optionalSelf = typeof self !== 'undefined' ? self : undefined;
 
@@ -1774,6 +1799,12 @@
     var val = readSint32(buffer, offset);
     return val < 0 ? 4294967296 + val : val;
   }
+  function readUint64(buffer, offset) {
+    var result = readUint32(buffer, offset);
+    result *= Math.pow(2, 32);
+    result += readUint32(buffer, offset + 4);
+    return result;
+  }
   function readSint32(buffer, offset) {
     return buffer[offset] << 24 | buffer[offset + 1] << 16 | buffer[offset + 2] << 8 | buffer[offset + 3];
   }
@@ -1836,15 +1867,14 @@
     var index = 8;
     var timescale = readUint32(sidx, index);
     index += 4;
-
-    // TODO: parse earliestPresentationTime and firstOffset
-    // usually zero in our case
     var earliestPresentationTime = 0;
     var firstOffset = 0;
     if (version === 0) {
-      index += 8;
+      earliestPresentationTime = readUint32(sidx, index += 4);
+      firstOffset = readUint32(sidx, index += 4);
     } else {
-      index += 16;
+      earliestPresentationTime = readUint64(sidx, index += 8);
+      firstOffset = readUint64(sidx, index += 8);
     }
 
     // skip reserved
@@ -2294,17 +2324,24 @@
     }
     if (videoDuration === 0 && audioDuration === 0) {
       // If duration samples are not available in the traf use sidx subsegment_duration
+      var sidxMinStart = Infinity;
+      var sidxMaxEnd = 0;
       var sidxDuration = 0;
       var sidxs = findBox(data, ['sidx']);
       for (var _i2 = 0; _i2 < sidxs.length; _i2++) {
         var sidx = parseSegmentIndex(sidxs[_i2]);
         if (sidx != null && sidx.references) {
-          sidxDuration += sidx.references.reduce(function (dur, ref) {
+          sidxMinStart = Math.min(sidxMinStart, sidx.earliestPresentationTime / sidx.timescale);
+          var subSegmentDuration = sidx.references.reduce(function (dur, ref) {
             return dur + ref.info.duration || 0;
           }, 0);
+          sidxMaxEnd = Math.max(sidxMaxEnd, subSegmentDuration + sidx.earliestPresentationTime / sidx.timescale);
+          sidxDuration = sidxMaxEnd - sidxMinStart;
         }
       }
-      return sidxDuration;
+      if (sidxDuration && isFiniteNumber(sidxDuration)) {
+        return sidxDuration;
+      }
     }
     if (videoDuration) {
       return videoDuration;
@@ -2911,13 +2948,13 @@
       this.keyFormatVersions = formatversions;
       this.iv = iv;
       this.encrypted = method ? method !== 'NONE' : false;
-      this.isCommonEncryption = this.encrypted && method !== 'AES-128';
+      this.isCommonEncryption = this.encrypted && !isFullSegmentEncryption(method);
     }
     var _proto = LevelKey.prototype;
     _proto.isSupported = function isSupported() {
       // If it's Segment encryption or No encryption, just select that key system
       if (this.method) {
-        if (this.method === 'AES-128' || this.method === 'NONE') {
+        if (isFullSegmentEncryption(this.method) || this.method === 'NONE') {
           return true;
         }
         if (this.keyFormat === 'identity') {
@@ -2939,14 +2976,13 @@
       if (!this.encrypted || !this.uri) {
         return null;
       }
-      if (this.method === 'AES-128' && this.uri && !this.iv) {
+      if (isFullSegmentEncryption(this.method) && this.uri && !this.iv) {
         if (typeof sn !== 'number') {
           // We are fetching decryption data for a initialization segment
-          // If the segment was encrypted with AES-128
+          // If the segment was encrypted with AES-128/256
           // It must have an IV defined. We cannot substitute the Segment Number in.
-          if (this.method === 'AES-128' && !this.iv) {
-            logger.warn("missing IV for initialization segment with method=\"" + this.method + "\" - compliance issue");
-          }
+          logger.warn("missing IV for initialization segment with method=\"" + this.method + "\" - compliance issue");
+
           // Explicitly set sn to resulting value from implicit conversions 'initSegment' values for IV generation.
           sn = 0;
         }
@@ -3240,23 +3276,28 @@
     if (CODEC_COMPATIBLE_NAMES[lowerCaseCodec]) {
       return CODEC_COMPATIBLE_NAMES[lowerCaseCodec];
     }
-
-    // Idealy fLaC and Opus would be first (spec-compliant) but
-    // some browsers will report that fLaC is supported then fail.
-    // see: https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
     var codecsToCheck = {
+      // Idealy fLaC and Opus would be first (spec-compliant) but
+      // some browsers will report that fLaC is supported then fail.
+      // see: https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
       flac: ['flac', 'fLaC', 'FLAC'],
-      opus: ['opus', 'Opus']
+      opus: ['opus', 'Opus'],
+      // Replace audio codec info if browser does not support mp4a.40.34,
+      // and demuxer can fallback to 'audio/mpeg' or 'audio/mp4;codecs="mp3"'
+      'mp4a.40.34': ['mp3']
     }[lowerCaseCodec];
     for (var i = 0; i < codecsToCheck.length; i++) {
+      var _getMediaSource;
       if (isCodecMediaSourceSupported(codecsToCheck[i], 'audio', preferManagedMediaSource)) {
         CODEC_COMPATIBLE_NAMES[lowerCaseCodec] = codecsToCheck[i];
         return codecsToCheck[i];
+      } else if (codecsToCheck[i] === 'mp3' && (_getMediaSource = getMediaSource(preferManagedMediaSource)) != null && _getMediaSource.isTypeSupported('audio/mpeg')) {
+        return '';
       }
     }
     return lowerCaseCodec;
   }
-  var AUDIO_CODEC_REGEXP = /flac|opus/i;
+  var AUDIO_CODEC_REGEXP = /flac|opus|mp4a\.40\.34/i;
   function getCodecCompatibleName(codec, preferManagedMediaSource) {
     if (preferManagedMediaSource === void 0) {
       preferManagedMediaSource = true;
@@ -3284,6 +3325,18 @@
     }
     return codec;
   }
+  function getM2TSSupportedAudioTypes(preferManagedMediaSource) {
+    var MediaSource = getMediaSource(preferManagedMediaSource) || {
+      isTypeSupported: function isTypeSupported() {
+        return false;
+      }
+    };
+    return {
+      mpeg: MediaSource.isTypeSupported('audio/mpeg'),
+      mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"'),
+      ac3: MediaSource.isTypeSupported('audio/mp4; codecs="ac-3"') 
+    };
+  }
 
   var MASTER_PLAYLIST_REGEX = /#EXT-X-STREAM-INF:([^\r\n]*)(?:[\r\n](?:#[^\r\n]*)?)*([^\r\n]+)|#EXT-X-(SESSION-DATA|SESSION-KEY|DEFINE|CONTENT-STEERING|START):([^\r\n]*)[\r\n]+/g;
   var MASTER_PLAYLIST_MEDIA_REGEX = /#EXT-X-MEDIA:(.*)/g;
@@ -4947,8 +5000,43 @@
       this.currentTime = 0;
       this.stallCount = 0;
       this._latency = null;
-      this.timeupdateHandler = function () {
-        return _this.timeupdate();
+      this.onTimeupdate = function () {
+        var media = _this.media,
+          levelDetails = _this.levelDetails;
+        if (!media || !levelDetails) {
+          return;
+        }
+        _this.currentTime = media.currentTime;
+        var latency = _this.computeLatency();
+        if (latency === null) {
+          return;
+        }
+        _this._latency = latency;
+
+        // Adapt playbackRate to meet target latency in low-latency mode
+        var _this$config = _this.config,
+          lowLatencyMode = _this$config.lowLatencyMode,
+          maxLiveSyncPlaybackRate = _this$config.maxLiveSyncPlaybackRate;
+        if (!lowLatencyMode || maxLiveSyncPlaybackRate === 1 || !levelDetails.live) {
+          return;
+        }
+        var targetLatency = _this.targetLatency;
+        if (targetLatency === null) {
+          return;
+        }
+        var distanceFromTarget = latency - targetLatency;
+        // Only adjust playbackRate when within one target duration of targetLatency
+        // and more than one second from under-buffering.
+        // Playback further than one target duration from target can be considered DVR playback.
+        var liveMinLatencyDuration = Math.min(_this.maxLatency, targetLatency + levelDetails.targetduration);
+        var inLiveRange = distanceFromTarget < liveMinLatencyDuration;
+        if (inLiveRange && distanceFromTarget > 0.05 && _this.forwardBufferLength > 1) {
+          var max = Math.min(2, Math.max(1.0, maxLiveSyncPlaybackRate));
+          var rate = Math.round(2 / (1 + Math.exp(-0.75 * distanceFromTarget - _this.edgeStalled)) * 20) / 20;
+          media.playbackRate = Math.min(max, Math.max(1, rate));
+        } else if (media.playbackRate !== 1 && media.playbackRate !== 0) {
+          media.playbackRate = 1;
+        }
       };
       this.hls = hls;
       this.config = hls.config;
@@ -4960,7 +5048,7 @@
       this.onMediaDetaching();
       this.levelDetails = null;
       // @ts-ignore
-      this.hls = this.timeupdateHandler = null;
+      this.hls = null;
     };
     _proto.registerListeners = function registerListeners() {
       this.hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
@@ -4978,11 +5066,11 @@
     };
     _proto.onMediaAttached = function onMediaAttached(event, data) {
       this.media = data.media;
-      this.media.addEventListener('timeupdate', this.timeupdateHandler);
+      this.media.addEventListener('timeupdate', this.onTimeupdate);
     };
     _proto.onMediaDetaching = function onMediaDetaching() {
       if (this.media) {
-        this.media.removeEventListener('timeupdate', this.timeupdateHandler);
+        this.media.removeEventListener('timeupdate', this.onTimeupdate);
         this.media = null;
       }
     };
@@ -4995,10 +5083,10 @@
       var details = _ref.details;
       this.levelDetails = details;
       if (details.advanced) {
-        this.timeupdate();
+        this.onTimeupdate();
       }
       if (!details.live && this.media) {
-        this.media.removeEventListener('timeupdate', this.timeupdateHandler);
+        this.media.removeEventListener('timeupdate', this.onTimeupdate);
       }
     };
     _proto.onError = function onError(event, data) {
@@ -5008,45 +5096,7 @@
       }
       this.stallCount++;
       if ((_this$levelDetails = this.levelDetails) != null && _this$levelDetails.live) {
-        logger.warn('[playback-rate-controller]: Stall detected, adjusting target latency');
-      }
-    };
-    _proto.timeupdate = function timeupdate() {
-      var media = this.media,
-        levelDetails = this.levelDetails;
-      if (!media || !levelDetails) {
-        return;
-      }
-      this.currentTime = media.currentTime;
-      var latency = this.computeLatency();
-      if (latency === null) {
-        return;
-      }
-      this._latency = latency;
-
-      // Adapt playbackRate to meet target latency in low-latency mode
-      var _this$config = this.config,
-        lowLatencyMode = _this$config.lowLatencyMode,
-        maxLiveSyncPlaybackRate = _this$config.maxLiveSyncPlaybackRate;
-      if (!lowLatencyMode || maxLiveSyncPlaybackRate === 1 || !levelDetails.live) {
-        return;
-      }
-      var targetLatency = this.targetLatency;
-      if (targetLatency === null) {
-        return;
-      }
-      var distanceFromTarget = latency - targetLatency;
-      // Only adjust playbackRate when within one target duration of targetLatency
-      // and more than one second from under-buffering.
-      // Playback further than one target duration from target can be considered DVR playback.
-      var liveMinLatencyDuration = Math.min(this.maxLatency, targetLatency + levelDetails.targetduration);
-      var inLiveRange = distanceFromTarget < liveMinLatencyDuration;
-      if (inLiveRange && distanceFromTarget > 0.05 && this.forwardBufferLength > 1) {
-        var max = Math.min(2, Math.max(1.0, maxLiveSyncPlaybackRate));
-        var rate = Math.round(2 / (1 + Math.exp(-0.75 * distanceFromTarget - this.edgeStalled)) * 20) / 20;
-        media.playbackRate = Math.min(max, Math.max(1, rate));
-      } else if (media.playbackRate !== 1 && media.playbackRate !== 0) {
-        media.playbackRate = 1;
+        this.hls.logger.warn('[latency-controller]: Stall detected, adjusting target latency');
       }
     };
     _proto.estimateLiveEdge = function estimateLiveEdge() {
@@ -5954,19 +6004,17 @@
     MoveAllAlternatesMatchingHDCP: 2,
     SwitchToSDR: 4
   }; // Reserved for future use
-  var ErrorController = /*#__PURE__*/function () {
+  var ErrorController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(ErrorController, _Logger);
     function ErrorController(hls) {
-      this.hls = void 0;
-      this.playlistError = 0;
-      this.penalizedRenditions = {};
-      this.log = void 0;
-      this.warn = void 0;
-      this.error = void 0;
-      this.hls = hls;
-      this.log = logger.log.bind(logger, "[info]:");
-      this.warn = logger.warn.bind(logger, "[warning]:");
-      this.error = logger.error.bind(logger, "[error]:");
-      this.registerListeners();
+      var _this;
+      _this = _Logger.call(this, 'error-controller', hls.logger) || this;
+      _this.hls = void 0;
+      _this.playlistError = 0;
+      _this.penalizedRenditions = {};
+      _this.hls = hls;
+      _this.registerListeners();
+      return _this;
     }
     var _proto = ErrorController.prototype;
     _proto.registerListeners = function registerListeners() {
@@ -6322,19 +6370,19 @@
       }
     };
     return ErrorController;
-  }();
+  }(Logger);
 
-  var BasePlaylistController = /*#__PURE__*/function () {
+  var BasePlaylistController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(BasePlaylistController, _Logger);
     function BasePlaylistController(hls, logPrefix) {
-      this.hls = void 0;
-      this.timer = -1;
-      this.requestScheduled = -1;
-      this.canLoad = false;
-      this.log = void 0;
-      this.warn = void 0;
-      this.log = logger.log.bind(logger, logPrefix + ":");
-      this.warn = logger.warn.bind(logger, logPrefix + ":");
-      this.hls = hls;
+      var _this;
+      _this = _Logger.call(this, logPrefix, hls.logger) || this;
+      _this.hls = void 0;
+      _this.timer = -1;
+      _this.requestScheduled = -1;
+      _this.canLoad = false;
+      _this.hls = hls;
+      return _this;
     }
     var _proto = BasePlaylistController.prototype;
     _proto.destroy = function destroy() {
@@ -6367,7 +6415,7 @@
           try {
             uri = new self.URL(attr.URI, previous.url).href;
           } catch (error) {
-            logger.warn("Could not construct new URL for Rendition Report: " + error);
+            this.warn("Could not construct new URL for Rendition Report: " + error);
             uri = attr.URI || '';
           }
           // Use exact match. Otherwise, the last partial match, if any, will be used
@@ -6406,7 +6454,7 @@
       return this.timer === -1 && this.requestScheduled === -1 && this.shouldLoadPlaylist(playlist);
     };
     _proto.playlistLoaded = function playlistLoaded(index, data, previousDetails) {
-      var _this = this;
+      var _this2 = this;
       var details = data.details,
         stats = data.stats;
 
@@ -6511,7 +6559,7 @@
         // );
 
         this.timer = self.setTimeout(function () {
-          return _this.loadPlaylist(deliveryDirectives);
+          return _this2.loadPlaylist(deliveryDirectives);
         }, estimatedTimeUntilUpdate);
       } else {
         this.clearTimer();
@@ -6527,7 +6575,7 @@
       return new HlsUrlParameters(msn, part, skip);
     };
     _proto.checkRetry = function checkRetry(errorEvent) {
-      var _this2 = this;
+      var _this3 = this;
       var errorDetails = errorEvent.details;
       var isTimeout = isTimeoutError(errorEvent);
       var errorAction = errorEvent.errorAction;
@@ -6551,7 +6599,7 @@
           var delay = getRetryDelay(retryConfig, retryCount);
           // Schedule level/track reload
           this.timer = self.setTimeout(function () {
-            return _this2.loadPlaylist();
+            return _this3.loadPlaylist();
           }, delay);
           this.warn("Retrying playlist loading " + (retryCount + 1) + "/" + retryConfig.maxNumRetry + " after \"" + errorDetails + "\" in " + delay + "ms");
         }
@@ -6562,7 +6610,7 @@
       return retry;
     };
     return BasePlaylistController;
-  }();
+  }(Logger);
 
   /*
    * compute an Exponential Weighted moving average
@@ -7164,30 +7212,33 @@
     return -1;
   }
 
-  var AbrController = /*#__PURE__*/function () {
+  var AbrController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(AbrController, _Logger);
     function AbrController(_hls) {
-      var _this = this;
-      this.hls = void 0;
-      this.lastLevelLoadSec = 0;
-      this.lastLoadedFragLevel = -1;
-      this.firstSelection = -1;
-      this._nextAutoLevel = -1;
-      this.nextAutoLevelKey = '';
-      this.audioTracksByGroup = null;
-      this.codecTiers = null;
-      this.timer = -1;
-      this.fragCurrent = null;
-      this.partCurrent = null;
-      this.bitrateTestDelay = 0;
-      this.bwEstimator = void 0;
+      var _this;
+      _this = _Logger.call(this, 'abr', _hls.logger) || this;
+      _this.hls = void 0;
+      _this.lastLevelLoadSec = 0;
+      _this.lastLoadedFragLevel = -1;
+      _this.firstSelection = -1;
+      _this._nextAutoLevel = -1;
+      _this.nextAutoLevelKey = '';
+      _this.audioTracksByGroup = null;
+      _this.codecTiers = null;
+      _this.timer = -1;
+      _this.fragCurrent = null;
+      _this.partCurrent = null;
+      _this.bitrateTestDelay = 0;
+      _this.bwEstimator = void 0;
       /*
           This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
           quickly enough to prevent underbuffering
         */
-      this._abandonRulesCheck = function () {
-        var frag = _this.fragCurrent,
-          part = _this.partCurrent,
-          hls = _this.hls;
+      _this._abandonRulesCheck = function () {
+        var _assertThisInitialize = _assertThisInitialized(_this),
+          frag = _assertThisInitialize.fragCurrent,
+          part = _assertThisInitialize.partCurrent,
+          hls = _assertThisInitialize.hls;
         var autoLevelEnabled = hls.autoLevelEnabled,
           media = hls.media;
         if (!frag || !media) {
@@ -7276,21 +7327,22 @@
           _this.resetEstimator(nextLoadLevelBitrate);
         }
         _this.clearTimer();
-        logger.warn("[abr] Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + frag.level + " is loading too slowly;\n      Time to underbuffer: " + bufferStarvationDelay.toFixed(3) + " s\n      Estimated load time for current fragment: " + fragLoadedDelay.toFixed(3) + " s\n      Estimated load time for down switch fragment: " + fragLevelNextLoadedDelay.toFixed(3) + " s\n      TTFB estimate: " + (ttfb | 0) + " ms\n      Current BW estimate: " + (isFiniteNumber(bwEstimate) ? bwEstimate | 0 : 'Unknown') + " bps\n      New BW estimate: " + (_this.getBwEstimate() | 0) + " bps\n      Switching to level " + nextLoadLevel + " @ " + (nextLoadLevelBitrate | 0) + " bps");
+        _this.warn("Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + frag.level + " is loading too slowly;\n      Time to underbuffer: " + bufferStarvationDelay.toFixed(3) + " s\n      Estimated load time for current fragment: " + fragLoadedDelay.toFixed(3) + " s\n      Estimated load time for down switch fragment: " + fragLevelNextLoadedDelay.toFixed(3) + " s\n      TTFB estimate: " + (ttfb | 0) + " ms\n      Current BW estimate: " + (isFiniteNumber(bwEstimate) ? bwEstimate | 0 : 'Unknown') + " bps\n      New BW estimate: " + (_this.getBwEstimate() | 0) + " bps\n      Switching to level " + nextLoadLevel + " @ " + (nextLoadLevelBitrate | 0) + " bps");
         hls.trigger(Events.FRAG_LOAD_EMERGENCY_ABORTED, {
           frag: frag,
           part: part,
           stats: stats
         });
       };
-      this.hls = _hls;
-      this.bwEstimator = this.initEstimator();
-      this.registerListeners();
+      _this.hls = _hls;
+      _this.bwEstimator = _this.initEstimator();
+      _this.registerListeners();
+      return _this;
     }
     var _proto = AbrController.prototype;
     _proto.resetEstimator = function resetEstimator(abrEwmaDefaultEstimate) {
       if (abrEwmaDefaultEstimate) {
-        logger.log("setting initial bwe to " + abrEwmaDefaultEstimate);
+        this.log("setting initial bwe to " + abrEwmaDefaultEstimate);
         this.hls.config.abrEwmaDefaultEstimate = abrEwmaDefaultEstimate;
       }
       this.firstSelection = -1;
@@ -7542,13 +7594,13 @@
           // cap maxLoadingDelay and ensure it is not bigger 'than bitrate test' frag duration
           var maxLoadingDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxLoadingDelay) : config.maxLoadingDelay;
           maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
-          logger.info("[abr] bitrate test took " + Math.round(1000 * bitrateTestDelay) + "ms, set first fragment max fetchDuration to " + Math.round(1000 * maxStarvationDelay) + " ms");
+          this.info("bitrate test took " + Math.round(1000 * bitrateTestDelay) + "ms, set first fragment max fetchDuration to " + Math.round(1000 * maxStarvationDelay) + " ms");
           // don't use conservative factor on bitrate test
           bwFactor = bwUpFactor = 1;
         }
       }
       var bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor);
-      logger.info("[abr] " + (bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty') + ", optimal quality level " + bestLevel);
+      this.info((bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty') + ", optimal quality level " + bestLevel);
       if (bestLevel > -1) {
         return bestLevel;
       }
@@ -7604,7 +7656,7 @@
         currentVideoRange = preferHDR ? videoRanges[videoRanges.length - 1] : videoRanges[0];
         currentFrameRate = minFramerate;
         currentBw = Math.max(currentBw, minBitrate);
-        logger.log("[abr] picked start tier " + JSON.stringify(startTier));
+        this.log("picked start tier " + JSON.stringify(startTier));
       } else {
         currentCodecSet = level == null ? void 0 : level.codecSet;
         currentVideoRange = level == null ? void 0 : level.videoRange;
@@ -7628,11 +7680,11 @@
                 var levels = _this2.hls.levels;
                 var index = levels.indexOf(levelInfo);
                 if (decodingInfo.error) {
-                  logger.warn("[abr] MediaCapabilities decodingInfo error: \"" + decodingInfo.error + "\" for level " + index + " " + JSON.stringify(decodingInfo));
+                  _this2.warn("MediaCapabilities decodingInfo error: \"" + decodingInfo.error + "\" for level " + index + " " + JSON.stringify(decodingInfo));
                 } else if (!decodingInfo.supported) {
-                  logger.warn("[abr] Unsupported MediaCapabilities decodingInfo result for level " + index + " " + JSON.stringify(decodingInfo));
+                  _this2.warn("Unsupported MediaCapabilities decodingInfo result for level " + index + " " + JSON.stringify(decodingInfo));
                   if (index > -1 && levels.length > 1) {
-                    logger.log("[abr] Removing unsupported level " + index);
+                    _this2.log("Removing unsupported level " + index);
                     _this2.hls.removeLevel(index);
                   }
                 }
@@ -7679,9 +7731,9 @@
             var forcedAutoLevel = _this2.forcedAutoLevel;
             if (i !== loadLevel && (forcedAutoLevel === -1 || forcedAutoLevel !== loadLevel)) {
               if (levelsSkipped.length) {
-                logger.trace("[abr] 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);
+                _this2.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);
               }
-              logger.info("[abr] 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:" + currentCodecSet + " videoRange:" + currentVideoRange + " hls.loadLevel:" + loadLevel);
+              _this2.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:" + currentCodecSet + " videoRange:" + currentVideoRange + " hls.loadLevel:" + loadLevel);
             }
             if (firstSelection) {
               _this2.firstSelection = i;
@@ -7715,7 +7767,7 @@
         }
         var firstLevel = this.hls.firstLevel;
         var clamped = Math.min(Math.max(firstLevel, minAutoLevel), maxAutoLevel);
-        logger.warn("[abr] Could not find best starting auto level. Defaulting to first in playlist " + firstLevel + " clamped to " + clamped);
+        this.warn("Could not find best starting auto level. Defaulting to first in playlist " + firstLevel + " clamped to " + clamped);
         return clamped;
       }
     }, {
@@ -7757,15 +7809,18 @@
         return nextABRAutoLevel;
       },
       set: function set(nextLevel) {
-        var value = Math.max(this.hls.minAutoLevel, nextLevel);
-        if (this._nextAutoLevel != value) {
+        var _this$hls3 = this.hls,
+          maxAutoLevel = _this$hls3.maxAutoLevel,
+          minAutoLevel = _this$hls3.minAutoLevel;
+        var value = Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+        if (this._nextAutoLevel !== value) {
           this.nextAutoLevelKey = '';
           this._nextAutoLevel = value;
         }
       }
     }]);
     return AbrController;
-  }();
+  }(Logger);
 
   /**
    * @ignore
@@ -7796,13 +7851,17 @@
    * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further
    * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo).
    */
-  var TaskLoop = /*#__PURE__*/function () {
-    function TaskLoop() {
-      this._boundTick = void 0;
-      this._tickTimer = null;
-      this._tickInterval = null;
-      this._tickCallCount = 0;
-      this._boundTick = this.tick.bind(this);
+  var TaskLoop = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(TaskLoop, _Logger);
+    function TaskLoop(label, logger) {
+      var _this;
+      _this = _Logger.call(this, label, logger) || this;
+      _this._boundTick = void 0;
+      _this._tickTimer = null;
+      _this._tickInterval = null;
+      _this._tickCallCount = 0;
+      _this._boundTick = _this.tick.bind(_assertThisInitialized(_this));
+      return _this;
     }
     var _proto = TaskLoop.prototype;
     _proto.destroy = function destroy() {
@@ -7888,7 +7947,7 @@
      */;
     _proto.doTick = function doTick() {};
     return TaskLoop;
-  }();
+  }(Logger);
 
   var FragmentState = {
     NOT_LOADED: "NOT_LOADED",
@@ -8907,8 +8966,8 @@
       var _frag$decryptdata;
       var byteRangeStart = start;
       var byteRangeEnd = end;
-      if (frag.sn === 'initSegment' && ((_frag$decryptdata = frag.decryptdata) == null ? void 0 : _frag$decryptdata.method) === 'AES-128') {
-        // MAP segment encrypted with method 'AES-128', when served with HTTP Range,
+      if (frag.sn === 'initSegment' && isMethodFullSegmentAesCbc((_frag$decryptdata = frag.decryptdata) == null ? void 0 : _frag$decryptdata.method)) {
+        // MAP segment encrypted with method 'AES-128' or 'AES-256' (cbc), when served with HTTP Range,
         // has the unencrypted size specified in the range.
         // Ref: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
         var fragmentLen = end - start;
@@ -8941,6 +9000,9 @@
     (part ? part : frag).stats.aborted = true;
     return new LoadError(errorData);
   }
+  function isMethodFullSegmentAesCbc(method) {
+    return method === 'AES-128' || method === 'AES-256';
+  }
   var LoadError = /*#__PURE__*/function (_Error) {
     _inheritsLoose(LoadError, _Error);
     function LoadError(data) {
@@ -8954,37 +9016,65 @@
   }( /*#__PURE__*/_wrapNativeSuper(Error));
 
   var AESCrypto = /*#__PURE__*/function () {
-    function AESCrypto(subtle, iv) {
+    function AESCrypto(subtle, iv, aesMode) {
       this.subtle = void 0;
       this.aesIV = void 0;
+      this.aesMode = void 0;
       this.subtle = subtle;
       this.aesIV = iv;
+      this.aesMode = aesMode;
     }
     var _proto = AESCrypto.prototype;
     _proto.decrypt = function decrypt(data, key) {
-      return this.subtle.decrypt({
-        name: 'AES-CBC',
-        iv: this.aesIV
-      }, key, data);
+      switch (this.aesMode) {
+        case DecrypterAesMode.cbc:
+          return this.subtle.decrypt({
+            name: 'AES-CBC',
+            iv: this.aesIV
+          }, key, data);
+        case DecrypterAesMode.ctr:
+          return this.subtle.decrypt({
+            name: 'AES-CTR',
+            counter: this.aesIV,
+            length: 64
+          },
+          //64 : NIST SP800-38A standard suggests that the counter should occupy half of the counter block
+          key, data);
+        default:
+          throw new Error("[AESCrypto] invalid aes mode " + this.aesMode);
+      }
     };
     return AESCrypto;
   }();
 
   var FastAESKey = /*#__PURE__*/function () {
-    function FastAESKey(subtle, key) {
+    function FastAESKey(subtle, key, aesMode) {
       this.subtle = void 0;
       this.key = void 0;
+      this.aesMode = void 0;
       this.subtle = subtle;
       this.key = key;
+      this.aesMode = aesMode;
     }
     var _proto = FastAESKey.prototype;
     _proto.expandKey = function expandKey() {
+      var subtleAlgoName = getSubtleAlgoName(this.aesMode);
       return this.subtle.importKey('raw', this.key, {
-        name: 'AES-CBC'
+        name: subtleAlgoName
       }, false, ['encrypt', 'decrypt']);
     };
     return FastAESKey;
   }();
+  function getSubtleAlgoName(aesMode) {
+    switch (aesMode) {
+      case DecrypterAesMode.cbc:
+        return 'AES-CBC';
+      case DecrypterAesMode.ctr:
+        return 'AES-CTR';
+      default:
+        throw new Error("[FastAESKey] invalid aes mode " + aesMode);
+    }
+  }
 
   // PKCS7
   function removePadding(array) {
@@ -9237,7 +9327,8 @@
       this.currentIV = null;
       this.currentResult = null;
       this.useSoftware = void 0;
-      this.useSoftware = config.enableSoftwareAES;
+      this.enableSoftwareAES = void 0;
+      this.enableSoftwareAES = config.enableSoftwareAES;
       this.removePKCS7Padding = removePKCS7Padding;
       // built in decryptor expects PKCS7 padding
       if (removePKCS7Padding) {
@@ -9250,9 +9341,7 @@
           /* no-op */
         }
       }
-      if (this.subtle === null) {
-        this.useSoftware = true;
-      }
+      this.useSoftware = this.subtle === null;
     }
     var _proto = Decrypter.prototype;
     _proto.destroy = function destroy() {
@@ -9289,11 +9378,11 @@
         this.softwareDecrypter = null;
       }
     };
-    _proto.decrypt = function decrypt(data, key, iv) {
+    _proto.decrypt = function decrypt(data, key, iv, aesMode) {
       var _this = this;
       if (this.useSoftware) {
         return new Promise(function (resolve, reject) {
-          _this.softwareDecrypt(new Uint8Array(data), key, iv);
+          _this.softwareDecrypt(new Uint8Array(data), key, iv, aesMode);
           var decryptResult = _this.flush();
           if (decryptResult) {
             resolve(decryptResult.buffer);
@@ -9302,16 +9391,20 @@
           }
         });
       }
-      return this.webCryptoDecrypt(new Uint8Array(data), key, iv);
+      return this.webCryptoDecrypt(new Uint8Array(data), key, iv, aesMode);
     }
 
     // Software decryption is progressive. Progressive decryption may not return a result on each call. Any cached
     // data is handled in the flush() call
     ;
-    _proto.softwareDecrypt = function softwareDecrypt(data, key, iv) {
+    _proto.softwareDecrypt = function softwareDecrypt(data, key, iv, aesMode) {
       var currentIV = this.currentIV,
         currentResult = this.currentResult,
         remainderData = this.remainderData;
+      if (aesMode !== DecrypterAesMode.cbc || key.byteLength !== 16) {
+        logger.warn('SoftwareDecrypt: can only handle AES-128-CBC');
+        return null;
+      }
       this.logOnce('JS AES decrypt');
       // The output is staggered during progressive parsing - the current result is cached, and emitted on the next call
       // This is done in order to strip PKCS7 padding, which is found at the end of each segment. We only know we've reached
@@ -9344,12 +9437,12 @@
       }
       return result;
     };
-    _proto.webCryptoDecrypt = function webCryptoDecrypt(data, key, iv) {
+    _proto.webCryptoDecrypt = function webCryptoDecrypt(data, key, iv, aesMode) {
       var _this2 = this;
       var subtle = this.subtle;
       if (this.key !== key || !this.fastAesKey) {
         this.key = key;
-        this.fastAesKey = new FastAESKey(subtle, key);
+        this.fastAesKey = new FastAESKey(subtle, key, aesMode);
       }
       return this.fastAesKey.expandKey().then(function (aesKey) {
         // decrypt using web crypto
@@ -9357,22 +9450,25 @@
           return Promise.reject(new Error('web crypto not initialized'));
         }
         _this2.logOnce('WebCrypto AES decrypt');
-        var crypto = new AESCrypto(subtle, new Uint8Array(iv));
+        var crypto = new AESCrypto(subtle, new Uint8Array(iv), aesMode);
         return crypto.decrypt(data.buffer, aesKey);
       }).catch(function (err) {
         logger.warn("[decrypter]: WebCrypto Error, disable WebCrypto API, " + err.name + ": " + err.message);
-        return _this2.onWebCryptoError(data, key, iv);
+        return _this2.onWebCryptoError(data, key, iv, aesMode);
       });
     };
-    _proto.onWebCryptoError = function onWebCryptoError(data, key, iv) {
-      this.useSoftware = true;
-      this.logEnabled = true;
-      this.softwareDecrypt(data, key, iv);
-      var decryptResult = this.flush();
-      if (decryptResult) {
-        return decryptResult.buffer;
+    _proto.onWebCryptoError = function onWebCryptoError(data, key, iv, aesMode) {
+      var enableSoftwareAES = this.enableSoftwareAES;
+      if (enableSoftwareAES) {
+        this.useSoftware = true;
+        this.logEnabled = true;
+        this.softwareDecrypt(data, key, iv, aesMode);
+        var decryptResult = this.flush();
+        if (decryptResult) {
+          return decryptResult.buffer;
+        }
       }
-      throw new Error('WebCrypto and softwareDecrypt: failed to decrypt data');
+      throw new Error('WebCrypto' + (enableSoftwareAES ? ' and softwareDecrypt' : '') + ': failed to decrypt data');
     };
     _proto.getValidChunk = function getValidChunk(data) {
       var currentChunk = data;
@@ -9426,7 +9522,7 @@
     _inheritsLoose(BaseStreamController, _TaskLoop);
     function BaseStreamController(hls, fragmentTracker, keyLoader, logPrefix, playlistType) {
       var _this;
-      _this = _TaskLoop.call(this) || this;
+      _this = _TaskLoop.call(this, logPrefix, hls.logger) || this;
       _this.hls = void 0;
       _this.fragPrevious = null;
       _this.fragCurrent = null;
@@ -9451,25 +9547,87 @@
       _this.startFragRequested = false;
       _this.decrypter = void 0;
       _this.initPTS = [];
-      _this.onvseeking = null;
-      _this.onvended = null;
-      _this.logPrefix = '';
-      _this.log = void 0;
-      _this.warn = void 0;
+      _this.buffering = true;
+      _this.onMediaSeeking = function () {
+        var _assertThisInitialize = _assertThisInitialized(_this),
+          config = _assertThisInitialize.config,
+          fragCurrent = _assertThisInitialize.fragCurrent,
+          media = _assertThisInitialize.media,
+          mediaBuffer = _assertThisInitialize.mediaBuffer,
+          state = _assertThisInitialize.state;
+        var currentTime = media ? media.currentTime : 0;
+        var bufferInfo = BufferHelper.bufferInfo(mediaBuffer ? mediaBuffer : media, currentTime, config.maxBufferHole);
+        _this.log("media seeking to " + (isFiniteNumber(currentTime) ? currentTime.toFixed(3) : currentTime) + ", state: " + state);
+        if (_this.state === State.ENDED) {
+          _this.resetLoadingState();
+        } else if (fragCurrent) {
+          // Seeking while frag load is in progress
+          var tolerance = config.maxFragLookUpTolerance;
+          var fragStartOffset = fragCurrent.start - tolerance;
+          var fragEndOffset = fragCurrent.start + fragCurrent.duration + tolerance;
+          // if seeking out of buffered range or into new one
+          if (!bufferInfo.len || fragEndOffset < bufferInfo.start || fragStartOffset > bufferInfo.end) {
+            var pastFragment = currentTime > fragEndOffset;
+            // if the seek position is outside the current fragment range
+            if (currentTime < fragStartOffset || pastFragment) {
+              if (pastFragment && fragCurrent.loader) {
+                _this.log('seeking outside of buffer while fragment load in progress, cancel fragment load');
+                fragCurrent.abortRequests();
+                _this.resetLoadingState();
+              }
+              _this.fragPrevious = null;
+            }
+          }
+        }
+        if (media) {
+          // Remove gap fragments
+          _this.fragmentTracker.removeFragmentsInRange(currentTime, Infinity, _this.playlistType, true);
+          _this.lastCurrentTime = currentTime;
+        }
+
+        // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target
+        if (!_this.loadedmetadata && !bufferInfo.len) {
+          _this.nextLoadPosition = _this.startPosition = currentTime;
+        }
+
+        // Async tick to speed up processing
+        _this.tickImmediate();
+      };
+      _this.onMediaEnded = function () {
+        // reset startPosition and lastCurrentTime to restart playback @ stream beginning
+        _this.startPosition = _this.lastCurrentTime = 0;
+        if (_this.playlistType === PlaylistLevelType.MAIN) {
+          _this.hls.trigger(Events.MEDIA_ENDED, {
+            stalled: false
+          });
+        }
+      };
       _this.playlistType = playlistType;
-      _this.logPrefix = logPrefix;
-      _this.log = logger.log.bind(logger, logPrefix + ":");
-      _this.warn = logger.warn.bind(logger, logPrefix + ":");
       _this.hls = hls;
       _this.fragmentLoader = new FragmentLoader(hls.config);
       _this.keyLoader = keyLoader;
       _this.fragmentTracker = fragmentTracker;
       _this.config = hls.config;
       _this.decrypter = new Decrypter(hls.config);
-      hls.on(Events.MANIFEST_LOADED, _this.onManifestLoaded, _assertThisInitialized(_this));
       return _this;
     }
     var _proto = BaseStreamController.prototype;
+    _proto.registerListeners = function registerListeners() {
+      var hls = this.hls;
+      hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+      hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+      hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+      hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+      hls.on(Events.ERROR, this.onError, this);
+    };
+    _proto.unregisterListeners = function unregisterListeners() {
+      var hls = this.hls;
+      hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+      hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+      hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+      hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+      hls.off(Events.ERROR, this.onError, this);
+    };
     _proto.doTick = function doTick() {
       this.onTickEnd();
     };
@@ -9493,6 +9651,12 @@
       this.clearNextTick();
       this.state = State.STOPPED;
     };
+    _proto.pauseBuffering = function pauseBuffering() {
+      this.buffering = false;
+    };
+    _proto.resumeBuffering = function resumeBuffering() {
+      this.buffering = true;
+    };
     _proto._streamEnded = function _streamEnded(bufferInfo, levelDetails) {
       // If playlist is live, there is another buffered range after the current range, nothing buffered, media is detached,
       // of nothing loading/loaded return false
@@ -9523,10 +9687,8 @@
     };
     _proto.onMediaAttached = function onMediaAttached(event, data) {
       var media = this.media = this.mediaBuffer = data.media;
-      this.onvseeking = this.onMediaSeeking.bind(this);
-      this.onvended = this.onMediaEnded.bind(this);
-      media.addEventListener('seeking', this.onvseeking);
-      media.addEventListener('ended', this.onvended);
+      media.addEventListener('seeking', this.onMediaSeeking);
+      media.addEventListener('ended', this.onMediaEnded);
       var config = this.config;
       if (this.levels && config.autoStartLoad && this.state === State.STOPPED) {
         this.startLoad(config.startPosition);
@@ -9540,10 +9702,9 @@
       }
 
       // remove video listeners
-      if (media && this.onvseeking && this.onvended) {
-        media.removeEventListener('seeking', this.onvseeking);
-        media.removeEventListener('ended', this.onvended);
-        this.onvseeking = this.onvended = null;
+      if (media) {
+        media.removeEventListener('seeking', this.onMediaSeeking);
+        media.removeEventListener('ended', this.onMediaEnded);
       }
       if (this.keyLoader) {
         this.keyLoader.detach();
@@ -9553,54 +9714,8 @@
       this.fragmentTracker.removeAllFragments();
       this.stopLoad();
     };
-    _proto.onMediaSeeking = function onMediaSeeking() {
-      var config = this.config,
-        fragCurrent = this.fragCurrent,
-        media = this.media,
-        mediaBuffer = this.mediaBuffer,
-        state = this.state;
-      var currentTime = media ? media.currentTime : 0;
-      var bufferInfo = BufferHelper.bufferInfo(mediaBuffer ? mediaBuffer : media, currentTime, config.maxBufferHole);
-      this.log("media seeking to " + (isFiniteNumber(currentTime) ? currentTime.toFixed(3) : currentTime) + ", state: " + state);
-      if (this.state === State.ENDED) {
-        this.resetLoadingState();
-      } else if (fragCurrent) {
-        // Seeking while frag load is in progress
-        var tolerance = config.maxFragLookUpTolerance;
-        var fragStartOffset = fragCurrent.start - tolerance;
-        var fragEndOffset = fragCurrent.start + fragCurrent.duration + tolerance;
-        // if seeking out of buffered range or into new one
-        if (!bufferInfo.len || fragEndOffset < bufferInfo.start || fragStartOffset > bufferInfo.end) {
-          var pastFragment = currentTime > fragEndOffset;
-          // if the seek position is outside the current fragment range
-          if (currentTime < fragStartOffset || pastFragment) {
-            if (pastFragment && fragCurrent.loader) {
-              this.log('seeking outside of buffer while fragment load in progress, cancel fragment load');
-              fragCurrent.abortRequests();
-              this.resetLoadingState();
-            }
-            this.fragPrevious = null;
-          }
-        }
-      }
-      if (media) {
-        // Remove gap fragments
-        this.fragmentTracker.removeFragmentsInRange(currentTime, Infinity, this.playlistType, true);
-        this.lastCurrentTime = currentTime;
-      }
-
-      // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target
-      if (!this.loadedmetadata && !bufferInfo.len) {
-        this.nextLoadPosition = this.startPosition = currentTime;
-      }
-
-      // Async tick to speed up processing
-      this.tickImmediate();
-    };
-    _proto.onMediaEnded = function onMediaEnded() {
-      // reset startPosition and lastCurrentTime to restart playback @ stream beginning
-      this.startPosition = this.lastCurrentTime = 0;
-    };
+    _proto.onManifestLoading = function onManifestLoading() {};
+    _proto.onError = function onError(event, data) {};
     _proto.onManifestLoaded = function onManifestLoaded(event, data) {
       this.startTimeOffset = data.startTimeOffset;
       this.initPTS = [];
@@ -9610,7 +9725,7 @@
       this.stopLoad();
       _TaskLoop.prototype.onHandlerDestroying.call(this);
       // @ts-ignore
-      this.hls = null;
+      this.hls = this.onMediaSeeking = this.onMediaEnded = null;
     };
     _proto.onHandlerDestroyed = function onHandlerDestroyed() {
       this.state = State.STOPPED;
@@ -9740,10 +9855,10 @@
         var decryptData = frag.decryptdata;
 
         // check to see if the payload needs to be decrypted
-        if (payload && payload.byteLength > 0 && decryptData != null && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
+        if (payload && payload.byteLength > 0 && decryptData != null && decryptData.key && decryptData.iv && isFullSegmentEncryption(decryptData.method)) {
           var startTime = self.performance.now();
           // decrypt init segment data
-          return _this3.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).catch(function (err) {
+          return _this3.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer, getAesModeFromFullSegmentMethod(decryptData.method)).catch(function (err) {
             hls.trigger(Events.ERROR, {
               type: ErrorTypes.MEDIA_ERROR,
               details: ErrorDetails.FRAG_DECRYPT_ERROR,
@@ -9856,7 +9971,7 @@
       }
       var keyLoadingPromise = null;
       if (frag.encrypted && !((_frag$decryptdata = frag.decryptdata) != null && _frag$decryptdata.key)) {
-        this.log("Loading key for " + frag.sn + " of [" + details.startSN + "-" + details.endSN + "], " + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + " " + frag.level);
+        this.log("Loading key for " + frag.sn + " of [" + details.startSN + "-" + details.endSN + "], " + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + " " + frag.level);
         this.state = State.KEY_LOADING;
         this.fragCurrent = frag;
         keyLoadingPromise = this.keyLoader.load(frag).then(function (keyLoadedData) {
@@ -9887,7 +10002,7 @@
           var partIndex = this.getNextPart(partList, frag, targetBufferTime);
           if (partIndex > -1) {
             var part = partList[partIndex];
-            this.log("Loading part sn: " + frag.sn + " p: " + part.index + " cc: " + frag.cc + " of playlist [" + details.startSN + "-" + details.endSN + "] parts [0-" + partIndex + "-" + (partList.length - 1) + "] " + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
+            this.log("Loading part sn: " + frag.sn + " p: " + part.index + " cc: " + frag.cc + " of playlist [" + details.startSN + "-" + details.endSN + "] parts [0-" + partIndex + "-" + (partList.length - 1) + "] " + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
             this.nextLoadPosition = part.start + part.duration;
             this.state = State.FRAG_LOADING;
             var _result;
@@ -9920,7 +10035,7 @@
           }
         }
       }
-      this.log("Loading fragment " + frag.sn + " cc: " + frag.cc + " " + (details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : '') + (this.logPrefix === '[stream-controller]' ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
+      this.log("Loading fragment " + frag.sn + " cc: " + frag.cc + " " + (details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : '') + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
       // Don't update nextLoadPosition for fragments which are not buffered
       if (isFiniteNumber(frag.sn) && !this.bitrateTest) {
         this.nextLoadPosition = frag.start + frag.duration;
@@ -10481,7 +10596,7 @@
             errorAction.resolved = true;
           }
         } else {
-          logger.warn(data.details + " reached or exceeded max retry (" + retryCount + ")");
+          this.warn(data.details + " reached or exceeded max retry (" + retryCount + ")");
           return;
         }
       } else if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox) {
@@ -10881,6 +10996,7 @@
    */
   function getAudioConfig(observer, data, offset, audioCodec) {
     var adtsObjectType;
+    var originalAdtsObjectType;
     var adtsExtensionSamplingIndex;
     var adtsChannelConfig;
     var config;
@@ -10888,7 +11004,7 @@
     var manifestCodec = audioCodec;
     var adtsSamplingRates = [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350];
     // byte 2
-    adtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
+    adtsObjectType = originalAdtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
     var adtsSamplingIndex = (data[offset + 2] & 0x3c) >>> 2;
     if (adtsSamplingIndex > adtsSamplingRates.length - 1) {
       var error = new Error("invalid ADTS sampling index:" + adtsSamplingIndex);
@@ -10905,8 +11021,8 @@
     // byte 3
     adtsChannelConfig |= (data[offset + 3] & 0xc0) >>> 6;
     logger.log("manifest codec:" + audioCodec + ", ADTS type:" + adtsObjectType + ", samplingIndex:" + adtsSamplingIndex);
-    // firefox: freq less than 24kHz = AAC SBR (HE-AAC)
-    if (/firefox/i.test(userAgent)) {
+    // Firefox and Pale Moon: freq less than 24kHz = AAC SBR (HE-AAC)
+    if (/firefox|palemoon/i.test(userAgent)) {
       if (adtsSamplingIndex >= 6) {
         adtsObjectType = 5;
         config = new Array(4);
@@ -11000,6 +11116,7 @@
       samplerate: adtsSamplingRates[adtsSamplingIndex],
       channelCount: adtsChannelConfig,
       codec: 'mp4a.40.' + adtsObjectType,
+      parsedCodec: 'mp4a.40.' + originalAdtsObjectType,
       manifestCodec: manifestCodec
     };
   }
@@ -11054,7 +11171,8 @@
       track.channelCount = config.channelCount;
       track.codec = config.codec;
       track.manifestCodec = config.manifestCodec;
-      logger.log("parsed codec:" + track.codec + ", rate:" + config.samplerate + ", channels:" + config.channelCount);
+      track.parsedCodec = config.parsedCodec;
+      logger.log("parsed codec:" + track.parsedCodec + ", codec:" + track.codec + ", rate:" + config.samplerate + ", channels:" + config.channelCount);
     }
   }
   function getFrameDuration(samplerate) {
@@ -11652,65 +11770,169 @@
         logger.log(VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug);
       }
     };
-    return BaseVideoParser;
-  }();
-
-  /**
-   * Parser for exponential Golomb codes, a variable-bitwidth number encoding scheme used by h264.
-   */
-
-  var ExpGolomb = /*#__PURE__*/function () {
-    function ExpGolomb(data) {
-      this.data = void 0;
-      this.bytesAvailable = void 0;
-      this.word = void 0;
-      this.bitsAvailable = void 0;
-      this.data = data;
-      // the number of bytes left to examine in this.data
-      this.bytesAvailable = data.byteLength;
-      // the current word being examined
-      this.word = 0; // :uint
-      // the number of bits left to examine in the current word
-      this.bitsAvailable = 0; // :uint
-    }
-
-    // ():void
-    var _proto = ExpGolomb.prototype;
-    _proto.loadWord = function loadWord() {
-      var data = this.data;
-      var bytesAvailable = this.bytesAvailable;
-      var position = data.byteLength - bytesAvailable;
-      var workingBytes = new Uint8Array(4);
-      var availableBytes = Math.min(4, bytesAvailable);
-      if (availableBytes === 0) {
-        throw new Error('no bytes available');
-      }
-      workingBytes.set(data.subarray(position, position + availableBytes));
-      this.word = new DataView(workingBytes.buffer).getUint32(0);
-      // track the amount of this.data that has been processed
-      this.bitsAvailable = availableBytes * 8;
-      this.bytesAvailable -= availableBytes;
-    }
+    _proto.parseNALu = function parseNALu(track, array) {
+      var len = array.byteLength;
+      var state = track.naluState || 0;
+      var lastState = state;
+      var units = [];
+      var i = 0;
+      var value;
+      var overflow;
+      var unitType;
+      var lastUnitStart = -1;
+      var lastUnitType = 0;
+      // logger.log('PES:' + Hex.hexDump(array));
 
-    // (count:int):void
-    ;
-    _proto.skipBits = function skipBits(count) {
-      var skipBytes; // :int
-      count = Math.min(count, this.bytesAvailable * 8 + this.bitsAvailable);
-      if (this.bitsAvailable > count) {
-        this.word <<= count;
-        this.bitsAvailable -= count;
-      } else {
-        count -= this.bitsAvailable;
-        skipBytes = count >> 3;
-        count -= skipBytes << 3;
-        this.bytesAvailable -= skipBytes;
-        this.loadWord();
-        this.word <<= count;
-        this.bitsAvailable -= count;
+      if (state === -1) {
+        // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet
+        lastUnitStart = 0;
+        // NALu type is value read from offset 0
+        lastUnitType = this.getNALuType(array, 0);
+        state = 0;
+        i = 1;
       }
-    }
-
+      while (i < len) {
+        value = array[i++];
+        // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case
+        if (!state) {
+          state = value ? 0 : 1;
+          continue;
+        }
+        if (state === 1) {
+          state = value ? 0 : 2;
+          continue;
+        }
+        // here we have state either equal to 2 or 3
+        if (!value) {
+          state = 3;
+        } else if (value === 1) {
+          overflow = i - state - 1;
+          if (lastUnitStart >= 0) {
+            var unit = {
+              data: array.subarray(lastUnitStart, overflow),
+              type: lastUnitType
+            };
+            // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
+            units.push(unit);
+          } else {
+            // lastUnitStart is undefined => this is the first start code found in this PES packet
+            // first check if start code delimiter is overlapping between 2 PES packets,
+            // ie it started in last packet (lastState not zero)
+            // and ended at the beginning of this PES packet (i <= 4 - lastState)
+            var lastUnit = this.getLastNalUnit(track.samples);
+            if (lastUnit) {
+              if (lastState && i <= 4 - lastState) {
+                // start delimiter overlapping between PES packets
+                // strip start delimiter bytes from the end of last NAL unit
+                // check if lastUnit had a state different from zero
+                if (lastUnit.state) {
+                  // strip last bytes
+                  lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState);
+                }
+              }
+              // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit.
+
+              if (overflow > 0) {
+                // logger.log('first NALU found with overflow:' + overflow);
+                lastUnit.data = appendUint8Array(lastUnit.data, array.subarray(0, overflow));
+                lastUnit.state = 0;
+              }
+            }
+          }
+          // check if we can read unit type
+          if (i < len) {
+            unitType = this.getNALuType(array, i);
+            // logger.log('find NALU @ offset:' + i + ',type:' + unitType);
+            lastUnitStart = i;
+            lastUnitType = unitType;
+            state = 0;
+          } else {
+            // not enough byte to read unit type. let's read it on next PES parsing
+            state = -1;
+          }
+        } else {
+          state = 0;
+        }
+      }
+      if (lastUnitStart >= 0 && state >= 0) {
+        var _unit = {
+          data: array.subarray(lastUnitStart, len),
+          type: lastUnitType,
+          state: state
+        };
+        units.push(_unit);
+        // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
+      }
+      // no NALu found
+      if (units.length === 0) {
+        // append pes.data to previous NAL unit
+        var _lastUnit = this.getLastNalUnit(track.samples);
+        if (_lastUnit) {
+          _lastUnit.data = appendUint8Array(_lastUnit.data, array);
+        }
+      }
+      track.naluState = state;
+      return units;
+    };
+    return BaseVideoParser;
+  }();
+
+  /**
+   * Parser for exponential Golomb codes, a variable-bitwidth number encoding scheme used by h264.
+   */
+
+  var ExpGolomb = /*#__PURE__*/function () {
+    function ExpGolomb(data) {
+      this.data = void 0;
+      this.bytesAvailable = void 0;
+      this.word = void 0;
+      this.bitsAvailable = void 0;
+      this.data = data;
+      // the number of bytes left to examine in this.data
+      this.bytesAvailable = data.byteLength;
+      // the current word being examined
+      this.word = 0; // :uint
+      // the number of bits left to examine in the current word
+      this.bitsAvailable = 0; // :uint
+    }
+
+    // ():void
+    var _proto = ExpGolomb.prototype;
+    _proto.loadWord = function loadWord() {
+      var data = this.data;
+      var bytesAvailable = this.bytesAvailable;
+      var position = data.byteLength - bytesAvailable;
+      var workingBytes = new Uint8Array(4);
+      var availableBytes = Math.min(4, bytesAvailable);
+      if (availableBytes === 0) {
+        throw new Error('no bytes available');
+      }
+      workingBytes.set(data.subarray(position, position + availableBytes));
+      this.word = new DataView(workingBytes.buffer).getUint32(0);
+      // track the amount of this.data that has been processed
+      this.bitsAvailable = availableBytes * 8;
+      this.bytesAvailable -= availableBytes;
+    }
+
+    // (count:int):void
+    ;
+    _proto.skipBits = function skipBits(count) {
+      var skipBytes; // :int
+      count = Math.min(count, this.bytesAvailable * 8 + this.bitsAvailable);
+      if (this.bitsAvailable > count) {
+        this.word <<= count;
+        this.bitsAvailable -= count;
+      } else {
+        count -= this.bitsAvailable;
+        skipBytes = count >> 3;
+        count -= skipBytes << 3;
+        this.bytesAvailable -= skipBytes;
+        this.loadWord();
+        this.word <<= count;
+        this.bitsAvailable -= count;
+      }
+    }
+
     // (size:int):uint
     ;
     _proto.readBits = function readBits(size) {
@@ -11806,22 +12028,179 @@
     ;
     _proto.readUInt = function readUInt() {
       return this.readBits(32);
+    };
+    return ExpGolomb;
+  }();
+
+  var AvcVideoParser = /*#__PURE__*/function (_BaseVideoParser) {
+    _inheritsLoose(AvcVideoParser, _BaseVideoParser);
+    function AvcVideoParser() {
+      return _BaseVideoParser.apply(this, arguments) || this;
+    }
+    var _proto = AvcVideoParser.prototype;
+    _proto.parsePES = function parsePES(track, textTrack, pes, last, duration) {
+      var _this = this;
+      var units = this.parseNALu(track, pes.data);
+      var VideoSample = this.VideoSample;
+      var push;
+      var spsfound = false;
+      // free pes.data to save up some memory
+      pes.data = null;
+
+      // if new NAL units found and last sample still there, let's push ...
+      // this helps parsing streams with missing AUD (only do this if AUD never found)
+      if (VideoSample && units.length && !track.audFound) {
+        this.pushAccessUnit(VideoSample, track);
+        VideoSample = this.VideoSample = this.createVideoSample(false, pes.pts, pes.dts, '');
+      }
+      units.forEach(function (unit) {
+        var _VideoSample2;
+        switch (unit.type) {
+          // NDR
+          case 1:
+            {
+              var iskey = false;
+              push = true;
+              var data = unit.data;
+              // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...)
+              if (spsfound && data.length > 4) {
+                // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR
+                var sliceType = _this.readSliceType(data);
+                // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice
+                // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples.
+                // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice.
+                // I slice: A slice that is not an SI slice that is decoded using intra prediction only.
+                // if (sliceType === 2 || sliceType === 7) {
+                if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) {
+                  iskey = true;
+                }
+              }
+              if (iskey) {
+                var _VideoSample;
+                // if we have non-keyframe data already, that cannot belong to the same frame as a keyframe, so force a push
+                if ((_VideoSample = VideoSample) != null && _VideoSample.frame && !VideoSample.key) {
+                  _this.pushAccessUnit(VideoSample, track);
+                  VideoSample = _this.VideoSample = null;
+                }
+              }
+              if (!VideoSample) {
+                VideoSample = _this.VideoSample = _this.createVideoSample(true, pes.pts, pes.dts, '');
+              }
+              VideoSample.frame = true;
+              VideoSample.key = iskey;
+              break;
+              // IDR
+            }
+          case 5:
+            push = true;
+            // handle PES not starting with AUD
+            // if we have frame data already, that cannot belong to the same frame, so force a push
+            if ((_VideoSample2 = VideoSample) != null && _VideoSample2.frame && !VideoSample.key) {
+              _this.pushAccessUnit(VideoSample, track);
+              VideoSample = _this.VideoSample = null;
+            }
+            if (!VideoSample) {
+              VideoSample = _this.VideoSample = _this.createVideoSample(true, pes.pts, pes.dts, '');
+            }
+            VideoSample.key = true;
+            VideoSample.frame = true;
+            break;
+          // SEI
+          case 6:
+            {
+              push = true;
+              parseSEIMessageFromNALu(unit.data, 1, pes.pts, textTrack.samples);
+              break;
+              // SPS
+            }
+          case 7:
+            {
+              var _track$pixelRatio, _track$pixelRatio2;
+              push = true;
+              spsfound = true;
+              var sps = unit.data;
+              var config = _this.readSPS(sps);
+              if (!track.sps || track.width !== config.width || track.height !== config.height || ((_track$pixelRatio = track.pixelRatio) == null ? void 0 : _track$pixelRatio[0]) !== config.pixelRatio[0] || ((_track$pixelRatio2 = track.pixelRatio) == null ? void 0 : _track$pixelRatio2[1]) !== config.pixelRatio[1]) {
+                track.width = config.width;
+                track.height = config.height;
+                track.pixelRatio = config.pixelRatio;
+                track.sps = [sps];
+                track.duration = duration;
+                var codecarray = sps.subarray(1, 4);
+                var codecstring = 'avc1.';
+                for (var i = 0; i < 3; i++) {
+                  var h = codecarray[i].toString(16);
+                  if (h.length < 2) {
+                    h = '0' + h;
+                  }
+                  codecstring += h;
+                }
+                track.codec = codecstring;
+              }
+              break;
+            }
+          // PPS
+          case 8:
+            push = true;
+            track.pps = [unit.data];
+            break;
+          // AUD
+          case 9:
+            push = true;
+            track.audFound = true;
+            if (VideoSample) {
+              _this.pushAccessUnit(VideoSample, track);
+            }
+            VideoSample = _this.VideoSample = _this.createVideoSample(false, pes.pts, pes.dts, '');
+            break;
+          // Filler Data
+          case 12:
+            push = true;
+            break;
+          default:
+            push = false;
+            if (VideoSample) {
+              VideoSample.debug += 'unknown NAL ' + unit.type + ' ';
+            }
+            break;
+        }
+        if (VideoSample && push) {
+          var _units = VideoSample.units;
+          _units.push(unit);
+        }
+      });
+      // if last PES packet, push samples
+      if (last && VideoSample) {
+        this.pushAccessUnit(VideoSample, track);
+        this.VideoSample = null;
+      }
+    };
+    _proto.getNALuType = function getNALuType(data, offset) {
+      return data[offset] & 0x1f;
+    };
+    _proto.readSliceType = function readSliceType(data) {
+      var eg = new ExpGolomb(data);
+      // skip NALu type
+      eg.readUByte();
+      // discard first_mb_in_slice
+      eg.readUEG();
+      // return slice_type
+      return eg.readUEG();
     }
 
     /**
-     * Advance the ExpGolomb decoder past a scaling list. The scaling
-     * list is optionally transmitted as part of a sequence parameter
+     * The scaling list is optionally transmitted as part of a sequence parameter
      * set and is not relevant to transmuxing.
      * @param count the number of entries in this scaling list
      * @see Recommendation ITU-T H.264, Section 7.3.2.1.1.1
      */;
-    _proto.skipScalingList = function skipScalingList(count) {
+    _proto.skipScalingList = function skipScalingList(count, reader) {
       var lastScale = 8;
       var nextScale = 8;
       var deltaScale;
       for (var j = 0; j < count; j++) {
         if (nextScale !== 0) {
-          deltaScale = this.readEG();
+          deltaScale = reader.readEG();
           nextScale = (lastScale + deltaScale + 256) % 256;
         }
         lastScale = nextScale === 0 ? lastScale : nextScale;
@@ -11836,7 +12215,8 @@
      * sequence parameter set, including the dimensions of the
      * associated video frames.
      */;
-    _proto.readSPS = function readSPS() {
+    _proto.readSPS = function readSPS(sps) {
+      var eg = new ExpGolomb(sps);
       var frameCropLeftOffset = 0;
       var frameCropRightOffset = 0;
       var frameCropTopOffset = 0;
@@ -11844,13 +12224,13 @@
       var numRefFramesInPicOrderCntCycle;
       var scalingListCount;
       var i;
-      var readUByte = this.readUByte.bind(this);
-      var readBits = this.readBits.bind(this);
-      var readUEG = this.readUEG.bind(this);
-      var readBoolean = this.readBoolean.bind(this);
-      var skipBits = this.skipBits.bind(this);
-      var skipEG = this.skipEG.bind(this);
-      var skipUEG = this.skipUEG.bind(this);
+      var readUByte = eg.readUByte.bind(eg);
+      var readBits = eg.readBits.bind(eg);
+      var readUEG = eg.readUEG.bind(eg);
+      var readBoolean = eg.readBoolean.bind(eg);
+      var skipBits = eg.skipBits.bind(eg);
+      var skipEG = eg.skipEG.bind(eg);
+      var skipUEG = eg.skipUEG.bind(eg);
       var skipScalingList = this.skipScalingList.bind(this);
       readUByte();
       var profileIdc = readUByte(); // profile_idc
@@ -11875,9 +12255,9 @@
             if (readBoolean()) {
               // seq_scaling_list_present_flag[ i ]
               if (i < 6) {
-                skipScalingList(16);
+                skipScalingList(16, eg);
               } else {
-                skipScalingList(64);
+                skipScalingList(64, eg);
               }
             }
           }
@@ -11982,26 +12362,24 @@
         pixelRatio: pixelRatio
       };
     };
-    _proto.readSliceType = function readSliceType() {
-      // skip NALu type
-      this.readUByte();
-      // discard first_mb_in_slice
-      this.readUEG();
-      // return slice_type
-      return this.readUEG();
-    };
-    return ExpGolomb;
-  }();
+    return AvcVideoParser;
+  }(BaseVideoParser);
 
-  var AvcVideoParser = /*#__PURE__*/function (_BaseVideoParser) {
-    _inheritsLoose(AvcVideoParser, _BaseVideoParser);
-    function AvcVideoParser() {
-      return _BaseVideoParser.apply(this, arguments) || this;
-    }
-    var _proto = AvcVideoParser.prototype;
-    _proto.parseAVCPES = function parseAVCPES(track, textTrack, pes, last, duration) {
-      var _this = this;
-      var units = this.parseAVCNALu(track, pes.data);
+  var HevcVideoParser = /*#__PURE__*/function (_BaseVideoParser) {
+    _inheritsLoose(HevcVideoParser, _BaseVideoParser);
+    function HevcVideoParser() {
+      var _this;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      _this = _BaseVideoParser.call.apply(_BaseVideoParser, [this].concat(args)) || this;
+      _this.initVPS = null;
+      return _this;
+    }
+    var _proto = HevcVideoParser.prototype;
+    _proto.parsePES = function parsePES(track, textTrack, pes, last, duration) {
+      var _this2 = this;
+      var units = this.parseNALu(track, pes.data);
       var VideoSample = this.VideoSample;
       var push;
       var spsfound = false;
@@ -12017,112 +12395,143 @@
       units.forEach(function (unit) {
         var _VideoSample2;
         switch (unit.type) {
-          // NDR
+          // NON-IDR, NON RANDOM ACCESS SLICE
+          case 0:
           case 1:
-            {
-              var iskey = false;
-              push = true;
-              var data = unit.data;
-              // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...)
-              if (spsfound && data.length > 4) {
-                // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR
-                var sliceType = new ExpGolomb(data).readSliceType();
-                // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice
-                // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples.
-                // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice.
-                // I slice: A slice that is not an SI slice that is decoded using intra prediction only.
-                // if (sliceType === 2 || sliceType === 7) {
-                if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) {
-                  iskey = true;
-                }
-              }
-              if (iskey) {
-                var _VideoSample;
-                // if we have non-keyframe data already, that cannot belong to the same frame as a keyframe, so force a push
-                if ((_VideoSample = VideoSample) != null && _VideoSample.frame && !VideoSample.key) {
-                  _this.pushAccessUnit(VideoSample, track);
-                  VideoSample = _this.VideoSample = null;
-                }
-              }
-              if (!VideoSample) {
-                VideoSample = _this.VideoSample = _this.createVideoSample(true, pes.pts, pes.dts, '');
+          case 2:
+          case 3:
+          case 4:
+          case 5:
+          case 6:
+          case 7:
+          case 8:
+          case 9:
+            if (!VideoSample) {
+              VideoSample = _this2.VideoSample = _this2.createVideoSample(false, pes.pts, pes.dts, '');
+            }
+            VideoSample.frame = true;
+            push = true;
+            break;
+
+          // CRA, BLA (random access picture)
+          case 16:
+          case 17:
+          case 18:
+          case 21:
+            push = true;
+            if (spsfound) {
+              var _VideoSample;
+              // handle PES not starting with AUD
+              // if we have frame data already, that cannot belong to the same frame, so force a push
+              if ((_VideoSample = VideoSample) != null && _VideoSample.frame && !VideoSample.key) {
+                _this2.pushAccessUnit(VideoSample, track);
+                VideoSample = _this2.VideoSample = null;
               }
-              VideoSample.frame = true;
-              VideoSample.key = iskey;
-              break;
-              // IDR
             }
-          case 5:
+            if (!VideoSample) {
+              VideoSample = _this2.VideoSample = _this2.createVideoSample(true, pes.pts, pes.dts, '');
+            }
+            VideoSample.key = true;
+            VideoSample.frame = true;
+            break;
+
+          // IDR
+          case 19:
+          case 20:
             push = true;
             // handle PES not starting with AUD
             // if we have frame data already, that cannot belong to the same frame, so force a push
             if ((_VideoSample2 = VideoSample) != null && _VideoSample2.frame && !VideoSample.key) {
-              _this.pushAccessUnit(VideoSample, track);
-              VideoSample = _this.VideoSample = null;
+              _this2.pushAccessUnit(VideoSample, track);
+              VideoSample = _this2.VideoSample = null;
             }
             if (!VideoSample) {
-              VideoSample = _this.VideoSample = _this.createVideoSample(true, pes.pts, pes.dts, '');
+              VideoSample = _this2.VideoSample = _this2.createVideoSample(true, pes.pts, pes.dts, '');
             }
             VideoSample.key = true;
             VideoSample.frame = true;
             break;
+
           // SEI
-          case 6:
-            {
-              push = true;
-              parseSEIMessageFromNALu(unit.data, 1, pes.pts, textTrack.samples);
-              break;
-              // SPS
+          case 39:
+            push = true;
+            parseSEIMessageFromNALu(unit.data, 2,
+            // NALu header size
+            pes.pts, textTrack.samples);
+            break;
+
+          // VPS
+          case 32:
+            push = true;
+            if (!track.vps) {
+              var config = _this2.readVPS(unit.data);
+              track.params = _objectSpread2({}, config);
+              _this2.initVPS = unit.data;
             }
-          case 7:
-            {
-              var _track$pixelRatio, _track$pixelRatio2;
-              push = true;
-              spsfound = true;
-              var sps = unit.data;
-              var expGolombDecoder = new ExpGolomb(sps);
-              var config = expGolombDecoder.readSPS();
-              if (!track.sps || track.width !== config.width || track.height !== config.height || ((_track$pixelRatio = track.pixelRatio) == null ? void 0 : _track$pixelRatio[0]) !== config.pixelRatio[0] || ((_track$pixelRatio2 = track.pixelRatio) == null ? void 0 : _track$pixelRatio2[1]) !== config.pixelRatio[1]) {
-                track.width = config.width;
-                track.height = config.height;
-                track.pixelRatio = config.pixelRatio;
-                track.sps = [sps];
+            track.vps = [unit.data];
+            break;
+
+          // SPS
+          case 33:
+            push = true;
+            spsfound = true;
+            if (typeof track.params === 'object') {
+              if (track.vps !== undefined && track.vps[0] !== _this2.initVPS && track.sps !== undefined && !_this2.matchSPS(track.sps[0], unit.data)) {
+                _this2.initVPS = track.vps[0];
+                track.sps = track.pps = undefined;
+              }
+              if (!track.sps) {
+                var _config = _this2.readSPS(unit.data);
+                track.width = _config.width;
+                track.height = _config.height;
+                track.pixelRatio = _config.pixelRatio;
                 track.duration = duration;
-                var codecarray = sps.subarray(1, 4);
-                var codecstring = 'avc1.';
-                for (var i = 0; i < 3; i++) {
-                  var h = codecarray[i].toString(16);
-                  if (h.length < 2) {
-                    h = '0' + h;
-                  }
-                  codecstring += h;
+                track.codec = _config.codecString;
+                track.sps = [];
+                for (var prop in _config.params) {
+                  track.params[prop] = _config.params[prop];
                 }
-                track.codec = codecstring;
               }
-              break;
+              if (track.vps !== undefined && track.vps[0] === _this2.initVPS) {
+                track.sps.push(unit.data);
+              }
             }
+            if (!VideoSample) {
+              VideoSample = _this2.VideoSample = _this2.createVideoSample(true, pes.pts, pes.dts, '');
+            }
+            VideoSample.key = true;
+            break;
+
           // PPS
-          case 8:
+          case 34:
             push = true;
-            track.pps = [unit.data];
+            if (typeof track.params === 'object') {
+              if (!track.pps) {
+                track.pps = [];
+                var _config2 = _this2.readPPS(unit.data);
+                for (var _prop in _config2) {
+                  track.params[_prop] = _config2[_prop];
+                }
+              }
+              if (_this2.initVPS !== null || track.pps.length === 0) {
+                track.pps.push(unit.data);
+              }
+            }
             break;
-          // AUD
-          case 9:
+
+          // ACCESS UNIT DELIMITER
+          case 35:
             push = true;
             track.audFound = true;
             if (VideoSample) {
-              _this.pushAccessUnit(VideoSample, track);
+              _this2.pushAccessUnit(VideoSample, track);
             }
-            VideoSample = _this.VideoSample = _this.createVideoSample(false, pes.pts, pes.dts, '');
-            break;
-          // Filler Data
-          case 12:
-            push = true;
+            VideoSample = _this2.VideoSample = _this2.createVideoSample(false, pes.pts, pes.dts, '');
             break;
           default:
             push = false;
             if (VideoSample) {
-              VideoSample.debug += 'unknown NAL ' + unit.type + ' ';
+              VideoSample.debug += 'unknown or irrelevant NAL ' + unit.type + ' ';
             }
             break;
         }
@@ -12137,111 +12546,425 @@
         this.VideoSample = null;
       }
     };
-    _proto.parseAVCNALu = function parseAVCNALu(track, array) {
-      var len = array.byteLength;
-      var state = track.naluState || 0;
-      var lastState = state;
-      var units = [];
-      var i = 0;
-      var value;
-      var overflow;
-      var unitType;
-      var lastUnitStart = -1;
-      var lastUnitType = 0;
-      // logger.log('PES:' + Hex.hexDump(array));
-
-      if (state === -1) {
-        // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet
-        lastUnitStart = 0;
-        // NALu type is value read from offset 0
-        lastUnitType = array[0] & 0x1f;
-        state = 0;
-        i = 1;
-      }
-      while (i < len) {
-        value = array[i++];
-        // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case
-        if (!state) {
-          state = value ? 0 : 1;
-          continue;
-        }
-        if (state === 1) {
-          state = value ? 0 : 2;
-          continue;
+    _proto.getNALuType = function getNALuType(data, offset) {
+      return (data[offset] & 0x7e) >>> 1;
+    };
+    _proto.ebsp2rbsp = function ebsp2rbsp(arr) {
+      var dst = new Uint8Array(arr.byteLength);
+      var dstIdx = 0;
+      for (var i = 0; i < arr.byteLength; i++) {
+        if (i >= 2) {
+          // Unescape: Skip 0x03 after 00 00
+          if (arr[i] === 0x03 && arr[i - 1] === 0x00 && arr[i - 2] === 0x00) {
+            continue;
+          }
         }
-        // here we have state either equal to 2 or 3
-        if (!value) {
-          state = 3;
-        } else if (value === 1) {
-          overflow = i - state - 1;
-          if (lastUnitStart >= 0) {
-            var unit = {
-              data: array.subarray(lastUnitStart, overflow),
-              type: lastUnitType
-            };
-            // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
-            units.push(unit);
-          } else {
-            // lastUnitStart is undefined => this is the first start code found in this PES packet
-            // first check if start code delimiter is overlapping between 2 PES packets,
-            // ie it started in last packet (lastState not zero)
-            // and ended at the beginning of this PES packet (i <= 4 - lastState)
-            var lastUnit = this.getLastNalUnit(track.samples);
-            if (lastUnit) {
-              if (lastState && i <= 4 - lastState) {
-                // start delimiter overlapping between PES packets
-                // strip start delimiter bytes from the end of last NAL unit
-                // check if lastUnit had a state different from zero
-                if (lastUnit.state) {
-                  // strip last bytes
-                  lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState);
-                }
-              }
-              // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit.
+        dst[dstIdx] = arr[i];
+        dstIdx++;
+      }
+      return new Uint8Array(dst.buffer, 0, dstIdx);
+    };
+    _proto.readVPS = function readVPS(vps) {
+      var eg = new ExpGolomb(vps);
+      // remove header
+      eg.readUByte();
+      eg.readUByte();
+      eg.readBits(4); // video_parameter_set_id
+      eg.skipBits(2);
+      eg.readBits(6); // max_layers_minus1
+      var max_sub_layers_minus1 = eg.readBits(3);
+      var temporal_id_nesting_flag = eg.readBoolean();
+      // ...vui fps can be here, but empty fps value is not critical for metadata
 
-              if (overflow > 0) {
-                // logger.log('first NALU found with overflow:' + overflow);
-                lastUnit.data = appendUint8Array(lastUnit.data, array.subarray(0, overflow));
-                lastUnit.state = 0;
+      return {
+        numTemporalLayers: max_sub_layers_minus1 + 1,
+        temporalIdNested: temporal_id_nesting_flag
+      };
+    };
+    _proto.readSPS = function readSPS(sps) {
+      var eg = new ExpGolomb(this.ebsp2rbsp(sps));
+      eg.readUByte();
+      eg.readUByte();
+      eg.readBits(4); //video_parameter_set_id
+      var max_sub_layers_minus1 = eg.readBits(3);
+      eg.readBoolean(); // temporal_id_nesting_flag
+
+      // profile_tier_level
+      var general_profile_space = eg.readBits(2);
+      var general_tier_flag = eg.readBoolean();
+      var general_profile_idc = eg.readBits(5);
+      var general_profile_compatibility_flags_1 = eg.readUByte();
+      var general_profile_compatibility_flags_2 = eg.readUByte();
+      var general_profile_compatibility_flags_3 = eg.readUByte();
+      var general_profile_compatibility_flags_4 = eg.readUByte();
+      var general_constraint_indicator_flags_1 = eg.readUByte();
+      var general_constraint_indicator_flags_2 = eg.readUByte();
+      var general_constraint_indicator_flags_3 = eg.readUByte();
+      var general_constraint_indicator_flags_4 = eg.readUByte();
+      var general_constraint_indicator_flags_5 = eg.readUByte();
+      var general_constraint_indicator_flags_6 = eg.readUByte();
+      var general_level_idc = eg.readUByte();
+      var sub_layer_profile_present_flags = [];
+      var sub_layer_level_present_flags = [];
+      for (var i = 0; i < max_sub_layers_minus1; i++) {
+        sub_layer_profile_present_flags.push(eg.readBoolean());
+        sub_layer_level_present_flags.push(eg.readBoolean());
+      }
+      if (max_sub_layers_minus1 > 0) {
+        for (var _i = max_sub_layers_minus1; _i < 8; _i++) {
+          eg.readBits(2);
+        }
+      }
+      for (var _i2 = 0; _i2 < max_sub_layers_minus1; _i2++) {
+        if (sub_layer_profile_present_flags[_i2]) {
+          eg.readUByte(); // sub_layer_profile_space, sub_layer_tier_flag, sub_layer_profile_idc
+          eg.readUByte();
+          eg.readUByte();
+          eg.readUByte();
+          eg.readUByte(); // sub_layer_profile_compatibility_flag
+          eg.readUByte();
+          eg.readUByte();
+          eg.readUByte();
+          eg.readUByte();
+          eg.readUByte();
+          eg.readUByte();
+        }
+        if (sub_layer_level_present_flags[_i2]) {
+          eg.readUByte();
+        }
+      }
+      eg.readUEG(); // seq_parameter_set_id
+      var chroma_format_idc = eg.readUEG();
+      if (chroma_format_idc == 3) {
+        eg.skipBits(1); //separate_colour_plane_flag
+      }
+      var pic_width_in_luma_samples = eg.readUEG();
+      var pic_height_in_luma_samples = eg.readUEG();
+      var conformance_window_flag = eg.readBoolean();
+      var pic_left_offset = 0,
+        pic_right_offset = 0,
+        pic_top_offset = 0,
+        pic_bottom_offset = 0;
+      if (conformance_window_flag) {
+        pic_left_offset += eg.readUEG();
+        pic_right_offset += eg.readUEG();
+        pic_top_offset += eg.readUEG();
+        pic_bottom_offset += eg.readUEG();
+      }
+      var bit_depth_luma_minus8 = eg.readUEG();
+      var bit_depth_chroma_minus8 = eg.readUEG();
+      var log2_max_pic_order_cnt_lsb_minus4 = eg.readUEG();
+      var sub_layer_ordering_info_present_flag = eg.readBoolean();
+      for (var _i3 = sub_layer_ordering_info_present_flag ? 0 : max_sub_layers_minus1; _i3 <= max_sub_layers_minus1; _i3++) {
+        eg.skipUEG(); // max_dec_pic_buffering_minus1[i]
+        eg.skipUEG(); // max_num_reorder_pics[i]
+        eg.skipUEG(); // max_latency_increase_plus1[i]
+      }
+      eg.skipUEG(); // log2_min_luma_coding_block_size_minus3
+      eg.skipUEG(); // log2_diff_max_min_luma_coding_block_size
+      eg.skipUEG(); // log2_min_transform_block_size_minus2
+      eg.skipUEG(); // log2_diff_max_min_transform_block_size
+      eg.skipUEG(); // max_transform_hierarchy_depth_inter
+      eg.skipUEG(); // max_transform_hierarchy_depth_intra
+      var scaling_list_enabled_flag = eg.readBoolean();
+      if (scaling_list_enabled_flag) {
+        var sps_scaling_list_data_present_flag = eg.readBoolean();
+        if (sps_scaling_list_data_present_flag) {
+          for (var sizeId = 0; sizeId < 4; sizeId++) {
+            for (var matrixId = 0; matrixId < (sizeId === 3 ? 2 : 6); matrixId++) {
+              var scaling_list_pred_mode_flag = eg.readBoolean();
+              if (!scaling_list_pred_mode_flag) {
+                eg.readUEG(); // scaling_list_pred_matrix_id_delta
+              } else {
+                var coefNum = Math.min(64, 1 << 4 + (sizeId << 1));
+                if (sizeId > 1) {
+                  eg.readEG();
+                }
+                for (var _i4 = 0; _i4 < coefNum; _i4++) {
+                  eg.readEG();
+                }
               }
             }
           }
-          // check if we can read unit type
-          if (i < len) {
-            unitType = array[i] & 0x1f;
-            // logger.log('find NALU @ offset:' + i + ',type:' + unitType);
-            lastUnitStart = i;
-            lastUnitType = unitType;
-            state = 0;
-          } else {
-            // not enough byte to read unit type. let's read it on next PES parsing
-            state = -1;
-          }
-        } else {
-          state = 0;
         }
       }
-      if (lastUnitStart >= 0 && state >= 0) {
-        var _unit = {
-          data: array.subarray(lastUnitStart, len),
-          type: lastUnitType,
-          state: state
-        };
-        units.push(_unit);
-        // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
-      }
-      // no NALu found
-      if (units.length === 0) {
-        // append pes.data to previous NAL unit
-        var _lastUnit = this.getLastNalUnit(track.samples);
-        if (_lastUnit) {
-          _lastUnit.data = appendUint8Array(_lastUnit.data, array);
+      eg.readBoolean(); // amp_enabled_flag
+      eg.readBoolean(); // sample_adaptive_offset_enabled_flag
+      var pcm_enabled_flag = eg.readBoolean();
+      if (pcm_enabled_flag) {
+        eg.readUByte();
+        eg.skipUEG();
+        eg.skipUEG();
+        eg.readBoolean();
+      }
+      var num_short_term_ref_pic_sets = eg.readUEG();
+      var num_delta_pocs = 0;
+      for (var _i5 = 0; _i5 < num_short_term_ref_pic_sets; _i5++) {
+        var inter_ref_pic_set_prediction_flag = false;
+        if (_i5 !== 0) {
+          inter_ref_pic_set_prediction_flag = eg.readBoolean();
+        }
+        if (inter_ref_pic_set_prediction_flag) {
+          if (_i5 === num_short_term_ref_pic_sets) {
+            eg.readUEG();
+          }
+          eg.readBoolean();
+          eg.readUEG();
+          var next_num_delta_pocs = 0;
+          for (var j = 0; j <= num_delta_pocs; j++) {
+            var used_by_curr_pic_flag = eg.readBoolean();
+            var use_delta_flag = false;
+            if (!used_by_curr_pic_flag) {
+              use_delta_flag = eg.readBoolean();
+            }
+            if (used_by_curr_pic_flag || use_delta_flag) {
+              next_num_delta_pocs++;
+            }
+          }
+          num_delta_pocs = next_num_delta_pocs;
+        } else {
+          var num_negative_pics = eg.readUEG();
+          var num_positive_pics = eg.readUEG();
+          num_delta_pocs = num_negative_pics + num_positive_pics;
+          for (var _j = 0; _j < num_negative_pics; _j++) {
+            eg.readUEG();
+            eg.readBoolean();
+          }
+          for (var _j2 = 0; _j2 < num_positive_pics; _j2++) {
+            eg.readUEG();
+            eg.readBoolean();
+          }
+        }
+      }
+      var long_term_ref_pics_present_flag = eg.readBoolean();
+      if (long_term_ref_pics_present_flag) {
+        var num_long_term_ref_pics_sps = eg.readUEG();
+        for (var _i6 = 0; _i6 < num_long_term_ref_pics_sps; _i6++) {
+          for (var _j3 = 0; _j3 < log2_max_pic_order_cnt_lsb_minus4 + 4; _j3++) {
+            eg.readBits(1);
+          }
+          eg.readBits(1);
+        }
+      }
+      var min_spatial_segmentation_idc = 0;
+      var sar_width = 1,
+        sar_height = 1;
+      var fps_fixed = true,
+        fps_den = 1,
+        fps_num = 0;
+      eg.readBoolean(); // sps_temporal_mvp_enabled_flag
+      eg.readBoolean(); // strong_intra_smoothing_enabled_flag
+      var default_display_window_flag = false;
+      var vui_parameters_present_flag = eg.readBoolean();
+      if (vui_parameters_present_flag) {
+        var aspect_ratio_info_present_flag = eg.readBoolean();
+        if (aspect_ratio_info_present_flag) {
+          var aspect_ratio_idc = eg.readUByte();
+          var sar_width_table = [1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2];
+          var sar_height_table = [1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1];
+          if (aspect_ratio_idc > 0 && aspect_ratio_idc < 16) {
+            sar_width = sar_width_table[aspect_ratio_idc - 1];
+            sar_height = sar_height_table[aspect_ratio_idc - 1];
+          } else if (aspect_ratio_idc === 255) {
+            sar_width = eg.readBits(16);
+            sar_height = eg.readBits(16);
+          }
+        }
+        var overscan_info_present_flag = eg.readBoolean();
+        if (overscan_info_present_flag) {
+          eg.readBoolean();
+        }
+        var video_signal_type_present_flag = eg.readBoolean();
+        if (video_signal_type_present_flag) {
+          eg.readBits(3);
+          eg.readBoolean();
+          var colour_description_present_flag = eg.readBoolean();
+          if (colour_description_present_flag) {
+            eg.readUByte();
+            eg.readUByte();
+            eg.readUByte();
+          }
+        }
+        var chroma_loc_info_present_flag = eg.readBoolean();
+        if (chroma_loc_info_present_flag) {
+          eg.readUEG();
+          eg.readUEG();
+        }
+        eg.readBoolean(); // neutral_chroma_indication_flag
+        eg.readBoolean(); // field_seq_flag
+        eg.readBoolean(); // frame_field_info_present_flag
+        default_display_window_flag = eg.readBoolean();
+        if (default_display_window_flag) {
+          pic_left_offset += eg.readUEG();
+          pic_right_offset += eg.readUEG();
+          pic_top_offset += eg.readUEG();
+          pic_bottom_offset += eg.readUEG();
+        }
+        var vui_timing_info_present_flag = eg.readBoolean();
+        if (vui_timing_info_present_flag) {
+          fps_den = eg.readBits(32);
+          fps_num = eg.readBits(32);
+          var vui_poc_proportional_to_timing_flag = eg.readBoolean();
+          if (vui_poc_proportional_to_timing_flag) {
+            eg.readUEG();
+          }
+          var vui_hrd_parameters_present_flag = eg.readBoolean();
+          if (vui_hrd_parameters_present_flag) {
+            //const commonInfPresentFlag = true;
+            //if (commonInfPresentFlag) {
+            var nal_hrd_parameters_present_flag = eg.readBoolean();
+            var vcl_hrd_parameters_present_flag = eg.readBoolean();
+            var sub_pic_hrd_params_present_flag = false;
+            if (nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag) {
+              sub_pic_hrd_params_present_flag = eg.readBoolean();
+              if (sub_pic_hrd_params_present_flag) {
+                eg.readUByte();
+                eg.readBits(5);
+                eg.readBoolean();
+                eg.readBits(5);
+              }
+              eg.readBits(4); // bit_rate_scale
+              eg.readBits(4); // cpb_size_scale
+              if (sub_pic_hrd_params_present_flag) {
+                eg.readBits(4);
+              }
+              eg.readBits(5);
+              eg.readBits(5);
+              eg.readBits(5);
+            }
+            //}
+            for (var _i7 = 0; _i7 <= max_sub_layers_minus1; _i7++) {
+              fps_fixed = eg.readBoolean(); // fixed_pic_rate_general_flag
+              var fixed_pic_rate_within_cvs_flag = fps_fixed || eg.readBoolean();
+              var low_delay_hrd_flag = false;
+              if (fixed_pic_rate_within_cvs_flag) {
+                eg.readEG();
+              } else {
+                low_delay_hrd_flag = eg.readBoolean();
+              }
+              var cpb_cnt = low_delay_hrd_flag ? 1 : eg.readUEG() + 1;
+              if (nal_hrd_parameters_present_flag) {
+                for (var _j4 = 0; _j4 < cpb_cnt; _j4++) {
+                  eg.readUEG();
+                  eg.readUEG();
+                  if (sub_pic_hrd_params_present_flag) {
+                    eg.readUEG();
+                    eg.readUEG();
+                  }
+                  eg.skipBits(1);
+                }
+              }
+              if (vcl_hrd_parameters_present_flag) {
+                for (var _j5 = 0; _j5 < cpb_cnt; _j5++) {
+                  eg.readUEG();
+                  eg.readUEG();
+                  if (sub_pic_hrd_params_present_flag) {
+                    eg.readUEG();
+                    eg.readUEG();
+                  }
+                  eg.skipBits(1);
+                }
+              }
+            }
+          }
         }
+        var bitstream_restriction_flag = eg.readBoolean();
+        if (bitstream_restriction_flag) {
+          eg.readBoolean(); // tiles_fixed_structure_flag
+          eg.readBoolean(); // motion_vectors_over_pic_boundaries_flag
+          eg.readBoolean(); // restricted_ref_pic_lists_flag
+          min_spatial_segmentation_idc = eg.readUEG();
+        }
+      }
+      var width = pic_width_in_luma_samples,
+        height = pic_height_in_luma_samples;
+      if (conformance_window_flag || default_display_window_flag) {
+        var chroma_scale_w = 1,
+          chroma_scale_h = 1;
+        if (chroma_format_idc === 1) {
+          // YUV 420
+          chroma_scale_w = chroma_scale_h = 2;
+        } else if (chroma_format_idc == 2) {
+          // YUV 422
+          chroma_scale_w = 2;
+        }
+        width = pic_width_in_luma_samples - chroma_scale_w * pic_right_offset - chroma_scale_w * pic_left_offset;
+        height = pic_height_in_luma_samples - chroma_scale_h * pic_bottom_offset - chroma_scale_h * pic_top_offset;
+      }
+      var profile_space_string = general_profile_space ? ['A', 'B', 'C'][general_profile_space] : '';
+      var profile_compatibility_buf = general_profile_compatibility_flags_1 << 24 | general_profile_compatibility_flags_2 << 16 | general_profile_compatibility_flags_3 << 8 | general_profile_compatibility_flags_4;
+      var profile_compatibility_rev = 0;
+      for (var _i8 = 0; _i8 < 32; _i8++) {
+        profile_compatibility_rev = (profile_compatibility_rev | (profile_compatibility_buf >> _i8 & 1) << 31 - _i8) >>> 0; // reverse bit position (and cast as UInt32)
+      }
+      var profile_compatibility_flags_string = profile_compatibility_rev.toString(16);
+      if (general_profile_idc === 1 && profile_compatibility_flags_string === '2') {
+        profile_compatibility_flags_string = '6';
+      }
+      var tier_flag_string = general_tier_flag ? 'H' : 'L';
+      return {
+        codecString: "hvc1." + profile_space_string + general_profile_idc + "." + profile_compatibility_flags_string + "." + tier_flag_string + general_level_idc + ".B0",
+        params: {
+          general_tier_flag: general_tier_flag,
+          general_profile_idc: general_profile_idc,
+          general_profile_space: general_profile_space,
+          general_profile_compatibility_flags: [general_profile_compatibility_flags_1, general_profile_compatibility_flags_2, general_profile_compatibility_flags_3, general_profile_compatibility_flags_4],
+          general_constraint_indicator_flags: [general_constraint_indicator_flags_1, general_constraint_indicator_flags_2, general_constraint_indicator_flags_3, general_constraint_indicator_flags_4, general_constraint_indicator_flags_5, general_constraint_indicator_flags_6],
+          general_level_idc: general_level_idc,
+          bit_depth: bit_depth_luma_minus8 + 8,
+          bit_depth_luma_minus8: bit_depth_luma_minus8,
+          bit_depth_chroma_minus8: bit_depth_chroma_minus8,
+          min_spatial_segmentation_idc: min_spatial_segmentation_idc,
+          chroma_format_idc: chroma_format_idc,
+          frame_rate: {
+            fixed: fps_fixed,
+            fps: fps_num / fps_den
+          }
+        },
+        width: width,
+        height: height,
+        pixelRatio: [sar_width, sar_height]
+      };
+    };
+    _proto.readPPS = function readPPS(pps) {
+      var eg = new ExpGolomb(this.ebsp2rbsp(pps));
+      eg.readUByte();
+      eg.readUByte();
+      eg.skipUEG(); // pic_parameter_set_id
+      eg.skipUEG(); // seq_parameter_set_id
+      eg.skipBits(2); // dependent_slice_segments_enabled_flag, output_flag_present_flag
+      eg.skipBits(3); // num_extra_slice_header_bits
+      eg.skipBits(2); // sign_data_hiding_enabled_flag, cabac_init_present_flag
+      eg.skipUEG();
+      eg.skipUEG();
+      eg.skipEG(); // init_qp_minus26
+      eg.skipBits(2); // constrained_intra_pred_flag, transform_skip_enabled_flag
+      var cu_qp_delta_enabled_flag = eg.readBoolean();
+      if (cu_qp_delta_enabled_flag) {
+        eg.skipUEG();
+      }
+      eg.skipEG(); // cb_qp_offset
+      eg.skipEG(); // cr_qp_offset
+      eg.skipBits(4); // pps_slice_chroma_qp_offsets_present_flag, weighted_pred_flag, weighted_bipred_flag, transquant_bypass_enabled_flag
+      var tiles_enabled_flag = eg.readBoolean();
+      var entropy_coding_sync_enabled_flag = eg.readBoolean();
+      var parallelismType = 1; // slice-based parallel decoding
+      if (entropy_coding_sync_enabled_flag && tiles_enabled_flag) {
+        parallelismType = 0; // mixed-type parallel decoding
+      } else if (entropy_coding_sync_enabled_flag) {
+        parallelismType = 3; // wavefront-based parallel decoding
+      } else if (tiles_enabled_flag) {
+        parallelismType = 2; // tile-based parallel decoding
       }
-      track.naluState = state;
-      return units;
+      return {
+        parallelismType: parallelismType
+      };
     };
-    return AvcVideoParser;
+    _proto.matchSPS = function matchSPS(sps1, sps2) {
+      // compare without headers and VPS related params
+      return String.fromCharCode.apply(null, sps1).substr(3) === String.fromCharCode.apply(null, sps2).substr(3);
+    };
+    return HevcVideoParser;
   }(BaseVideoParser);
 
   /**
@@ -12259,7 +12982,7 @@
     }
     var _proto = SampleAesDecrypter.prototype;
     _proto.decryptBuffer = function decryptBuffer(encryptedData) {
-      return this.decrypter.decrypt(encryptedData, this.keyData.key.buffer, this.keyData.iv.buffer);
+      return this.decrypter.decrypt(encryptedData, this.keyData.key.buffer, this.keyData.iv.buffer, DecrypterAesMode.cbc);
     }
 
     // AAC - encrypt all full 16 bytes blocks starting from offset 16
@@ -12378,7 +13101,7 @@
       this.observer = observer;
       this.config = config;
       this.typeSupported = typeSupported;
-      this.videoParser = new AvcVideoParser();
+      this.videoParser = null;
     }
     TSDemuxer.probe = function probe(data) {
       var syncOffset = TSDemuxer.syncOffset(data);
@@ -12548,7 +13271,19 @@
             case videoPid:
               if (stt) {
                 if (videoData && (pes = parsePES(videoData))) {
-                  this.videoParser.parseAVCPES(videoTrack, textTrack, pes, false, this._duration);
+                  if (this.videoParser === null) {
+                    switch (videoTrack.segmentCodec) {
+                      case 'avc':
+                        this.videoParser = new AvcVideoParser();
+                        break;
+                      case 'hevc':
+                        this.videoParser = new HevcVideoParser();
+                        break;
+                    }
+                  }
+                  if (this.videoParser !== null) {
+                    this.videoParser.parsePES(videoTrack, textTrack, pes, false, this._duration);
+                  }
                 }
                 videoData = {
                   data: [],
@@ -12711,8 +13446,20 @@
       // try to parse last PES packets
       var pes;
       if (videoData && (pes = parsePES(videoData))) {
-        this.videoParser.parseAVCPES(videoTrack, textTrack, pes, true, this._duration);
-        videoTrack.pesData = null;
+        if (this.videoParser === null) {
+          switch (videoTrack.segmentCodec) {
+            case 'avc':
+              this.videoParser = new AvcVideoParser();
+              break;
+            case 'hevc':
+              this.videoParser = new HevcVideoParser();
+              break;
+          }
+        }
+        if (this.videoParser !== null) {
+          this.videoParser.parsePES(videoTrack, textTrack, pes, true, this._duration);
+          videoTrack.pesData = null;
+        }
       } else {
         // either avcData null or PES truncated, keep it for next frag parsing
         videoTrack.pesData = videoData;
@@ -13044,7 +13791,12 @@
           logger.warn('Unsupported EC-3 in M2TS found');
           break;
         case 0x24:
-          logger.warn('Unsupported HEVC in M2TS found');
+          // ITU-T Rec. H.265 and ISO/IEC 23008-2 (HEVC)
+          if (result.videoPid === -1) {
+            result.videoPid = pid;
+            result.segmentVideoCodec = 'hevc';
+            logger.log('HEVC in M2TS found');
+          }
           break;
       }
       // move to the next table entry
@@ -13272,6 +14024,8 @@
         avc1: [],
         // codingname
         avcC: [],
+        hvc1: [],
+        hvcC: [],
         btrt: [],
         dinf: [],
         dref: [],
@@ -13699,8 +14453,10 @@
           return MP4.box(MP4.types.stsd, MP4.STSD, MP4.ac3(track));
         }
         return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
-      } else {
+      } else if (track.segmentCodec === 'avc') {
         return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
+      } else {
+        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.hvc1(track));
       }
     };
     MP4.tkhd = function tkhd(track) {
@@ -13838,6 +14594,84 @@
       var result = appendUint8Array(MP4.FTYP, movie);
       return result;
     };
+    MP4.hvc1 = function hvc1(track) {
+      var ps = track.params;
+      var units = [track.vps, track.sps, track.pps];
+      var NALuLengthSize = 4;
+      var config = new Uint8Array([0x01, ps.general_profile_space << 6 | (ps.general_tier_flag ? 32 : 0) | ps.general_profile_idc, ps.general_profile_compatibility_flags[0], ps.general_profile_compatibility_flags[1], ps.general_profile_compatibility_flags[2], ps.general_profile_compatibility_flags[3], ps.general_constraint_indicator_flags[0], ps.general_constraint_indicator_flags[1], ps.general_constraint_indicator_flags[2], ps.general_constraint_indicator_flags[3], ps.general_constraint_indicator_flags[4], ps.general_constraint_indicator_flags[5], ps.general_level_idc, 240 | ps.min_spatial_segmentation_idc >> 8, 255 & ps.min_spatial_segmentation_idc, 252 | ps.parallelismType, 252 | ps.chroma_format_idc, 248 | ps.bit_depth_luma_minus8, 248 | ps.bit_depth_chroma_minus8, 0x00, parseInt(ps.frame_rate.fps), NALuLengthSize - 1 | ps.temporal_id_nested << 2 | ps.num_temporal_layers << 3 | (ps.frame_rate.fixed ? 64 : 0), units.length]);
+
+      // compute hvcC size in bytes
+      var length = config.length;
+      for (var i = 0; i < units.length; i += 1) {
+        length += 3;
+        for (var j = 0; j < units[i].length; j += 1) {
+          length += 2 + units[i][j].length;
+        }
+      }
+      var hvcC = new Uint8Array(length);
+      hvcC.set(config, 0);
+      length = config.length;
+      // append parameter set units: one vps, one or more sps and pps
+      var iMax = units.length - 1;
+      for (var _i = 0; _i < units.length; _i += 1) {
+        hvcC.set(new Uint8Array([32 + _i | (_i === iMax ? 128 : 0), 0x00, units[_i].length]), length);
+        length += 3;
+        for (var _j = 0; _j < units[_i].length; _j += 1) {
+          hvcC.set(new Uint8Array([units[_i][_j].length >> 8, units[_i][_j].length & 255]), length);
+          length += 2;
+          hvcC.set(units[_i][_j], length);
+          length += units[_i][_j].length;
+        }
+      }
+      var hvcc = MP4.box(MP4.types.hvcC, hvcC);
+      var width = track.width;
+      var height = track.height;
+      var hSpacing = track.pixelRatio[0];
+      var vSpacing = track.pixelRatio[1];
+      return MP4.box(MP4.types.hvc1, new Uint8Array([0x00, 0x00, 0x00,
+      // reserved
+      0x00, 0x00, 0x00,
+      // reserved
+      0x00, 0x01,
+      // data_reference_index
+      0x00, 0x00,
+      // pre_defined
+      0x00, 0x00,
+      // reserved
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      // pre_defined
+      width >> 8 & 0xff, width & 0xff,
+      // width
+      height >> 8 & 0xff, height & 0xff,
+      // height
+      0x00, 0x48, 0x00, 0x00,
+      // horizresolution
+      0x00, 0x48, 0x00, 0x00,
+      // vertresolution
+      0x00, 0x00, 0x00, 0x00,
+      // reserved
+      0x00, 0x01,
+      // frame_count
+      0x12, 0x64, 0x61, 0x69, 0x6c,
+      // dailymotion/hls.js
+      0x79, 0x6d, 0x6f, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x68, 0x6c, 0x73, 0x2e, 0x6a, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      // compressorname
+      0x00, 0x18,
+      // depth = 24
+      0x11, 0x11]),
+      // pre_defined = -1
+      hvcc, MP4.box(MP4.types.btrt, new Uint8Array([0x00, 0x1c, 0x9c, 0x80,
+      // bufferSizeDB
+      0x00, 0x2d, 0xc6, 0xc0,
+      // maxBitrate
+      0x00, 0x2d, 0xc6, 0xc0])),
+      // avgBitrate
+      MP4.box(MP4.types.pasp, new Uint8Array([hSpacing >> 24,
+      // hSpacing
+      hSpacing >> 16 & 0xff, hSpacing >> 8 & 0xff, hSpacing & 0xff, vSpacing >> 24,
+      // vSpacing
+      vSpacing >> 16 & 0xff, vSpacing >> 8 & 0xff, vSpacing & 0xff])));
+    };
     return MP4;
   }();
   MP4.types = void 0;
@@ -14239,9 +15073,9 @@
         var foundOverlap = delta < -1;
         if (foundHole || foundOverlap) {
           if (foundHole) {
-            logger.warn("AVC: " + toMsFromMpegTsClock(delta, true) + " ms (" + delta + "dts) hole between fragments detected at " + timeOffset.toFixed(3));
+            logger.warn((track.segmentCodec || '').toUpperCase() + ": " + toMsFromMpegTsClock(delta, true) + " ms (" + delta + "dts) hole between fragments detected at " + timeOffset.toFixed(3));
           } else {
-            logger.warn("AVC: " + toMsFromMpegTsClock(-delta, true) + " ms (" + delta + "dts) overlapping between fragments detected at " + timeOffset.toFixed(3));
+            logger.warn((track.segmentCodec || '').toUpperCase() + ": " + toMsFromMpegTsClock(-delta, true) + " ms (" + delta + "dts) overlapping between fragments detected at " + timeOffset.toFixed(3));
           }
           if (!foundOverlap || nextAvcDts >= inputSamples[0].pts || chromeVersion) {
             firstDTS = nextAvcDts;
@@ -14250,12 +15084,24 @@
               inputSamples[0].dts = firstDTS;
               inputSamples[0].pts = firstPTS;
             } else {
+              var isPTSOrderRetained = true;
               for (var _i = 0; _i < inputSamples.length; _i++) {
-                if (inputSamples[_i].dts > firstPTS) {
+                if (inputSamples[_i].dts > firstPTS && isPTSOrderRetained) {
                   break;
                 }
+                var prevPTS = inputSamples[_i].pts;
                 inputSamples[_i].dts -= delta;
                 inputSamples[_i].pts -= delta;
+
+                // check to see if this sample's PTS order has changed
+                // relative to the next one
+                if (_i < inputSamples.length - 1) {
+                  var nextSamplePTS = inputSamples[_i + 1].pts;
+                  var currentSamplePTS = inputSamples[_i].pts;
+                  var currentOrder = nextSamplePTS <= currentSamplePTS;
+                  var prevOrder = nextSamplePTS <= prevPTS;
+                  isPTSOrderRetained = currentOrder == prevOrder;
+                }
               }
             }
             logger.log("Video: Initial PTS/DTS adjusted: " + toMsFromMpegTsClock(firstPTS, true) + "/" + toMsFromMpegTsClock(firstDTS, true) + ", delta: " + toMsFromMpegTsClock(delta, true) + " ms");
@@ -14403,7 +15249,7 @@
           }
         }
       }
-      // next AVC sample DTS should be equal to last sample DTS + last sample duration (in PES timescale)
+      // next AVC/HEVC sample DTS should be equal to last sample DTS + last sample duration (in PES timescale)
       mp4SampleDuration = stretchedLastFrame || !mp4SampleDuration ? averageSampleDuration : mp4SampleDuration;
       this.nextAvcDts = nextAvcDts = lastDTS + mp4SampleDuration;
       this.videoSampleDuration = mp4SampleDuration;
@@ -14538,7 +15384,7 @@
             logger.warn("[mp4-remuxer]: Injecting " + missing + " audio frame @ " + (nextPts / inputTimeScale).toFixed(3) + "s due to " + Math.round(1000 * delta / inputTimeScale) + " ms gap.");
             for (var j = 0; j < missing; j++) {
               var newStamp = Math.max(nextPts, 0);
-              var fillFrame = AAC.getSilentFrame(track.manifestCodec || track.codec, track.channelCount);
+              var fillFrame = AAC.getSilentFrame(track.parsedCodec || track.manifestCodec || track.codec, track.channelCount);
               if (!fillFrame) {
                 logger.log('[mp4-remuxer]: Unable to get silent frame for given audio codec; duplicating last frame instead.');
                 fillFrame = sample.unit.subarray();
@@ -14666,7 +15512,7 @@
       // samples count of this segment's duration
       var nbSamples = Math.ceil((endDTS - startDTS) / frameDuration);
       // silent frame
-      var silentFrame = AAC.getSilentFrame(track.manifestCodec || track.codec, track.channelCount);
+      var silentFrame = AAC.getSilentFrame(track.parsedCodec || track.manifestCodec || track.codec, track.channelCount);
       logger.warn('[mp4-remuxer]: remux empty Audio');
       // Can't remux if we can't generate a silent frame...
       if (!silentFrame) {
@@ -15056,13 +15902,15 @@
         duration = transmuxConfig.duration,
         initSegmentData = transmuxConfig.initSegmentData;
       var keyData = getEncryptionType(uintData, decryptdata);
-      if (keyData && keyData.method === 'AES-128') {
+      if (keyData && isFullSegmentEncryption(keyData.method)) {
         var decrypter = this.getDecrypter();
+        var aesMode = getAesModeFromFullSegmentMethod(keyData.method);
+
         // Software decryption is synchronous; webCrypto is not
         if (decrypter.isSync()) {
           // Software decryption is progressive. Progressive decryption may not return a result on each call. Any cached
           // data is handled in the flush() call
-          var decryptedData = decrypter.softwareDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer);
+          var decryptedData = decrypter.softwareDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer, aesMode);
           // For Low-Latency HLS Parts, decrypt in place, since part parsing is expected on push progress
           var loadingParts = chunkMeta.part > -1;
           if (loadingParts) {
@@ -15074,7 +15922,7 @@
           }
           uintData = new Uint8Array(decryptedData);
         } else {
-          this.decryptionPromise = decrypter.webCryptoDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer).then(function (decryptedData) {
+          this.decryptionPromise = decrypter.webCryptoDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer, aesMode).then(function (decryptedData) {
             // Calling push here is important; if flush() is called while this is still resolving, this ensures that
             // the decrypted data has been transmuxed
             var result = _this.push(decryptedData, null, chunkMeta);
@@ -15695,7 +16543,7 @@
     observer.on(Events.ERROR, forwardMessage);
 
     // forward logger events to main thread
-    var forwardWorkerLogs = function forwardWorkerLogs() {
+    var forwardWorkerLogs = function forwardWorkerLogs(logger) {
       var _loop = function _loop(logFn) {
         var func = function func(message) {
           forwardMessage('workerLog', {
@@ -15716,8 +16564,8 @@
           {
             var config = JSON.parse(data.config);
             self.transmuxer = new Transmuxer(observer, data.typeSupported, config, data.vendor, data.id);
-            enableLogs(config.debug, data.id);
-            forwardWorkerLogs();
+            var logger = enableLogs(config.debug, data.id);
+            forwardWorkerLogs(logger);
             forwardMessage('init', null);
             break;
           }
@@ -15891,16 +16739,7 @@
       this.observer = new EventEmitter();
       this.observer.on(Events.FRAG_DECRYPTED, forwardMessage);
       this.observer.on(Events.ERROR, forwardMessage);
-      var MediaSource = getMediaSource(config.preferManagedMediaSource) || {
-        isTypeSupported: function isTypeSupported() {
-          return false;
-        }
-      };
-      var m2tsTypeSupported = {
-        mpeg: MediaSource.isTypeSupported('audio/mpeg'),
-        mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"'),
-        ac3: MediaSource.isTypeSupported('audio/mp4; codecs="ac-3"') 
-      };
+      var m2tsTypeSupported = getM2TSSupportedAudioTypes(config.preferManagedMediaSource);
 
       // navigator.vendor is not always available in Web Worker
       // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator
@@ -16184,7 +17023,7 @@
     _inheritsLoose(AudioStreamController, _BaseStreamController);
     function AudioStreamController(hls, fragmentTracker, keyLoader) {
       var _this;
-      _this = _BaseStreamController.call(this, hls, fragmentTracker, keyLoader, '[audio-stream-controller]', PlaylistLevelType.AUDIO) || this;
+      _this = _BaseStreamController.call(this, hls, fragmentTracker, keyLoader, 'audio-stream-controller', PlaylistLevelType.AUDIO) || this;
       _this.videoBuffer = null;
       _this.videoTrackCC = -1;
       _this.waitingVideoCC = -1;
@@ -16196,27 +17035,24 @@
       _this.flushing = false;
       _this.bufferFlushed = false;
       _this.cachedTrackLoadedData = null;
-      _this._registerListeners();
+      _this.registerListeners();
       return _this;
     }
     var _proto = AudioStreamController.prototype;
     _proto.onHandlerDestroying = function onHandlerDestroying() {
-      this._unregisterListeners();
+      this.unregisterListeners();
       _BaseStreamController.prototype.onHandlerDestroying.call(this);
       this.mainDetails = null;
       this.bufferedTrack = null;
       this.switchingTrack = null;
     };
-    _proto._registerListeners = function _registerListeners() {
+    _proto.registerListeners = function registerListeners() {
+      _BaseStreamController.prototype.registerListeners.call(this);
       var hls = this.hls;
-      hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-      hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-      hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
       hls.on(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
       hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
       hls.on(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-      hls.on(Events.ERROR, this.onError, this);
       hls.on(Events.BUFFER_RESET, this.onBufferReset, this);
       hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
       hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
@@ -16224,16 +17060,16 @@
       hls.on(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
       hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
     };
-    _proto._unregisterListeners = function _unregisterListeners() {
+    _proto.unregisterListeners = function unregisterListeners() {
       var hls = this.hls;
-      hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-      hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-      hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+      if (!hls) {
+        return;
+      }
+      _BaseStreamController.prototype.unregisterListeners.call(this);
       hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
       hls.off(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
       hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
       hls.off(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-      hls.off(Events.ERROR, this.onError, this);
       hls.off(Events.BUFFER_RESET, this.onBufferReset, this);
       hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
       hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
@@ -16392,12 +17228,13 @@
         trackId = this.trackId;
       var config = hls.config;
 
-      // 1. if video not attached AND
+      // 1. if buffering is suspended
+      // 2. if video not attached AND
       //    start fragment already requested OR start frag prefetch not enabled
-      // 2. if tracks or track not loaded and selected
+      // 3. if tracks or track not loaded and selected
       // then exit loop
       // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
-      if (!media && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
+      if (!this.buffering || !media && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
         return;
       }
       var levelInfo = levels[trackId];
@@ -16583,7 +17420,7 @@
 
       // compute start position if we are aligned with the main playlist
       if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-        this.setStartPosition(track.details, sliding);
+        this.setStartPosition(this.mainDetails || newDetails, sliding);
       }
       // only switch back to IDLE state if we were waiting for track to start downloading a new fragment
       if (this.state === State.WAITING_TRACK && !this.waitForCdnTuneIn(newDetails)) {
@@ -16926,7 +17763,7 @@
     _inheritsLoose(AudioTrackController, _BasePlaylistControll);
     function AudioTrackController(hls) {
       var _this;
-      _this = _BasePlaylistControll.call(this, hls, '[audio-track-controller]') || this;
+      _this = _BasePlaylistControll.call(this, hls, 'audio-track-controller') || this;
       _this.tracks = [];
       _this.groupIds = null;
       _this.tracksInGroup = [];
@@ -17255,26 +18092,23 @@
     _inheritsLoose(SubtitleStreamController, _BaseStreamController);
     function SubtitleStreamController(hls, fragmentTracker, keyLoader) {
       var _this;
-      _this = _BaseStreamController.call(this, hls, fragmentTracker, keyLoader, '[subtitle-stream-controller]', PlaylistLevelType.SUBTITLE) || this;
+      _this = _BaseStreamController.call(this, hls, fragmentTracker, keyLoader, 'subtitle-stream-controller', PlaylistLevelType.SUBTITLE) || this;
       _this.currentTrackId = -1;
       _this.tracksBuffered = [];
       _this.mainDetails = null;
-      _this._registerListeners();
+      _this.registerListeners();
       return _this;
     }
     var _proto = SubtitleStreamController.prototype;
     _proto.onHandlerDestroying = function onHandlerDestroying() {
-      this._unregisterListeners();
+      this.unregisterListeners();
       _BaseStreamController.prototype.onHandlerDestroying.call(this);
       this.mainDetails = null;
     };
-    _proto._registerListeners = function _registerListeners() {
+    _proto.registerListeners = function registerListeners() {
+      _BaseStreamController.prototype.registerListeners.call(this);
       var hls = this.hls;
-      hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-      hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-      hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-      hls.on(Events.ERROR, this.onError, this);
       hls.on(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
       hls.on(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
       hls.on(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
@@ -17282,13 +18116,10 @@
       hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
       hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
     };
-    _proto._unregisterListeners = function _unregisterListeners() {
+    _proto.unregisterListeners = function unregisterListeners() {
+      _BaseStreamController.prototype.unregisterListeners.call(this);
       var hls = this.hls;
-      hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-      hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-      hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-      hls.off(Events.ERROR, this.onError, this);
       hls.off(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
       hls.off(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
       hls.off(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
@@ -17486,7 +18317,7 @@
       track.details = newDetails;
       this.levelLastLoaded = track;
       if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-        this.setStartPosition(track.details, sliding);
+        this.setStartPosition(this.mainDetails || newDetails, sliding);
       }
 
       // trigger handler right now
@@ -17511,10 +18342,10 @@
         return;
       }
       // check to see if the payload needs to be decrypted
-      if (payload && payload.byteLength > 0 && decryptData != null && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
+      if (payload && payload.byteLength > 0 && decryptData != null && decryptData.key && decryptData.iv && isFullSegmentEncryption(decryptData.method)) {
         var startTime = performance.now();
         // decrypt the subtitles
-        this.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).catch(function (err) {
+        this.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer, getAesModeFromFullSegmentMethod(decryptData.method)).catch(function (err) {
           hls.trigger(Events.ERROR, {
             type: ErrorTypes.MEDIA_ERROR,
             details: ErrorDetails.FRAG_DECRYPT_ERROR,
@@ -17646,7 +18477,7 @@
     _inheritsLoose(SubtitleTrackController, _BasePlaylistControll);
     function SubtitleTrackController(hls) {
       var _this;
-      _this = _BasePlaylistControll.call(this, hls, '[subtitle-track-controller]') || this;
+      _this = _BasePlaylistControll.call(this, hls, 'subtitle-track-controller') || this;
       _this.media = null;
       _this.tracks = [];
       _this.groupIds = null;
@@ -17655,12 +18486,12 @@
       _this.currentTrack = null;
       _this.selectDefaultTrack = true;
       _this.queuedDefaultTrack = -1;
-      _this.asyncPollTrackChange = function () {
-        return _this.pollTrackChange(0);
-      };
       _this.useTextTrackPolling = false;
       _this.subtitlePollingInterval = -1;
       _this._subtitleDisplay = true;
+      _this.asyncPollTrackChange = function () {
+        return _this.pollTrackChange(0);
+      };
       _this.onTextTracksChanged = function () {
         if (!_this.useTextTrackPolling) {
           self.clearInterval(_this.subtitlePollingInterval);
@@ -17696,6 +18527,7 @@
       this.tracks.length = 0;
       this.tracksInGroup.length = 0;
       this.currentTrack = null;
+      // @ts-ignore
       this.onTextTracksChanged = this.asyncPollTrackChange = null;
       _BasePlaylistControll.prototype.destroy.call(this);
     };
@@ -18169,57 +19001,57 @@
   }();
 
   var VIDEO_CODEC_PROFILE_REPLACE = /(avc[1234]|hvc1|hev1|dvh[1e]|vp09|av01)(?:\.[^.,]+)+/;
-  var BufferController = /*#__PURE__*/function () {
+  var BufferController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(BufferController, _Logger);
     function BufferController(hls) {
-      var _this = this;
+      var _this;
+      _this = _Logger.call(this, 'buffer-controller', hls.logger) || this;
       // The level details used to determine duration, target-duration and live
-      this.details = null;
+      _this.details = null;
       // cache the self generated object url to detect hijack of video tag
-      this._objectUrl = null;
+      _this._objectUrl = null;
       // A queue of buffer operations which require the SourceBuffer to not be updating upon execution
-      this.operationQueue = void 0;
+      _this.operationQueue = void 0;
       // References to event listeners for each SourceBuffer, so that they can be referenced for event removal
-      this.listeners = void 0;
-      this.hls = void 0;
+      _this.listeners = void 0;
+      _this.hls = void 0;
       // The number of BUFFER_CODEC events received before any sourceBuffers are created
-      this.bufferCodecEventsExpected = 0;
+      _this.bufferCodecEventsExpected = 0;
       // The total number of BUFFER_CODEC events received
-      this._bufferCodecEventsTotal = 0;
+      _this._bufferCodecEventsTotal = 0;
       // A reference to the attached media element
-      this.media = null;
+      _this.media = null;
       // A reference to the active media source
-      this.mediaSource = null;
+      _this.mediaSource = null;
       // Last MP3 audio chunk appended
-      this.lastMpegAudioChunk = null;
-      this.appendSource = void 0;
+      _this.lastMpegAudioChunk = null;
+      _this.appendSource = void 0;
       // counters
-      this.appendErrors = {
+      _this.appendErrors = {
         audio: 0,
         video: 0,
         audiovideo: 0
       };
-      this.tracks = {};
-      this.pendingTracks = {};
-      this.sourceBuffer = void 0;
-      this.log = void 0;
-      this.warn = void 0;
-      this.error = void 0;
-      this._onEndStreaming = function (event) {
+      _this.tracks = {};
+      _this.pendingTracks = {};
+      _this.sourceBuffer = void 0;
+      _this._onEndStreaming = function (event) {
         if (!_this.hls) {
           return;
         }
         _this.hls.pauseBuffering();
       };
-      this._onStartStreaming = function (event) {
+      _this._onStartStreaming = function (event) {
         if (!_this.hls) {
           return;
         }
         _this.hls.resumeBuffering();
       };
       // Keep as arrow functions so that we can directly reference these functions directly as event listeners
-      this._onMediaSourceOpen = function () {
-        var media = _this.media,
-          mediaSource = _this.mediaSource;
+      _this._onMediaSourceOpen = function () {
+        var _assertThisInitialize = _assertThisInitialized(_this),
+          media = _assertThisInitialize.media,
+          mediaSource = _assertThisInitialize.mediaSource;
         _this.log('Media source opened');
         if (media) {
           media.removeEventListener('emptied', _this._onMediaEmptied);
@@ -18235,27 +19067,25 @@
         }
         _this.checkPendingTracks();
       };
-      this._onMediaSourceClose = function () {
+      _this._onMediaSourceClose = function () {
         _this.log('Media source closed');
       };
-      this._onMediaSourceEnded = function () {
+      _this._onMediaSourceEnded = function () {
         _this.log('Media source ended');
       };
-      this._onMediaEmptied = function () {
-        var mediaSrc = _this.mediaSrc,
-          _objectUrl = _this._objectUrl;
+      _this._onMediaEmptied = function () {
+        var _assertThisInitialize2 = _assertThisInitialized(_this),
+          mediaSrc = _assertThisInitialize2.mediaSrc,
+          _objectUrl = _assertThisInitialize2._objectUrl;
         if (mediaSrc !== _objectUrl) {
-          logger.error("Media element src was set while attaching MediaSource (" + _objectUrl + " > " + mediaSrc + ")");
+          _this.error("Media element src was set while attaching MediaSource (" + _objectUrl + " > " + mediaSrc + ")");
         }
       };
-      this.hls = hls;
-      var logPrefix = '[buffer-controller]';
-      this.appendSource = hls.config.preferManagedMediaSource;
-      this.log = logger.log.bind(logger, logPrefix);
-      this.warn = logger.warn.bind(logger, logPrefix);
-      this.error = logger.error.bind(logger, logPrefix);
-      this._initSourceBuffer();
-      this.registerListeners();
+      _this.hls = hls;
+      _this.appendSource = hls.config.preferManagedMediaSource;
+      _this._initSourceBuffer();
+      _this.registerListeners();
+      return _this;
     }
     var _proto = BufferController.prototype;
     _proto.hasSourceTypes = function hasSourceTypes() {
@@ -18267,6 +19097,12 @@
       this.lastMpegAudioChunk = null;
       // @ts-ignore
       this.hls = null;
+      // @ts-ignore
+      this._onMediaSourceOpen = this._onMediaSourceClose = null;
+      // @ts-ignore
+      this._onMediaSourceEnded = null;
+      // @ts-ignore
+      this._onStartStreaming = this._onEndStreaming = null;
     };
     _proto.registerListeners = function registerListeners() {
       var hls = this.hls;
@@ -18424,6 +19260,7 @@
         _this2.resetBuffer(type);
       });
       this._initSourceBuffer();
+      this.hls.resumeBuffering();
     };
     _proto.resetBuffer = function resetBuffer(type) {
       var sb = this.sourceBuffer[type];
@@ -19127,7 +19964,7 @@
       }
     }]);
     return BufferController;
-  }();
+  }(Logger);
   function removeSourceChildren(node) {
     var sourceChildren = node.querySelectorAll('source');
     [].slice.call(sourceChildren).forEach(function (source) {
@@ -21566,14 +22403,12 @@
       this.cea608Parser1 = this.cea608Parser2 = undefined;
     };
     _proto.initCea608Parsers = function initCea608Parsers() {
-      if (this.config.enableCEA708Captions && (!this.cea608Parser1 || !this.cea608Parser2)) {
-        var channel1 = new OutputFilter(this, 'textTrack1');
-        var channel2 = new OutputFilter(this, 'textTrack2');
-        var channel3 = new OutputFilter(this, 'textTrack3');
-        var channel4 = new OutputFilter(this, 'textTrack4');
-        this.cea608Parser1 = new Cea608Parser(1, channel1, channel2);
-        this.cea608Parser2 = new Cea608Parser(3, channel3, channel4);
-      }
+      var channel1 = new OutputFilter(this, 'textTrack1');
+      var channel2 = new OutputFilter(this, 'textTrack2');
+      var channel3 = new OutputFilter(this, 'textTrack3');
+      var channel4 = new OutputFilter(this, 'textTrack4');
+      this.cea608Parser1 = new Cea608Parser(1, channel1, channel2);
+      this.cea608Parser2 = new Cea608Parser(3, channel3, channel4);
     };
     _proto.addCues = function addCues(trackName, startTime, endTime, screen, cueRanges) {
       // skip cues which overlap more than 50% with previously parsed time ranges
@@ -21808,7 +22643,7 @@
               return t.label;
             });
             if (unusedTextTracks.length) {
-              logger.warn("Media element contains unused subtitle tracks: " + unusedTextTracks.join(', ') + ". Replace media element for each source to clear TextTracks and captions menu.");
+              this.hls.logger.warn("Media element contains unused subtitle tracks: " + unusedTextTracks.join(', ') + ". Replace media element for each source to clear TextTracks and captions menu.");
             }
           }
         } else if (this.tracks.length) {
@@ -21854,23 +22689,20 @@
       return level == null ? void 0 : level.attrs['CLOSED-CAPTIONS'];
     };
     _proto.onFragLoading = function onFragLoading(event, data) {
-      this.initCea608Parsers();
-      var cea608Parser1 = this.cea608Parser1,
-        cea608Parser2 = this.cea608Parser2,
-        lastCc = this.lastCc,
-        lastSn = this.lastSn,
-        lastPartIndex = this.lastPartIndex;
-      if (!this.enabled || !cea608Parser1 || !cea608Parser2) {
-        return;
-      }
       // if this frag isn't contiguous, clear the parser so cues with bad start/end times aren't added to the textTrack
-      if (data.frag.type === PlaylistLevelType.MAIN) {
+      if (this.enabled && data.frag.type === PlaylistLevelType.MAIN) {
         var _data$part$index, _data$part;
+        var cea608Parser1 = this.cea608Parser1,
+          cea608Parser2 = this.cea608Parser2,
+          lastSn = this.lastSn;
+        if (!cea608Parser1 || !cea608Parser2) {
+          return;
+        }
         var _data$frag = data.frag,
           cc = _data$frag.cc,
           sn = _data$frag.sn;
-        var partIndex = (_data$part$index = data == null ? void 0 : (_data$part = data.part) == null ? void 0 : _data$part.index) != null ? _data$part$index : -1;
-        if (!(sn === lastSn + 1 || sn === lastSn && partIndex === lastPartIndex + 1 || cc === lastCc)) {
+        var partIndex = (_data$part$index = (_data$part = data.part) == null ? void 0 : _data$part.index) != null ? _data$part$index : -1;
+        if (!(sn === lastSn + 1 || sn === lastSn && partIndex === this.lastPartIndex + 1 || cc === this.lastCc)) {
           cea608Parser1.reset();
           cea608Parser2.reset();
         }
@@ -21926,7 +22758,7 @@
           frag: frag
         });
       }, function (error) {
-        logger.log("Failed to parse IMSC1: " + error);
+        hls.logger.log("Failed to parse IMSC1: " + error);
         hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
           success: false,
           frag: frag,
@@ -21964,7 +22796,7 @@
           _this5._fallbackToIMSC1(frag, payload);
         }
         // Something went wrong while parsing. Trigger event with success false.
-        logger.log("Failed to parse VTT cue: " + error);
+        hls.logger.log("Failed to parse VTT cue: " + error);
         if (missingInitPTS && maxAvCC > frag.cc) {
           return;
         }
@@ -22026,10 +22858,7 @@
       this.captionsTracks = {};
     };
     _proto.onFragParsingUserdata = function onFragParsingUserdata(event, data) {
-      this.initCea608Parsers();
-      var cea608Parser1 = this.cea608Parser1,
-        cea608Parser2 = this.cea608Parser2;
-      if (!this.enabled || !cea608Parser1 || !cea608Parser2) {
+      if (!this.enabled || !this.config.enableCEA708Captions) {
         return;
       }
       var frag = data.frag,
@@ -22042,9 +22871,12 @@
       for (var i = 0; i < samples.length; i++) {
         var ccBytes = samples[i].bytes;
         if (ccBytes) {
+          if (!this.cea608Parser1) {
+            this.initCea608Parsers();
+          }
           var ccdatas = this.extractCea608Data(ccBytes);
-          cea608Parser1.addData(samples[i].pts, ccdatas[0]);
-          cea608Parser2.addData(samples[i].pts, ccdatas[1]);
+          this.cea608Parser1.addData(samples[i].pts, ccdatas[0]);
+          this.cea608Parser2.addData(samples[i].pts, ccdatas[1]);
         }
       }
     };
@@ -22236,7 +23068,7 @@
           var hls = this.hls;
           var maxLevel = this.getMaxLevel(levels.length - 1);
           if (maxLevel !== this.autoLevelCapping) {
-            logger.log("Setting autoLevelCapping to " + maxLevel + ": " + levels[maxLevel].height + "p@" + levels[maxLevel].bitrate + " for media " + this.mediaWidth + "x" + this.mediaHeight);
+            hls.logger.log("Setting autoLevelCapping to " + maxLevel + ": " + levels[maxLevel].height + "p@" + levels[maxLevel].bitrate + " for media " + this.mediaWidth + "x" + this.mediaHeight);
           }
           hls.autoLevelCapping = maxLevel;
           if (hls.autoLevelCapping > this.autoLevelCapping && this.streamController) {
@@ -22426,10 +23258,10 @@
             totalDroppedFrames: droppedFrames
           });
           if (droppedFPS > 0) {
-            // logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod));
+            // hls.logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod));
             if (currentDropped > hls.config.fpsDroppedMonitoringThreshold * currentDecoded) {
               var currentLevel = hls.currentLevel;
-              logger.warn('drop FPS ratio greater than max allowed value for currentLevel: ' + currentLevel);
+              hls.logger.warn('drop FPS ratio greater than max allowed value for currentLevel: ' + currentLevel);
               if (currentLevel > 0 && (hls.autoLevelCapping === -1 || hls.autoLevelCapping >= currentLevel)) {
                 currentLevel = currentLevel - 1;
                 hls.trigger(Events.FPS_DROP_LEVEL_CAPPING, {
@@ -22462,7 +23294,6 @@
     return FPSController;
   }();
 
-  var LOGGER_PREFIX = '[eme]';
   /**
    * Controller to deal with encrypted media extensions (EME)
    * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API
@@ -22470,26 +23301,122 @@
    * @class
    * @constructor
    */
-  var EMEController = /*#__PURE__*/function () {
+  var EMEController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(EMEController, _Logger);
     function EMEController(hls) {
-      this.hls = void 0;
-      this.config = void 0;
-      this.media = null;
-      this.keyFormatPromise = null;
-      this.keySystemAccessPromises = {};
-      this._requestLicenseFailureCount = 0;
-      this.mediaKeySessions = [];
-      this.keyIdToKeySessionPromise = {};
-      this.setMediaKeysQueue = EMEController.CDMCleanupPromise ? [EMEController.CDMCleanupPromise] : [];
-      this.onMediaEncrypted = this._onMediaEncrypted.bind(this);
-      this.onWaitingForKey = this._onWaitingForKey.bind(this);
-      this.debug = logger.debug.bind(logger, LOGGER_PREFIX);
-      this.log = logger.log.bind(logger, LOGGER_PREFIX);
-      this.warn = logger.warn.bind(logger, LOGGER_PREFIX);
-      this.error = logger.error.bind(logger, LOGGER_PREFIX);
-      this.hls = hls;
-      this.config = hls.config;
-      this.registerListeners();
+      var _this;
+      _this = _Logger.call(this, 'eme', hls.logger) || this;
+      _this.hls = void 0;
+      _this.config = void 0;
+      _this.media = null;
+      _this.keyFormatPromise = null;
+      _this.keySystemAccessPromises = {};
+      _this._requestLicenseFailureCount = 0;
+      _this.mediaKeySessions = [];
+      _this.keyIdToKeySessionPromise = {};
+      _this.setMediaKeysQueue = EMEController.CDMCleanupPromise ? [EMEController.CDMCleanupPromise] : [];
+      _this.onMediaEncrypted = function (event) {
+        var initDataType = event.initDataType,
+          initData = event.initData;
+        _this.debug("\"" + event.type + "\" event: init data type: \"" + initDataType + "\"");
+
+        // Ignore event when initData is null
+        if (initData === null) {
+          return;
+        }
+        var keyId;
+        var keySystemDomain;
+        if (initDataType === 'sinf' && _this.config.drmSystems[KeySystems.FAIRPLAY]) {
+          // Match sinf keyId to playlist skd://keyId=
+          var json = bin2str(new Uint8Array(initData));
+          try {
+            var sinf = base64Decode(JSON.parse(json).sinf);
+            var tenc = parseSinf(new Uint8Array(sinf));
+            if (!tenc) {
+              return;
+            }
+            keyId = tenc.subarray(8, 24);
+            keySystemDomain = KeySystems.FAIRPLAY;
+          } catch (error) {
+            _this.warn('Failed to parse sinf "encrypted" event message initData');
+            return;
+          }
+        } else {
+          // Support clear-lead key-session creation (otherwise depend on playlist keys)
+          var psshInfo = parsePssh(initData);
+          if (psshInfo === null) {
+            return;
+          }
+          if (psshInfo.version === 0 && psshInfo.systemId === KeySystemIds.WIDEVINE && psshInfo.data) {
+            keyId = psshInfo.data.subarray(8, 24);
+          }
+          keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
+        }
+        if (!keySystemDomain || !keyId) {
+          return;
+        }
+        var keyIdHex = Hex.hexDump(keyId);
+        var _assertThisInitialize = _assertThisInitialized(_this),
+          keyIdToKeySessionPromise = _assertThisInitialize.keyIdToKeySessionPromise,
+          mediaKeySessions = _assertThisInitialize.mediaKeySessions;
+        var keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
+        var _loop = function _loop() {
+            // Match playlist key
+            var keyContext = mediaKeySessions[i];
+            var decryptdata = keyContext.decryptdata;
+            if (decryptdata.pssh || !decryptdata.keyId) {
+              return 0; // continue
+            }
+            var oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
+            if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
+              keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
+              delete keyIdToKeySessionPromise[oldKeyIdHex];
+              decryptdata.pssh = new Uint8Array(initData);
+              decryptdata.keyId = keyId;
+              keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(function () {
+                return _this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
+              });
+              return 1; // break
+            }
+          },
+          _ret;
+        for (var i = 0; i < mediaKeySessions.length; i++) {
+          _ret = _loop();
+          if (_ret === 0) continue;
+          if (_ret === 1) break;
+        }
+        if (!keySessionContextPromise) {
+          // Clear-lead key (not encountered in playlist)
+          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = _this.getKeySystemSelectionPromise([keySystemDomain]).then(function (_ref) {
+            var _keySystemToKeySystem;
+            var keySystem = _ref.keySystem,
+              mediaKeys = _ref.mediaKeys;
+            _this.throwIfDestroyed();
+            var decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
+            decryptdata.pssh = new Uint8Array(initData);
+            decryptdata.keyId = keyId;
+            return _this.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
+              _this.throwIfDestroyed();
+              var keySessionContext = _this.createMediaKeySessionContext({
+                decryptdata: decryptdata,
+                keySystem: keySystem,
+                mediaKeys: mediaKeys
+              });
+              return _this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
+            });
+          });
+        }
+        keySessionContextPromise.catch(function (error) {
+          return _this.handleError(error);
+        });
+      };
+      _this.onWaitingForKey = function (event) {
+        _this.log("\"" + event.type + "\" event");
+      };
+      _this.hls = hls;
+      _this.config = hls.config;
+      _this.registerListeners();
+      return _this;
     }
     var _proto = EMEController.prototype;
     _proto.destroy = function destroy() {
@@ -22501,9 +23428,9 @@
       config.licenseXhrSetup = config.licenseResponseCallback = undefined;
       config.drmSystems = config.drmSystemOptions = {};
       // @ts-ignore
-      this.hls = this.onMediaEncrypted = this.onWaitingForKey = this.keyIdToKeySessionPromise = null;
+      this.hls = this.config = this.keyIdToKeySessionPromise = null;
       // @ts-ignore
-      this.config = null;
+      this.onMediaEncrypted = this.onWaitingForKey = null;
     };
     _proto.registerListeners = function registerListeners() {
       this.hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
@@ -22542,7 +23469,7 @@
       }
     };
     _proto.attemptKeySystemAccess = function attemptKeySystemAccess(keySystemsToAttempt) {
-      var _this = this;
+      var _this2 = this;
       var levels = this.hls.levels;
       var uniqueCodec = function uniqueCodec(value, i, a) {
         return !!value && a.indexOf(value) === i;
@@ -22559,7 +23486,7 @@
       return new Promise(function (resolve, reject) {
         var attempt = function attempt(keySystems) {
           var keySystem = keySystems.shift();
-          _this.getMediaKeysPromise(keySystem, audioCodecs, videoCodecs).then(function (mediaKeys) {
+          _this2.getMediaKeysPromise(keySystem, audioCodecs, videoCodecs).then(function (mediaKeys) {
             return resolve({
               keySystem: keySystem,
               mediaKeys: mediaKeys
@@ -22594,7 +23521,7 @@
       return requestMediaKeySystemAccessFunc(keySystem, supportedConfigurations);
     };
     _proto.getMediaKeysPromise = function getMediaKeysPromise(keySystem, audioCodecs, videoCodecs) {
-      var _this2 = this;
+      var _this3 = this;
       // This can throw, but is caught in event handler callpath
       var mediaKeySystemConfigs = getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, this.config.drmSystemOptions);
       var keySystemAccessPromises = this.keySystemAccessPromises[keySystem];
@@ -22606,23 +23533,23 @@
           keySystemAccess: keySystemAccess
         };
         keySystemAccess.catch(function (error) {
-          _this2.log("Failed to obtain access to key-system \"" + keySystem + "\": " + error);
+          _this3.log("Failed to obtain access to key-system \"" + keySystem + "\": " + error);
         });
         return keySystemAccess.then(function (mediaKeySystemAccess) {
-          _this2.log("Access for key-system \"" + mediaKeySystemAccess.keySystem + "\" obtained");
-          var certificateRequest = _this2.fetchServerCertificate(keySystem);
-          _this2.log("Create media-keys for \"" + keySystem + "\"");
+          _this3.log("Access for key-system \"" + mediaKeySystemAccess.keySystem + "\" obtained");
+          var certificateRequest = _this3.fetchServerCertificate(keySystem);
+          _this3.log("Create media-keys for \"" + keySystem + "\"");
           _keySystemAccessPromises.mediaKeys = mediaKeySystemAccess.createMediaKeys().then(function (mediaKeys) {
-            _this2.log("Media-keys created for \"" + keySystem + "\"");
+            _this3.log("Media-keys created for \"" + keySystem + "\"");
             return certificateRequest.then(function (certificate) {
               if (certificate) {
-                return _this2.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
+                return _this3.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
               }
               return mediaKeys;
             });
           });
           _keySystemAccessPromises.mediaKeys.catch(function (error) {
-            _this2.error("Failed to create media-keys for \"" + keySystem + "\"}: " + error);
+            _this3.error("Failed to create media-keys for \"" + keySystem + "\"}: " + error);
           });
           return _keySystemAccessPromises.mediaKeys;
         });
@@ -22631,10 +23558,10 @@
         return keySystemAccessPromises.mediaKeys;
       });
     };
-    _proto.createMediaKeySessionContext = function createMediaKeySessionContext(_ref) {
-      var decryptdata = _ref.decryptdata,
-        keySystem = _ref.keySystem,
-        mediaKeys = _ref.mediaKeys;
+    _proto.createMediaKeySessionContext = function createMediaKeySessionContext(_ref2) {
+      var decryptdata = _ref2.decryptdata,
+        keySystem = _ref2.keySystem,
+        mediaKeys = _ref2.mediaKeys;
       this.log("Creating key-system session \"" + keySystem + "\" keyId: " + Hex.hexDump(decryptdata.keyId || []));
       var mediaKeysSession = mediaKeys.createSession();
       var mediaKeySessionContext = {
@@ -22683,14 +23610,14 @@
       return this.keyFormatPromise;
     };
     _proto.getKeyFormatPromise = function getKeyFormatPromise(keyFormats) {
-      var _this3 = this;
+      var _this4 = this;
       return new Promise(function (resolve, reject) {
-        var keySystemsInConfig = getKeySystemsForConfig(_this3.config);
+        var keySystemsInConfig = getKeySystemsForConfig(_this4.config);
         var keySystemsToAttempt = keyFormats.map(keySystemFormatToKeySystemDomain).filter(function (value) {
           return !!value && keySystemsInConfig.indexOf(value) !== -1;
         });
-        return _this3.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref2) {
-          var keySystem = _ref2.keySystem;
+        return _this4.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref3) {
+          var keySystem = _ref3.keySystem;
           var keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
           if (keySystemFormat) {
             resolve(keySystemFormat);
@@ -22701,31 +23628,31 @@
       });
     };
     _proto.loadKey = function loadKey(data) {
-      var _this4 = this;
+      var _this5 = this;
       var decryptdata = data.keyInfo.decryptdata;
       var keyId = this.getKeyIdString(decryptdata);
       var keyDetails = "(keyId: " + keyId + " format: \"" + decryptdata.keyFormat + "\" method: " + decryptdata.method + " uri: " + decryptdata.uri + ")";
       this.log("Starting session for key " + keyDetails);
       var keySessionContextPromise = this.keyIdToKeySessionPromise[keyId];
       if (!keySessionContextPromise) {
-        keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = this.getKeySystemForKeyPromise(decryptdata).then(function (_ref3) {
-          var keySystem = _ref3.keySystem,
-            mediaKeys = _ref3.mediaKeys;
-          _this4.throwIfDestroyed();
-          _this4.log("Handle encrypted media sn: " + data.frag.sn + " " + data.frag.type + ": " + data.frag.level + " using key " + keyDetails);
-          return _this4.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
-            _this4.throwIfDestroyed();
-            var keySessionContext = _this4.createMediaKeySessionContext({
+        keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = this.getKeySystemForKeyPromise(decryptdata).then(function (_ref4) {
+          var keySystem = _ref4.keySystem,
+            mediaKeys = _ref4.mediaKeys;
+          _this5.throwIfDestroyed();
+          _this5.log("Handle encrypted media sn: " + data.frag.sn + " " + data.frag.type + ": " + data.frag.level + " using key " + keyDetails);
+          return _this5.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
+            _this5.throwIfDestroyed();
+            var keySessionContext = _this5.createMediaKeySessionContext({
               keySystem: keySystem,
               mediaKeys: mediaKeys,
               decryptdata: decryptdata
             });
             var scheme = 'cenc';
-            return _this4.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
+            return _this5.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
           });
         });
         keySessionContextPromise.catch(function (error) {
-          return _this4.handleError(error);
+          return _this5.handleError(error);
         });
       }
       return keySessionContextPromise;
@@ -22751,128 +23678,30 @@
         });
       }
     };
-    _proto.getKeySystemForKeyPromise = function getKeySystemForKeyPromise(decryptdata) {
-      var keyId = this.getKeyIdString(decryptdata);
-      var mediaKeySessionContext = this.keyIdToKeySessionPromise[keyId];
-      if (!mediaKeySessionContext) {
-        var keySystem = keySystemFormatToKeySystemDomain(decryptdata.keyFormat);
-        var keySystemsToAttempt = keySystem ? [keySystem] : getKeySystemsForConfig(this.config);
-        return this.attemptKeySystemAccess(keySystemsToAttempt);
-      }
-      return mediaKeySessionContext;
-    };
-    _proto.getKeySystemSelectionPromise = function getKeySystemSelectionPromise(keySystemsToAttempt) {
-      if (!keySystemsToAttempt.length) {
-        keySystemsToAttempt = getKeySystemsForConfig(this.config);
-      }
-      if (keySystemsToAttempt.length === 0) {
-        throw new EMEKeyError({
-          type: ErrorTypes.KEY_SYSTEM_ERROR,
-          details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
-          fatal: true
-        }, "Missing key-system license configuration options " + JSON.stringify({
-          drmSystems: this.config.drmSystems
-        }));
-      }
-      return this.attemptKeySystemAccess(keySystemsToAttempt);
-    };
-    _proto._onMediaEncrypted = function _onMediaEncrypted(event) {
-      var _this5 = this;
-      var initDataType = event.initDataType,
-        initData = event.initData;
-      this.debug("\"" + event.type + "\" event: init data type: \"" + initDataType + "\"");
-
-      // Ignore event when initData is null
-      if (initData === null) {
-        return;
-      }
-      var keyId;
-      var keySystemDomain;
-      if (initDataType === 'sinf' && this.config.drmSystems[KeySystems.FAIRPLAY]) {
-        // Match sinf keyId to playlist skd://keyId=
-        var json = bin2str(new Uint8Array(initData));
-        try {
-          var sinf = base64Decode(JSON.parse(json).sinf);
-          var tenc = parseSinf(new Uint8Array(sinf));
-          if (!tenc) {
-            return;
-          }
-          keyId = tenc.subarray(8, 24);
-          keySystemDomain = KeySystems.FAIRPLAY;
-        } catch (error) {
-          this.warn('Failed to parse sinf "encrypted" event message initData');
-          return;
-        }
-      } else {
-        // Support clear-lead key-session creation (otherwise depend on playlist keys)
-        var psshInfo = parsePssh(initData);
-        if (psshInfo === null) {
-          return;
-        }
-        if (psshInfo.version === 0 && psshInfo.systemId === KeySystemIds.WIDEVINE && psshInfo.data) {
-          keyId = psshInfo.data.subarray(8, 24);
-        }
-        keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-      }
-      if (!keySystemDomain || !keyId) {
-        return;
-      }
-      var keyIdHex = Hex.hexDump(keyId);
-      var keyIdToKeySessionPromise = this.keyIdToKeySessionPromise,
-        mediaKeySessions = this.mediaKeySessions;
-      var keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-      var _loop = function _loop() {
-          // Match playlist key
-          var keyContext = mediaKeySessions[i];
-          var decryptdata = keyContext.decryptdata;
-          if (decryptdata.pssh || !decryptdata.keyId) {
-            return 0; // continue
-          }
-          var oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-          if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-            keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-            delete keyIdToKeySessionPromise[oldKeyIdHex];
-            decryptdata.pssh = new Uint8Array(initData);
-            decryptdata.keyId = keyId;
-            keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(function () {
-              return _this5.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
-            });
-            return 1; // break
-          }
-        },
-        _ret;
-      for (var i = 0; i < mediaKeySessions.length; i++) {
-        _ret = _loop();
-        if (_ret === 0) continue;
-        if (_ret === 1) break;
-      }
-      if (!keySessionContextPromise) {
-        // Clear-lead key (not encountered in playlist)
-        keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(function (_ref4) {
-          var _keySystemToKeySystem;
-          var keySystem = _ref4.keySystem,
-            mediaKeys = _ref4.mediaKeys;
-          _this5.throwIfDestroyed();
-          var decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
-          decryptdata.pssh = new Uint8Array(initData);
-          decryptdata.keyId = keyId;
-          return _this5.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
-            _this5.throwIfDestroyed();
-            var keySessionContext = _this5.createMediaKeySessionContext({
-              decryptdata: decryptdata,
-              keySystem: keySystem,
-              mediaKeys: mediaKeys
-            });
-            return _this5.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
-          });
-        });
+    _proto.getKeySystemForKeyPromise = function getKeySystemForKeyPromise(decryptdata) {
+      var keyId = this.getKeyIdString(decryptdata);
+      var mediaKeySessionContext = this.keyIdToKeySessionPromise[keyId];
+      if (!mediaKeySessionContext) {
+        var keySystem = keySystemFormatToKeySystemDomain(decryptdata.keyFormat);
+        var keySystemsToAttempt = keySystem ? [keySystem] : getKeySystemsForConfig(this.config);
+        return this.attemptKeySystemAccess(keySystemsToAttempt);
       }
-      keySessionContextPromise.catch(function (error) {
-        return _this5.handleError(error);
-      });
+      return mediaKeySessionContext;
     };
-    _proto._onWaitingForKey = function _onWaitingForKey(event) {
-      this.log("\"" + event.type + "\" event");
+    _proto.getKeySystemSelectionPromise = function getKeySystemSelectionPromise(keySystemsToAttempt) {
+      if (!keySystemsToAttempt.length) {
+        keySystemsToAttempt = getKeySystemsForConfig(this.config);
+      }
+      if (keySystemsToAttempt.length === 0) {
+        throw new EMEKeyError({
+          type: ErrorTypes.KEY_SYSTEM_ERROR,
+          details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
+          fatal: true
+        }, "Missing key-system license configuration options " + JSON.stringify({
+          drmSystems: this.config.drmSystems
+        }));
+      }
+      return this.attemptKeySystemAccess(keySystemsToAttempt);
     };
     _proto.attemptSetMediaKeys = function attemptSetMediaKeys(keySystem, mediaKeys) {
       var _this6 = this;
@@ -23329,7 +24158,7 @@
       }
     };
     return EMEController;
-  }();
+  }(Logger);
   EMEController.CDMCleanupPromise = void 0;
   var EMEKeyError = /*#__PURE__*/function (_Error) {
     _inheritsLoose(EMEKeyError, _Error);
@@ -23477,18 +24306,6 @@
     this.params = params;
   };
 
-  /**
-   * A class to represent structured field tokens when `Symbol` is not available.
-   *
-   * @group Structured Field
-   *
-   * @beta
-   */
-  var SfToken = function SfToken(description) {
-    this.description = void 0;
-    this.description = description;
-  };
-
   var DICT = 'Dict';
 
   function format(value) {
@@ -23512,29 +24329,25 @@
     });
   }
 
-  var BARE_ITEM = 'Bare Item';
-
-  var BOOLEAN = 'Boolean';
-
-  var BYTES = 'Byte Sequence';
-
-  var DECIMAL = 'Decimal';
-
-  var INTEGER = 'Integer';
-
-  function isInvalidInt(value) {
-    return value < -999999999999999 || 999999999999999 < value;
+  function serializeError(src, type, cause) {
+    return throwError('serialize', src, type, cause);
   }
 
-  var STRING_REGEX = /[\x00-\x1f\x7f]+/; // eslint-disable-line no-control-regex
-
-  var TOKEN = 'Token';
+  /**
+   * A class to represent structured field tokens when `Symbol` is not available.
+   *
+   * @group Structured Field
+   *
+   * @beta
+   */
+  var SfToken = function SfToken(description) {
+    this.description = void 0;
+    this.description = description;
+  };
 
-  var KEY = 'Key';
+  var BARE_ITEM = 'Bare Item';
 
-  function serializeError(src, type, cause) {
-    return throwError('serialize', src, type, cause);
-  }
+  var BOOLEAN = 'Boolean';
 
   // 4.1.9.  Serializing a Boolean
   //
@@ -23573,6 +24386,8 @@
     return btoa(String.fromCharCode.apply(String, binary));
   }
 
+  var BYTES = 'Byte Sequence';
+
   // 4.1.8.  Serializing a Byte Sequence
   //
   // Given a Byte Sequence as input_bytes, return an ASCII string suitable
@@ -23604,6 +24419,12 @@
     return ":" + base64encode(value) + ":";
   }
 
+  var INTEGER = 'Integer';
+
+  function isInvalidInt(value) {
+    return value < -999999999999999 || 999999999999999 < value;
+  }
+
   // 4.1.4.  Serializing an Integer
   //
   // Given an Integer as input_integer, return an ASCII string suitable
@@ -23669,6 +24490,8 @@
     }
   }
 
+  var DECIMAL = 'Decimal';
+
   // 4.1.5.  Serializing a Decimal
   //
   // Given a decimal number as input_decimal, return an ASCII string
@@ -23714,6 +24537,8 @@
 
   var STRING = 'String';
 
+  var STRING_REGEX = /[\x00-\x1f\x7f]+/; // eslint-disable-line no-control-regex
+
   // 4.1.6.  Serializing a String
   //
   // Given a String as input_string, return an ASCII string suitable for
@@ -23749,6 +24574,8 @@
     return symbol.description || symbol.toString().slice(7, -1);
   }
 
+  var TOKEN = 'Token';
+
   function serializeToken(token) {
     var value = symbolToStr(token);
     if (/^([a-zA-Z*])([!#$%&'*+\-.^_`|~\w:/]*)$/.test(value) === false) {
@@ -23816,6 +24643,8 @@
     }
   }
 
+  var KEY = 'Key';
+
   // 4.1.1.3.  Serializing a Key
   //
   // Given a key as input_key, return an ASCII string suitable for use in
@@ -24067,36 +24896,6 @@
     return toPath.join('/');
   }
 
-  /**
-   * Generate a random v4 UUID
-   *
-   * @returns A random v4 UUID
-   *
-   * @group Utils
-   *
-   * @beta
-   */
-  function uuid() {
-    try {
-      return crypto.randomUUID();
-    } catch (error) {
-      try {
-        var url = URL.createObjectURL(new Blob());
-        var _uuid = url.toString();
-        URL.revokeObjectURL(url);
-        return _uuid.slice(_uuid.lastIndexOf('/') + 1);
-      } catch (error) {
-        var dt = new Date().getTime();
-        var _uuid2 = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-          var r = (dt + Math.random() * 16) % 16 | 0;
-          dt = Math.floor(dt / 16);
-          return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
-        });
-        return _uuid2;
-      }
-    }
-  }
-
   var toRounded = function toRounded(value) {
     return Math.round(value);
   };
@@ -24341,6 +25140,36 @@
     return "" + url + separator + query;
   }
 
+  /**
+   * Generate a random v4 UUID
+   *
+   * @returns A random v4 UUID
+   *
+   * @group Utils
+   *
+   * @beta
+   */
+  function uuid() {
+    try {
+      return crypto.randomUUID();
+    } catch (error) {
+      try {
+        var url = URL.createObjectURL(new Blob());
+        var _uuid = url.toString();
+        URL.revokeObjectURL(url);
+        return _uuid.slice(_uuid.lastIndexOf('/') + 1);
+      } catch (error) {
+        var dt = new Date().getTime();
+        var _uuid2 = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          var r = (dt + Math.random() * 16) % 16 | 0;
+          dt = Math.floor(dt / 16);
+          return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
+        });
+        return _uuid2;
+      }
+    }
+  }
+
   /**
    * Controller to deal with Common Media Client Data (CMCD)
    * @see https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf
@@ -24405,6 +25234,12 @@
             data.tb = _this.getTopBandwidth(ot) / 1000;
             data.bl = _this.getBufferLength(ot);
           }
+          var next = _this.getNextFrag(fragment);
+          if (next) {
+            if (next.url && next.url !== fragment.url) {
+              data.nor = next.url;
+            }
+          }
           _this.apply(context, data);
         } catch (error) {
           logger.warn('Could not generate segment CMCD data.', error);
@@ -24499,7 +25334,7 @@
         data.su = this.buffering;
       }
 
-      // TODO: Implement rtp, nrr, nor, dl
+      // TODO: Implement rtp, nrr, dl
 
       var includeKeys = this.includeKeys;
       if (includeKeys) {
@@ -24508,18 +25343,31 @@
           return acc;
         }, {});
       }
+      var options = {
+        baseUrl: context.url
+      };
       if (this.useHeaders) {
         if (!context.headers) {
           context.headers = {};
         }
-        appendCmcdHeaders(context.headers, data);
+        appendCmcdHeaders(context.headers, data, options);
       } else {
-        context.url = appendCmcdQuery(context.url, data);
+        context.url = appendCmcdQuery(context.url, data, options);
       }
     };
+    _proto.getNextFrag = function getNextFrag(fragment) {
+      var _this$hls$levels$frag;
+      var levelDetails = (_this$hls$levels$frag = this.hls.levels[fragment.level]) == null ? void 0 : _this$hls$levels$frag.details;
+      if (levelDetails) {
+        var index = fragment.sn - levelDetails.startSN;
+        return levelDetails.fragments[index + 1];
+      }
+      return undefined;
+    }
+
     /**
      * The CMCD object type.
-     */
+     */;
     _proto.getObjectType = function getObjectType(fragment) {
       var type = fragment.type;
       if (type === 'subtitle') {
@@ -24655,26 +25503,28 @@
   }();
 
   var PATHWAY_PENALTY_DURATION_MS = 300000;
-  var ContentSteeringController = /*#__PURE__*/function () {
+  var ContentSteeringController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(ContentSteeringController, _Logger);
     function ContentSteeringController(hls) {
-      this.hls = void 0;
-      this.log = void 0;
-      this.loader = null;
-      this.uri = null;
-      this.pathwayId = '.';
-      this.pathwayPriority = null;
-      this.timeToLoad = 300;
-      this.reloadTimer = -1;
-      this.updated = 0;
-      this.started = false;
-      this.enabled = true;
-      this.levels = null;
-      this.audioTracks = null;
-      this.subtitleTracks = null;
-      this.penalizedPathways = {};
-      this.hls = hls;
-      this.log = logger.log.bind(logger, "[content-steering]:");
-      this.registerListeners();
+      var _this;
+      _this = _Logger.call(this, 'content-steering', hls.logger) || this;
+      _this.hls = void 0;
+      _this.loader = null;
+      _this.uri = null;
+      _this.pathwayId = '.';
+      _this.pathwayPriority = null;
+      _this.timeToLoad = 300;
+      _this.reloadTimer = -1;
+      _this.updated = 0;
+      _this.started = false;
+      _this.enabled = true;
+      _this.levels = null;
+      _this.audioTracks = null;
+      _this.subtitleTracks = null;
+      _this.penalizedPathways = {};
+      _this.hls = hls;
+      _this.registerListeners();
+      return _this;
     }
     var _proto = ContentSteeringController.prototype;
     _proto.registerListeners = function registerListeners() {
@@ -24795,7 +25645,7 @@
           errorAction.resolved = this.pathwayId !== errorPathway;
         }
         if (!errorAction.resolved) {
-          logger.warn("Could not resolve " + data.details + " (\"" + data.error.message + "\") with content-steering for Pathway: " + errorPathway + " levels: " + (levels ? levels.length : levels) + " priorities: " + JSON.stringify(pathwayPriority) + " penalized: " + JSON.stringify(this.penalizedPathways));
+          this.warn("Could not resolve " + data.details + " (\"" + data.error.message + "\") with content-steering for Pathway: " + errorPathway + " levels: " + (levels ? levels.length : levels) + " priorities: " + JSON.stringify(pathwayPriority) + " penalized: " + JSON.stringify(this.penalizedPathways));
         }
       }
     };
@@ -24875,7 +25725,7 @@
       return defaultPathway;
     };
     _proto.clonePathways = function clonePathways(pathwayClones) {
-      var _this = this;
+      var _this2 = this;
       var levels = this.levels;
       if (!levels) {
         return;
@@ -24891,7 +25741,7 @@
         })) {
           return;
         }
-        var clonedVariants = _this.getLevelsForPathway(baseId).map(function (baseLevel) {
+        var clonedVariants = _this2.getLevelsForPathway(baseId).map(function (baseLevel) {
           var attributes = new AttrList(baseLevel.attrs);
           attributes['PATHWAY-ID'] = cloneId;
           var clonedAudioGroupId = attributes.AUDIO && attributes.AUDIO + "_clone_" + cloneId;
@@ -24928,12 +25778,12 @@
           return clonedLevel;
         });
         levels.push.apply(levels, clonedVariants);
-        cloneRenditionGroups(_this.audioTracks, audioGroupCloneMap, uriReplacement, cloneId);
-        cloneRenditionGroups(_this.subtitleTracks, subtitleGroupCloneMap, uriReplacement, cloneId);
+        cloneRenditionGroups(_this2.audioTracks, audioGroupCloneMap, uriReplacement, cloneId);
+        cloneRenditionGroups(_this2.subtitleTracks, subtitleGroupCloneMap, uriReplacement, cloneId);
       });
     };
     _proto.loadSteeringManifest = function loadSteeringManifest(uri) {
-      var _this2 = this;
+      var _this3 = this;
       var config = this.hls.config;
       var Loader = config.loader;
       if (this.loader) {
@@ -24968,87 +25818,87 @@
       };
       var callbacks = {
         onSuccess: function onSuccess(response, stats, context, networkDetails) {
-          _this2.log("Loaded steering manifest: \"" + url + "\"");
+          _this3.log("Loaded steering manifest: \"" + url + "\"");
           var steeringData = response.data;
-          if (steeringData.VERSION !== 1) {
-            _this2.log("Steering VERSION " + steeringData.VERSION + " not supported!");
+          if ((steeringData == null ? void 0 : steeringData.VERSION) !== 1) {
+            _this3.log("Steering VERSION " + steeringData.VERSION + " not supported!");
             return;
           }
-          _this2.updated = performance.now();
-          _this2.timeToLoad = steeringData.TTL;
+          _this3.updated = performance.now();
+          _this3.timeToLoad = steeringData.TTL;
           var reloadUri = steeringData['RELOAD-URI'],
             pathwayClones = steeringData['PATHWAY-CLONES'],
             pathwayPriority = steeringData['PATHWAY-PRIORITY'];
           if (reloadUri) {
             try {
-              _this2.uri = new self.URL(reloadUri, url).href;
+              _this3.uri = new self.URL(reloadUri, url).href;
             } catch (error) {
-              _this2.enabled = false;
-              _this2.log("Failed to parse Steering Manifest RELOAD-URI: " + reloadUri);
+              _this3.enabled = false;
+              _this3.log("Failed to parse Steering Manifest RELOAD-URI: " + reloadUri);
               return;
             }
           }
-          _this2.scheduleRefresh(_this2.uri || context.url);
+          _this3.scheduleRefresh(_this3.uri || context.url);
           if (pathwayClones) {
-            _this2.clonePathways(pathwayClones);
+            _this3.clonePathways(pathwayClones);
           }
           var loadedSteeringData = {
             steeringManifest: steeringData,
             url: url.toString()
           };
-          _this2.hls.trigger(Events.STEERING_MANIFEST_LOADED, loadedSteeringData);
+          _this3.hls.trigger(Events.STEERING_MANIFEST_LOADED, loadedSteeringData);
           if (pathwayPriority) {
-            _this2.updatePathwayPriority(pathwayPriority);
+            _this3.updatePathwayPriority(pathwayPriority);
           }
         },
         onError: function onError(error, context, networkDetails, stats) {
-          _this2.log("Error loading steering manifest: " + error.code + " " + error.text + " (" + context.url + ")");
-          _this2.stopLoad();
+          _this3.log("Error loading steering manifest: " + error.code + " " + error.text + " (" + context.url + ")");
+          _this3.stopLoad();
           if (error.code === 410) {
-            _this2.enabled = false;
-            _this2.log("Steering manifest " + context.url + " no longer available");
+            _this3.enabled = false;
+            _this3.log("Steering manifest " + context.url + " no longer available");
             return;
           }
-          var ttl = _this2.timeToLoad * 1000;
+          var ttl = _this3.timeToLoad * 1000;
           if (error.code === 429) {
-            var loader = _this2.loader;
+            var loader = _this3.loader;
             if (typeof (loader == null ? void 0 : loader.getResponseHeader) === 'function') {
               var retryAfter = loader.getResponseHeader('Retry-After');
               if (retryAfter) {
                 ttl = parseFloat(retryAfter) * 1000;
               }
             }
-            _this2.log("Steering manifest " + context.url + " rate limited");
+            _this3.log("Steering manifest " + context.url + " rate limited");
             return;
           }
-          _this2.scheduleRefresh(_this2.uri || context.url, ttl);
+          _this3.scheduleRefresh(_this3.uri || context.url, ttl);
         },
         onTimeout: function onTimeout(stats, context, networkDetails) {
-          _this2.log("Timeout loading steering manifest (" + context.url + ")");
-          _this2.scheduleRefresh(_this2.uri || context.url);
+          _this3.log("Timeout loading steering manifest (" + context.url + ")");
+          _this3.scheduleRefresh(_this3.uri || context.url);
         }
       };
       this.log("Requesting steering manifest: " + url);
       this.loader.load(context, loaderConfig, callbacks);
     };
     _proto.scheduleRefresh = function scheduleRefresh(uri, ttlMs) {
-      var _this3 = this;
+      var _this4 = this;
       if (ttlMs === void 0) {
         ttlMs = this.timeToLoad * 1000;
       }
       this.clearTimeout();
       this.reloadTimer = self.setTimeout(function () {
-        var _this3$hls;
-        var media = (_this3$hls = _this3.hls) == null ? void 0 : _this3$hls.media;
+        var _this4$hls;
+        var media = (_this4$hls = _this4.hls) == null ? void 0 : _this4$hls.media;
         if (media && !media.ended) {
-          _this3.loadSteeringManifest(uri);
+          _this4.loadSteeringManifest(uri);
           return;
         }
-        _this3.scheduleRefresh(uri, _this3.timeToLoad * 1000);
+        _this4.scheduleRefresh(uri, _this4.timeToLoad * 1000);
       }, ttlMs);
     };
     return ContentSteeringController;
-  }();
+  }(Logger);
   function cloneRenditionGroups(tracks, groupCloneMap, uriReplacement, cloneId) {
     if (!tracks) {
       return;
@@ -25948,7 +26798,7 @@
   /**
    * @ignore
    */
-  function mergeConfig(defaultConfig, userConfig) {
+  function mergeConfig(defaultConfig, userConfig, logger) {
     if ((userConfig.liveSyncDurationCount || userConfig.liveMaxLatencyDurationCount) && (userConfig.liveSyncDuration || userConfig.liveMaxLatencyDuration)) {
       throw new Error("Illegal hls.js config: don't mix up liveSyncDurationCount/liveMaxLatencyDurationCount and liveSyncDuration/liveMaxLatencyDuration");
     }
@@ -26018,7 +26868,7 @@
   /**
    * @ignore
    */
-  function enableStreamingMode(config) {
+  function enableStreamingMode(config, logger) {
     var currentLoader = config.loader;
     if (currentLoader !== FetchLoader && currentLoader !== XhrLoader) {
       // If a developer has configured their own loader, respect that choice
@@ -26035,12 +26885,11 @@
     }
   }
 
-  var chromeOrFirefox;
   var LevelController = /*#__PURE__*/function (_BasePlaylistControll) {
     _inheritsLoose(LevelController, _BasePlaylistControll);
     function LevelController(hls, contentSteeringController) {
       var _this;
-      _this = _BasePlaylistControll.call(this, hls, '[level-controller]') || this;
+      _this = _BasePlaylistControll.call(this, hls, 'level-controller') || this;
       _this._levels = [];
       _this._firstLevel = -1;
       _this._maxAutoLevel = -1;
@@ -26109,21 +26958,13 @@
       var videoCodecFound = false;
       var audioCodecFound = false;
       data.levels.forEach(function (levelParsed) {
-        var _audioCodec, _videoCodec;
+        var _videoCodec;
         var attributes = levelParsed.attrs;
-
-        // erase audio codec info if browser does not support mp4a.40.34.
-        // demuxer will autodetect codec and fallback to mpeg/audio
         var audioCodec = levelParsed.audioCodec,
           videoCodec = levelParsed.videoCodec;
-        if (((_audioCodec = audioCodec) == null ? void 0 : _audioCodec.indexOf('mp4a.40.34')) !== -1) {
-          chromeOrFirefox || (chromeOrFirefox = /chrome|firefox/i.test(navigator.userAgent));
-          if (chromeOrFirefox) {
-            levelParsed.audioCodec = audioCodec = undefined;
-          }
-        }
         if (audioCodec) {
-          levelParsed.audioCodec = audioCodec = getCodecCompatibleName(audioCodec, preferManagedMediaSource);
+          // Returns empty and set to undefined for 'mp4a.40.34' with fallback to 'audio/mpeg' SourceBuffer
+          levelParsed.audioCodec = audioCodec = getCodecCompatibleName(audioCodec, preferManagedMediaSource) || undefined;
         }
         if (((_videoCodec = videoCodec) == null ? void 0 : _videoCodec.indexOf('avc1')) === 0) {
           videoCodec = levelParsed.videoCodec = convertAVC1ToAVCOTI(videoCodec);
@@ -26731,6 +27572,8 @@
           }
           return this.loadKeyEME(keyInfo, frag);
         case 'AES-128':
+        case 'AES-256':
+        case 'AES-256-CTR':
           return this.loadKeyHTTP(keyInfo, frag);
         default:
           return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error("Key supplied with unsupported METHOD: \"" + decryptdata.method + "\"")));
@@ -26870,21 +27713,26 @@
   var MAX_START_GAP_JUMP = 2.0;
   var SKIP_BUFFER_HOLE_STEP_SECONDS = 0.1;
   var SKIP_BUFFER_RANGE_START = 0.05;
-  var GapController = /*#__PURE__*/function () {
+  var GapController = /*#__PURE__*/function (_Logger) {
+    _inheritsLoose(GapController, _Logger);
     function GapController(config, media, fragmentTracker, hls) {
-      this.config = void 0;
-      this.media = null;
-      this.fragmentTracker = void 0;
-      this.hls = void 0;
-      this.nudgeRetry = 0;
-      this.stallReported = false;
-      this.stalled = null;
-      this.moved = false;
-      this.seeking = false;
-      this.config = config;
-      this.media = media;
-      this.fragmentTracker = fragmentTracker;
-      this.hls = hls;
+      var _this;
+      _this = _Logger.call(this, 'gap-controller', hls.logger) || this;
+      _this.config = void 0;
+      _this.media = null;
+      _this.fragmentTracker = void 0;
+      _this.hls = void 0;
+      _this.nudgeRetry = 0;
+      _this.stallReported = false;
+      _this.stalled = null;
+      _this.moved = false;
+      _this.seeking = false;
+      _this.ended = 0;
+      _this.config = config;
+      _this.media = media;
+      _this.fragmentTracker = fragmentTracker;
+      _this.hls = hls;
+      return _this;
     }
     var _proto = GapController.prototype;
     _proto.destroy = function destroy() {
@@ -26899,7 +27747,7 @@
      *
      * @param lastCurrentTime - Previously read playhead position
      */;
-    _proto.poll = function poll(lastCurrentTime, activeFrag) {
+    _proto.poll = function poll(lastCurrentTime, activeFrag, levelDetails, state) {
       var config = this.config,
         media = this.media,
         stalled = this.stalled;
@@ -26914,6 +27762,7 @@
 
       // The playhead is moving, no-op
       if (currentTime !== lastCurrentTime) {
+        this.ended = 0;
         this.moved = true;
         if (!seeking) {
           this.nudgeRetry = 0;
@@ -26922,7 +27771,7 @@
           // The playhead is now moving, but was previously stalled
           if (this.stallReported) {
             var _stalledDuration = self.performance.now() - stalled;
-            logger.warn("playback not stuck anymore @" + currentTime + ", after " + Math.round(_stalledDuration) + "ms");
+            this.warn("playback not stuck anymore @" + currentTime + ", after " + Math.round(_stalledDuration) + "ms");
             this.stallReported = false;
           }
           this.stalled = null;
@@ -26958,7 +27807,6 @@
       // Skip start gaps if we haven't played, but the last poll detected the start of a stall
       // The addition poll gives the browser a chance to jump the gap for us
       if (!this.moved && this.stalled !== null) {
-        var _level$details;
         // There is no playable buffer (seeked, waiting for buffer)
         var isBuffered = bufferInfo.len > 0;
         if (!isBuffered && !nextStart) {
@@ -26970,9 +27818,8 @@
         // When joining a live stream with audio tracks, account for live playlist window sliding by allowing
         // a larger jump over start gaps caused by the audio-stream-controller buffering a start fragment
         // that begins over 1 target duration after the video start position.
-        var level = this.hls.levels ? this.hls.levels[this.hls.currentLevel] : null;
-        var isLive = level == null ? void 0 : (_level$details = level.details) == null ? void 0 : _level$details.live;
-        var maxStartGapJump = isLive ? level.details.targetduration * 2 : MAX_START_GAP_JUMP;
+        var isLive = !!(levelDetails != null && levelDetails.live);
+        var maxStartGapJump = isLive ? levelDetails.targetduration * 2 : MAX_START_GAP_JUMP;
         var partialOrGap = this.fragmentTracker.getPartialFragment(currentTime);
         if (startJump > 0 && (startJump <= maxStartGapJump || partialOrGap)) {
           if (!media.paused) {
@@ -26990,6 +27837,17 @@
       }
       var stalledDuration = tnow - stalled;
       if (!seeking && stalledDuration >= STALL_MINIMUM_DURATION_MS) {
+        // Dispatch MEDIA_ENDED when media.ended/ended event is not signalled at end of stream
+        if (state === State.ENDED && !(levelDetails && levelDetails.live) && Math.abs(currentTime - ((levelDetails == null ? void 0 : levelDetails.edge) || 0)) < 1) {
+          if (stalledDuration < 1000 || this.ended) {
+            return;
+          }
+          this.ended = currentTime;
+          this.hls.trigger(Events.MEDIA_ENDED, {
+            stalled: true
+          });
+          return;
+        }
         // Report stalling after trying to fix
         this._reportStall(bufferInfo);
         if (!this.media) {
@@ -27031,7 +27889,7 @@
       // needs to cross some sort of threshold covering all source-buffers content
       // to start playing properly.
       if ((bufferInfo.len > config.maxBufferHole || bufferInfo.nextStart && bufferInfo.nextStart - currentTime < config.maxBufferHole) && stalledDurationMs > config.highBufferWatchdogPeriod * 1000) {
-        logger.warn('Trying to nudge playhead over buffer-hole');
+        this.warn('Trying to nudge playhead over buffer-hole');
         // Try to nudge currentTime over a buffer hole if we've been stalling for the configured amount of seconds
         // We only try to jump the hole if it's under the configured size
         // Reset stalled so to rearm watchdog timer
@@ -27053,7 +27911,7 @@
         // Report stalled error once
         this.stallReported = true;
         var error = new Error("Playback stalling at @" + media.currentTime + " due to low buffer (" + JSON.stringify(bufferInfo) + ")");
-        logger.warn(error.message);
+        this.warn(error.message);
         hls.trigger(Events.ERROR, {
           type: ErrorTypes.MEDIA_ERROR,
           details: ErrorDetails.BUFFER_STALLED_ERROR,
@@ -27117,7 +27975,7 @@
             }
           }
           var targetTime = Math.max(startTime + SKIP_BUFFER_RANGE_START, currentTime + SKIP_BUFFER_HOLE_STEP_SECONDS);
-          logger.warn("skipping hole, adjusting currentTime from " + currentTime + " to " + targetTime);
+          this.warn("skipping hole, adjusting currentTime from " + currentTime + " to " + targetTime);
           this.moved = true;
           this.stalled = null;
           media.currentTime = targetTime;
@@ -27156,7 +28014,7 @@
         var targetTime = currentTime + (nudgeRetry + 1) * config.nudgeOffset;
         // playback stalled in buffered area ... let's nudge currentTime to try to overcome this
         var error = new Error("Nudging 'currentTime' from " + currentTime + " to " + targetTime);
-        logger.warn(error.message);
+        this.warn(error.message);
         media.currentTime = targetTime;
         hls.trigger(Events.ERROR, {
           type: ErrorTypes.MEDIA_ERROR,
@@ -27166,7 +28024,7 @@
         });
       } else {
         var _error = new Error("Playhead still not moving while enough data buffered @" + currentTime + " after " + config.nudgeMaxRetry + " nudges");
-        logger.error(_error.message);
+        this.error(_error.message);
         hls.trigger(Events.ERROR, {
           type: ErrorTypes.MEDIA_ERROR,
           details: ErrorDetails.BUFFER_STALLED_ERROR,
@@ -27176,14 +28034,14 @@
       }
     };
     return GapController;
-  }();
+  }(Logger);
 
   var TICK_INTERVAL = 100; // how often to tick in ms
   var StreamController = /*#__PURE__*/function (_BaseStreamController) {
     _inheritsLoose(StreamController, _BaseStreamController);
     function StreamController(hls, fragmentTracker, keyLoader) {
       var _this;
-      _this = _BaseStreamController.call(this, hls, fragmentTracker, keyLoader, '[stream-controller]', PlaylistLevelType.MAIN) || this;
+      _this = _BaseStreamController.call(this, hls, fragmentTracker, keyLoader, 'stream-controller', PlaylistLevelType.MAIN) || this;
       _this.audioCodecSwap = false;
       _this.gapController = null;
       _this.level = -1;
@@ -27191,27 +28049,43 @@
       _this.altAudio = false;
       _this.audioOnly = false;
       _this.fragPlaying = null;
-      _this.onvplaying = null;
-      _this.onvseeked = null;
       _this.fragLastKbps = 0;
       _this.couldBacktrack = false;
       _this.backtrackFragment = null;
       _this.audioCodecSwitch = false;
       _this.videoBuffer = null;
-      _this._registerListeners();
+      _this.onMediaPlaying = function () {
+        // tick to speed up FRAG_CHANGED triggering
+        _this.tick();
+      };
+      _this.onMediaSeeked = function () {
+        var media = _this.media;
+        var currentTime = media ? media.currentTime : null;
+        if (isFiniteNumber(currentTime)) {
+          _this.log("Media seeked to " + currentTime.toFixed(3));
+        }
+
+        // If seeked was issued before buffer was appended do not tick immediately
+        var bufferInfo = _this.getMainFwdBufferInfo();
+        if (bufferInfo === null || bufferInfo.len === 0) {
+          _this.warn("Main forward buffer length on \"seeked\" event " + (bufferInfo ? bufferInfo.len : 'empty') + ")");
+          return;
+        }
+
+        // tick to speed up FRAG_CHANGED triggering
+        _this.tick();
+      };
+      _this.registerListeners();
       return _this;
     }
     var _proto = StreamController.prototype;
-    _proto._registerListeners = function _registerListeners() {
+    _proto.registerListeners = function registerListeners() {
+      _BaseStreamController.prototype.registerListeners.call(this);
       var hls = this.hls;
-      hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-      hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-      hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
       hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
       hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
       hls.on(Events.FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
-      hls.on(Events.ERROR, this.onError, this);
       hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
       hls.on(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
       hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
@@ -27219,15 +28093,12 @@
       hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
       hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
     };
-    _proto._unregisterListeners = function _unregisterListeners() {
+    _proto.unregisterListeners = function unregisterListeners() {
+      _BaseStreamController.prototype.unregisterListeners.call(this);
       var hls = this.hls;
-      hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-      hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-      hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
       hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
       hls.off(Events.FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
-      hls.off(Events.ERROR, this.onError, this);
       hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
       hls.off(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
       hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
@@ -27236,7 +28107,9 @@
       hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
     };
     _proto.onHandlerDestroying = function onHandlerDestroying() {
-      this._unregisterListeners();
+      // @ts-ignore
+      this.onMediaPlaying = this.onMediaSeeked = null;
+      this.unregisterListeners();
       _BaseStreamController.prototype.onHandlerDestroying.call(this);
     };
     _proto.startLoad = function startLoad(startPosition) {
@@ -27260,7 +28133,8 @@
           }
           // set new level to playlist loader : this will trigger start level load
           // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
-          this.level = hls.nextLoadLevel = startLevel;
+          hls.nextLoadLevel = startLevel;
+          this.level = hls.loadLevel;
           this.loadedmetadata = false;
         }
         // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
@@ -27345,7 +28219,7 @@
       if (this.altAudio && this.audioOnly) {
         return;
       }
-      if (!(levels != null && levels[level])) {
+      if (!this.buffering || !(levels != null && levels[level])) {
         return;
       }
       var levelInfo = levels[level];
@@ -27551,18 +28425,15 @@
     _proto.onMediaAttached = function onMediaAttached(event, data) {
       _BaseStreamController.prototype.onMediaAttached.call(this, event, data);
       var media = data.media;
-      this.onvplaying = this.onMediaPlaying.bind(this);
-      this.onvseeked = this.onMediaSeeked.bind(this);
-      media.addEventListener('playing', this.onvplaying);
-      media.addEventListener('seeked', this.onvseeked);
+      media.addEventListener('playing', this.onMediaPlaying);
+      media.addEventListener('seeked', this.onMediaSeeked);
       this.gapController = new GapController(this.config, media, this.fragmentTracker, this.hls);
     };
     _proto.onMediaDetaching = function onMediaDetaching() {
       var media = this.media;
-      if (media && this.onvplaying && this.onvseeked) {
-        media.removeEventListener('playing', this.onvplaying);
-        media.removeEventListener('seeked', this.onvseeked);
-        this.onvplaying = this.onvseeked = null;
+      if (media) {
+        media.removeEventListener('playing', this.onMediaPlaying);
+        media.removeEventListener('seeked', this.onMediaSeeked);
         this.videoBuffer = null;
       }
       this.fragPlaying = null;
@@ -27572,27 +28443,6 @@
       }
       _BaseStreamController.prototype.onMediaDetaching.call(this);
     };
-    _proto.onMediaPlaying = function onMediaPlaying() {
-      // tick to speed up FRAG_CHANGED triggering
-      this.tick();
-    };
-    _proto.onMediaSeeked = function onMediaSeeked() {
-      var media = this.media;
-      var currentTime = media ? media.currentTime : null;
-      if (isFiniteNumber(currentTime)) {
-        this.log("Media seeked to " + currentTime.toFixed(3));
-      }
-
-      // If seeked was issued before buffer was appended do not tick immediately
-      var bufferInfo = this.getMainFwdBufferInfo();
-      if (bufferInfo === null || bufferInfo.len === 0) {
-        this.warn("Main forward buffer length on \"seeked\" event " + (bufferInfo ? bufferInfo.len : 'empty') + ")");
-        return;
-      }
-
-      // tick to speed up FRAG_CHANGED triggering
-      this.tick();
-    };
     _proto.onManifestLoading = function onManifestLoading() {
       // reset buffer on manifest loading
       this.log('Trigger BUFFER_RESET');
@@ -27873,8 +28723,10 @@
       }
       if (this.loadedmetadata || !BufferHelper.getBuffered(media).length) {
         // Resolve gaps using the main buffer, whose ranges are the intersections of the A/V sourcebuffers
-        var activeFrag = this.state !== State.IDLE ? this.fragCurrent : null;
-        gapController.poll(this.lastCurrentTime, activeFrag);
+        var state = this.state;
+        var activeFrag = state !== State.IDLE ? this.fragCurrent : null;
+        var levelDetails = this.getLevelDetails();
+        gapController.poll(this.lastCurrentTime, activeFrag, levelDetails, state);
       }
       this.lastCurrentTime = media.currentTime;
     };
@@ -28339,9 +29191,12 @@
        * The configuration object provided on player instantiation.
        */
       this.userConfig = void 0;
+      /**
+       * The logger functions used by this player instance, configured on player instantiation.
+       */
+      this.logger = void 0;
       this.coreComponents = void 0;
       this.networkControllers = void 0;
-      this.started = false;
       this._emitter = new EventEmitter();
       this._autoLevelCapping = -1;
       this._maxHdcpLevel = null;
@@ -28358,11 +29213,11 @@
       this._media = null;
       this.url = null;
       this.triggeringException = void 0;
-      enableLogs(userConfig.debug || false, 'Hls instance');
-      var config = this.config = mergeConfig(Hls.DefaultConfig, userConfig);
+      var logger = this.logger = enableLogs(userConfig.debug || false, 'Hls instance');
+      var config = this.config = mergeConfig(Hls.DefaultConfig, userConfig, logger);
       this.userConfig = userConfig;
       if (config.progressive) {
-        enableStreamingMode(config);
+        enableStreamingMode(config, logger);
       }
 
       // core controllers and network loaders
@@ -28470,7 +29325,7 @@
         try {
           return this.emit(event, event, eventObject);
         } catch (error) {
-          logger.error('An internal error happened while handling event ' + event + '. Error message: "' + error.message + '". Here is a stacktrace:', error);
+          this.logger.error('An internal error happened while handling event ' + event + '. Error message: "' + error.message + '". Here is a stacktrace:', error);
           // Prevent recursion in error event handlers that throw #5497
           if (!this.triggeringException) {
             this.triggeringException = true;
@@ -28496,7 +29351,7 @@
      * Dispose of the instance
      */;
     _proto.destroy = function destroy() {
-      logger.log('destroy');
+      this.logger.log('destroy');
       this.trigger(Events.DESTROYING, undefined);
       this.detachMedia();
       this.removeAllListeners();
@@ -28521,7 +29376,7 @@
      * Attaches Hls.js to a media element
      */;
     _proto.attachMedia = function attachMedia(media) {
-      logger.log('attachMedia');
+      this.logger.log('attachMedia');
       this._media = media;
       this.trigger(Events.MEDIA_ATTACHING, {
         media: media
@@ -28532,7 +29387,7 @@
      * Detach Hls.js from the media
      */;
     _proto.detachMedia = function detachMedia() {
-      logger.log('detachMedia');
+      this.logger.log('detachMedia');
       this.trigger(Events.MEDIA_DETACHING, undefined);
       this._media = null;
     }
@@ -28549,7 +29404,7 @@
       });
       this._autoLevelCapping = -1;
       this._maxHdcpLevel = null;
-      logger.log("loadSource:" + loadingSource);
+      this.logger.log("loadSource:" + loadingSource);
       if (media && loadedSource && (loadedSource !== loadingSource || this.bufferController.hasSourceTypes())) {
         this.detachMedia();
         this.attachMedia(media);
@@ -28571,8 +29426,7 @@
       if (startPosition === void 0) {
         startPosition = -1;
       }
-      logger.log("startLoad(" + startPosition + ")");
-      this.started = true;
+      this.logger.log("startLoad(" + startPosition + ")");
       this.networkControllers.forEach(function (controller) {
         controller.startLoad(startPosition);
       });
@@ -28582,34 +29436,31 @@
      * Stop loading of any stream data.
      */;
     _proto.stopLoad = function stopLoad() {
-      logger.log('stopLoad');
-      this.started = false;
+      this.logger.log('stopLoad');
       this.networkControllers.forEach(function (controller) {
         controller.stopLoad();
       });
     }
 
     /**
-     * Resumes stream controller segment loading if previously started.
+     * Resumes stream controller segment loading after `pauseBuffering` has been called.
      */;
     _proto.resumeBuffering = function resumeBuffering() {
-      if (this.started) {
-        this.networkControllers.forEach(function (controller) {
-          if ('fragmentLoader' in controller) {
-            controller.startLoad(-1);
-          }
-        });
-      }
+      this.networkControllers.forEach(function (controller) {
+        if (controller.resumeBuffering) {
+          controller.resumeBuffering();
+        }
+      });
     }
 
     /**
-     * Stops stream controller segment loading without changing 'started' state like stopLoad().
+     * Prevents stream controller from loading new segments until `resumeBuffering` is called.
      * This allows for media buffering to be paused without interupting playlist loading.
      */;
     _proto.pauseBuffering = function pauseBuffering() {
       this.networkControllers.forEach(function (controller) {
-        if ('fragmentLoader' in controller) {
-          controller.stopLoad();
+        if (controller.pauseBuffering) {
+          controller.pauseBuffering();
         }
       });
     }
@@ -28618,7 +29469,7 @@
      * Swap through possible audio codecs in the stream (for example to switch from stereo to 5.1)
      */;
     _proto.swapAudioCodec = function swapAudioCodec() {
-      logger.log('swapAudioCodec');
+      this.logger.log('swapAudioCodec');
       this.streamController.swapAudioCodec();
     }
 
@@ -28629,7 +29480,7 @@
      * Automatic recovery of media-errors by this process is configurable.
      */;
     _proto.recoverMediaError = function recoverMediaError() {
-      logger.log('recoverMediaError');
+      this.logger.log('recoverMediaError');
       var media = this._media;
       this.detachMedia();
       if (media) {
@@ -28684,7 +29535,7 @@
        * Set quality level index immediately. This will flush the current buffer to replace the quality asap. That means playback will interrupt at least shortly to re-buffer and re-sync eventually. Set to -1 for automatic level selection.
        */,
       set: function set(newLevel) {
-        logger.log("set currentLevel:" + newLevel);
+        this.logger.log("set currentLevel:" + newLevel);
         this.levelController.manualLevel = newLevel;
         this.streamController.immediateLevelSwitch();
       }
@@ -28705,7 +29556,7 @@
        * @param newLevel - Pass -1 for automatic level selection
        */,
       set: function set(newLevel) {
-        logger.log("set nextLevel:" + newLevel);
+        this.logger.log("set nextLevel:" + newLevel);
         this.levelController.manualLevel = newLevel;
         this.streamController.nextLevelSwitch();
       }
@@ -28726,7 +29577,7 @@
        * @param newLevel - Pass -1 for automatic level selection
        */,
       set: function set(newLevel) {
-        logger.log("set loadLevel:" + newLevel);
+        this.logger.log("set loadLevel:" + newLevel);
         this.levelController.manualLevel = newLevel;
       }
 
@@ -28761,7 +29612,7 @@
        * Sets "first-level", see getter.
        */,
       set: function set(newLevel) {
-        logger.log("set firstLevel:" + newLevel);
+        this.logger.log("set firstLevel:" + newLevel);
         this.levelController.firstLevel = newLevel;
       }
 
@@ -28788,7 +29639,7 @@
        * (determined from download of first segment)
        */,
       set: function set(newLevel) {
-        logger.log("set startLevel:" + newLevel);
+        this.logger.log("set startLevel:" + newLevel);
         // if not in automatic start level detection, ensure startLevel is greater than minAutoLevel
         if (newLevel !== -1) {
           newLevel = Math.max(newLevel, this.minAutoLevel);
@@ -28841,7 +29692,7 @@
        */
       function set(newLevel) {
         if (this._autoLevelCapping !== newLevel) {
-          logger.log("set autoLevelCapping:" + newLevel);
+          this.logger.log("set autoLevelCapping:" + newLevel);
           this._autoLevelCapping = newLevel;
           this.levelController.checkMaxAutoUpdated();
         }
@@ -29166,7 +30017,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.3";
+        return "1.5.5-0.canary.9977";
       }
     }, {
       key: "Events",