hls.js 1.6.7-0.canary.11368 → 1.6.7-0.canary.11370

package/dist/hls.js

@@ -1165,7 +1165,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.7-0.canary.11368");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.7-0.canary.11370");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -1298,6 +1298,9 @@
       return str;
     }
   };
+  function hexToArrayBuffer(str) {
+    return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
+  }
 
   var LoadStats = function LoadStats() {
     this.aborted = false;
@@ -2813,88 +2816,6 @@
     // 16 bytes
     kidCount, kids, dataSize, data || new Uint8Array());
   }
-  function parseMultiPssh(initData) {
-    var results = [];
-    if (initData instanceof ArrayBuffer) {
-      var length = initData.byteLength;
-      var offset = 0;
-      while (offset + 32 < length) {
-        var view = new DataView(initData, offset);
-        var pssh = parsePssh(view);
-        results.push(pssh);
-        offset += pssh.size;
-      }
-    }
-    return results;
-  }
-  function parsePssh(view) {
-    var size = view.getUint32(0);
-    var offset = view.byteOffset;
-    var length = view.byteLength;
-    if (length < size) {
-      return {
-        offset: offset,
-        size: length
-      };
-    }
-    var type = view.getUint32(4);
-    if (type !== 0x70737368) {
-      return {
-        offset: offset,
-        size: size
-      };
-    }
-    var version = view.getUint32(8) >>> 24;
-    if (version !== 0 && version !== 1) {
-      return {
-        offset: offset,
-        size: size
-      };
-    }
-    var buffer = view.buffer;
-    var systemId = Hex.hexDump(new Uint8Array(buffer, offset + 12, 16));
-    var kids = null;
-    var data = null;
-    var dataSizeOffset = 0;
-    if (version === 0) {
-      dataSizeOffset = 28;
-    } else if (version === 1) {
-      var kidCounts = view.getUint32(28);
-      if (!kidCounts || length < 32 + kidCounts * 16) {
-        return {
-          offset: offset,
-          size: size
-        };
-      }
-      kids = [];
-      for (var i = 0; i < kidCounts; i++) {
-        kids.push(new Uint8Array(buffer, offset + 32 + i * 16, 16));
-      }
-      dataSizeOffset = 32 + kidCounts * 16;
-    }
-    if (!dataSizeOffset) {
-      return {
-        offset: offset,
-        size: size
-      };
-    }
-    var dataSizeOrKidCount = view.getUint32(dataSizeOffset);
-    if (size - 32 < dataSizeOrKidCount) {
-      return {
-        offset: offset,
-        size: size
-      };
-    }
-    data = new Uint8Array(buffer, offset + dataSizeOffset + 4, dataSizeOrKidCount);
-    return {
-      version: version,
-      systemId: systemId,
-      kids: kids,
-      data: data,
-      offset: offset,
-      size: size
-    };
-  }
 
   var userAgentHevcSupportIsInaccurate = function userAgentHevcSupportIsInaccurate() {
     return /\(Windows.+Firefox\//i.test(navigator.userAgent);
@@ -7532,23 +7453,6 @@
         return KeySystems.CLEARKEY;
     }
   }
-
-  // System IDs for which we can extract a key ID from "encrypted" event PSSH
-  var KeySystemIds = {
-    CENC: "1077efecc0b24d02ace33c1e52e2fb4b",
-    CLEARKEY: "e2719d58a985b3c9781ab030af78d30e",
-    PLAYREADY: "9a04f07998404286ab92e65be0885f95",
-    WIDEVINE: "edef8ba979d64acea3c827dcd51d21ed"
-  };
-  function keySystemIdToKeySystemDomain(systemId) {
-    if (systemId === KeySystemIds.WIDEVINE) {
-      return KeySystems.WIDEVINE;
-    } else if (systemId === KeySystemIds.PLAYREADY) {
-      return KeySystems.PLAYREADY;
-    } else if (systemId === KeySystemIds.CENC || systemId === KeySystemIds.CLEARKEY) {
-      return KeySystems.CLEARKEY;
-    }
-  }
   function keySystemDomainToKeySystemFormat(keySystem) {
     switch (keySystem) {
       case KeySystems.FAIRPLAY:
@@ -7654,7 +7558,7 @@
 
   var keyUriToKeyIdMap = {};
   var LevelKey = /*#__PURE__*/function () {
-    function LevelKey(method, uri, format, formatversions, iv) {
+    function LevelKey(method, uri, format, formatversions, iv, keyId) {
       if (formatversions === void 0) {
         formatversions = [1];
       }
@@ -7678,11 +7582,18 @@
       this.iv = iv;
       this.encrypted = method ? method !== 'NONE' : false;
       this.isCommonEncryption = this.encrypted && !isFullSegmentEncryption(method);
+      if (keyId != null && keyId.startsWith('0x')) {
+        this.keyId = new Uint8Array(hexToArrayBuffer(keyId));
+      }
     }
     LevelKey.clearKeyUriToKeyIdMap = function clearKeyUriToKeyIdMap() {
       keyUriToKeyIdMap = {};
     };
     var _proto = LevelKey.prototype;
+    _proto.matches = function matches(key) {
+      var _key$iv, _this$iv;
+      return key.uri === this.uri && key.method === this.method && key.encrypted === this.encrypted && key.keyFormat === this.keyFormat && key.keyFormatVersions.join(',') === this.keyFormatVersions.join(',') && ((_key$iv = key.iv) == null ? void 0 : _key$iv.join(',')) === ((_this$iv = this.iv) == null ? void 0 : _this$iv.join(','));
+    };
     _proto.isSupported = function isSupported() {
       // If it's Segment encryption or No encryption, just select that key system
       if (this.method) {
@@ -7722,6 +7633,9 @@
         var decryptdata = new LevelKey(this.method, this.uri, 'identity', this.keyFormatVersions, iv);
         return decryptdata;
       }
+      if (this.pssh && this.keyId) {
+        return this;
+      }
 
       // Initialize keyId if possible
       var keyBytes = convertDataUriToArrayBytes(this.uri);
@@ -7731,9 +7645,10 @@
             // Setting `pssh` on this LevelKey/DecryptData allows HLS.js to generate a session using
             // the playlist-key before the "encrypted" event. (Comment out to only use "encrypted" path.)
             this.pssh = keyBytes;
-            // In case of widevine keyID is embedded in PSSH box. Read Key ID.
-            if (keyBytes.length >= 22) {
-              this.keyId = keyBytes.subarray(keyBytes.length - 22, keyBytes.length - 6);
+            // In case of Widevine, if KEYID is not in the playlist, assume only two fields in the pssh KEY tag URI.
+            if (!this.keyId && keyBytes.length >= 22) {
+              var offset = keyBytes.length - 22;
+              this.keyId = keyBytes.subarray(offset, offset + 16);
             }
             break;
           case KeySystemFormats.PLAYREADY:
@@ -8233,10 +8148,14 @@
                   if (!levelkeys) {
                     levelkeys = {};
                   }
-                  if (levelkeys[levelKey.keyFormat]) {
-                    levelkeys = _extends({}, levelkeys);
+                  var currentKey = levelkeys[levelKey.keyFormat];
+                  // Ignore duplicate playlist KEY tags
+                  if (!(currentKey != null && currentKey.matches(levelKey))) {
+                    if (currentKey) {
+                      levelkeys = _extends({}, levelkeys);
+                    }
+                    levelkeys[levelKey.keyFormat] = levelKey;
                   }
-                  levelkeys[levelKey.keyFormat] = levelKey;
                 } else {
                   logger.warn("[Keys] Ignoring invalid EXT-X-KEY tag: \"" + value1 + "\"");
                 }
@@ -8460,7 +8379,7 @@
     // No uri is allowed when METHOD is NONE
     var resolvedUri = decrypturi ? M3U8Parser.resolve(decrypturi, baseurl) : '';
     var keyFormatVersions = (decryptkeyformatversions ? decryptkeyformatversions : '1').split('/').map(Number).filter(Number.isFinite);
-    return new LevelKey(decryptmethod, resolvedUri, decryptkeyformat, keyFormatVersions, decryptiv);
+    return new LevelKey(decryptmethod, resolvedUri, decryptkeyformat, keyFormatVersions, decryptiv, keyAttrs.KEYID);
   }
   function parseStartTimeOffset(startAttributes) {
     var startAttrs = new AttrList(startAttributes);
@@ -16725,7 +16644,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.7-0.canary.11368";
+  var version = "1.6.7-0.canary.11370";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -17213,7 +17132,7 @@
       var syncFrag = findNearestWithCC(trackDetails, targetDiscontinuity, pos);
       // Only stop waiting for audioFrag.cc if an audio segment of the same discontinuity domain (cc) is found
       if (syncFrag) {
-        this.log("Waiting fragment cc (" + (waitingToAppend == null ? void 0 : waitingToAppend.cc) + ") cancelled because video is at cc " + mainAnchor.cc);
+        this.log("Syncing with main frag at " + syncFrag.start + " cc " + syncFrag.cc);
         this.startFragRequested = false;
         this.nextLoadPosition = syncFrag.start;
         this.resetLoadingState();
@@ -22324,154 +22243,6 @@
       _this.keyIdToKeySessionPromise = {};
       _this.mediaKeys = null;
       _this.setMediaKeysQueue = EMEController.CDMCleanupPromise ? [EMEController.CDMCleanupPromise] : [];
-      _this.onMediaEncrypted = function (event) {
-        var initDataType = event.initDataType,
-          initData = event.initData;
-        var logMessage = "\"" + event.type + "\" event: init data type: \"" + initDataType + "\"";
-        _this.debug(logMessage);
-
-        // Ignore event when initData is null
-        if (initData === null) {
-          return;
-        }
-        if (!_this.keyFormatPromise) {
-          var keySystems = Object.keys(_this.keySystemAccessPromises);
-          if (!keySystems.length) {
-            keySystems = getKeySystemsForConfig(_this.config);
-          }
-          var keyFormats = keySystems.map(keySystemDomainToKeySystemFormat).filter(function (k) {
-            return !!k;
-          });
-          _this.keyFormatPromise = _this.getKeyFormatPromise(keyFormats);
-        }
-        _this.keyFormatPromise.then(function (keySystemFormat) {
-          var keySystem = keySystemFormatToKeySystemDomain(keySystemFormat);
-          var keyId;
-          var keySystemDomain;
-          if (initDataType === 'sinf') {
-            if (keySystem !== KeySystems.FAIRPLAY) {
-              _this.warn("Ignoring unexpected \"" + event.type + "\" event with init data type: \"" + initDataType + "\" for selected key-system " + keySystem);
-              return;
-            }
-            // Match sinf keyId to playlist skd://keyId=
-            var json = bin2str(new Uint8Array(initData));
-            try {
-              var sinf = base64Decode(JSON.parse(json).sinf);
-              var tenc = parseSinf(sinf);
-              if (!tenc) {
-                throw new Error("'schm' box missing or not cbcs/cenc with schi > tenc");
-              }
-              keyId = new Uint8Array(tenc.subarray(8, 24));
-              keySystemDomain = KeySystems.FAIRPLAY;
-            } catch (error) {
-              _this.warn(logMessage + " Failed to parse sinf: " + error);
-              return;
-            }
-          } else {
-            if (keySystem !== KeySystems.WIDEVINE && keySystem !== KeySystems.PLAYREADY) {
-              _this.warn("Ignoring unexpected \"" + event.type + "\" event with init data type: \"" + initDataType + "\" for selected key-system " + keySystem);
-              return;
-            }
-            // Support Widevine/PlayReady clear-lead key-session creation (otherwise depend on playlist keys)
-            var psshResults = parseMultiPssh(initData);
-            var psshInfos = psshResults.filter(function (pssh) {
-              return !!pssh.systemId && keySystemIdToKeySystemDomain(pssh.systemId) === keySystem;
-            });
-            if (psshInfos.length > 1) {
-              _this.warn(logMessage + " Using first of " + psshInfos.length + " pssh found for selected key-system " + keySystem);
-            }
-            var psshInfo = psshInfos[0];
-            if (!psshInfo) {
-              if (psshResults.length === 0 || psshResults.some(function (pssh) {
-                return !pssh.systemId;
-              })) {
-                _this.warn(logMessage + " contains incomplete or invalid pssh data");
-              } else {
-                _this.log("ignoring " + logMessage + " for " + psshResults.map(function (pssh) {
-                  return keySystemIdToKeySystemDomain(pssh.systemId);
-                }).join(',') + " pssh data in favor of playlist keys");
-              }
-              return;
-            }
-            keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-            if (psshInfo.version === 0 && psshInfo.data) {
-              if (keySystemDomain === KeySystems.WIDEVINE) {
-                var offset = psshInfo.data.length - 22;
-                keyId = new Uint8Array(psshInfo.data.subarray(offset, offset + 16));
-              } else if (keySystemDomain === KeySystems.PLAYREADY) {
-                keyId = parsePlayReadyWRM(psshInfo.data);
-              }
-            }
-          }
-          if (!keySystemDomain || !keyId) {
-            return;
-          }
-          var keyIdHex = Hex.hexDump(keyId);
-          var _this2 = _this,
-            keyIdToKeySessionPromise = _this2.keyIdToKeySessionPromise,
-            mediaKeySessions = _this2.mediaKeySessions;
-          var keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-          var _loop = function _loop() {
-              // Match playlist key
-              var keyContext = mediaKeySessions[i];
-              var decryptdata = keyContext.decryptdata;
-              if (!decryptdata.keyId) {
-                return 0; // continue
-              }
-              var oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-              if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-                keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-                if (decryptdata.pssh) {
-                  return 1; // break
-                }
-                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');
-                });
-                keySessionContextPromise.catch(function (error) {
-                  return _this.handleError(error);
-                });
-                return 1; // break
-              }
-            },
-            _ret;
-          for (var i = 0; i < mediaKeySessions.length; i++) {
-            _ret = _loop();
-            if (_ret === 0) continue;
-            if (_ret === 1) break;
-          }
-          if (!keySessionContextPromise) {
-            if (keySystemDomain !== keySystem) {
-              _this.log("Ignoring \"" + event.type + "\" event with " + keySystemDomain + " init data for selected key-system " + keySystem);
-              return;
-            }
-            // "Clear-lead" (misc 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");
       };
@@ -22493,7 +22264,7 @@
       // @ts-ignore
       this.hls = this.config = this.keyIdToKeySessionPromise = null;
       // @ts-ignore
-      this.onMediaEncrypted = this.onWaitingForKey = null;
+      this.onWaitingForKey = null;
     };
     _proto.registerListeners = function registerListeners() {
       this.hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
@@ -22540,7 +22311,7 @@
       }
     };
     _proto.attemptKeySystemAccess = function attemptKeySystemAccess(keySystemsToAttempt) {
-      var _this3 = this;
+      var _this2 = this;
       var levels = this.hls.levels;
       var uniqueCodec = function uniqueCodec(value, i, a) {
         return !!value && a.indexOf(value) === i;
@@ -22557,7 +22328,7 @@
       return new Promise(function (resolve, reject) {
         var _attempt = function attempt(keySystems) {
           var keySystem = keySystems.shift();
-          _this3.getMediaKeysPromise(keySystem, audioCodecs, videoCodecs).then(function (mediaKeys) {
+          _this2.getMediaKeysPromise(keySystem, audioCodecs, videoCodecs).then(function (mediaKeys) {
             return resolve({
               keySystem: keySystem,
               mediaKeys: mediaKeys
@@ -22592,7 +22363,7 @@
       return requestMediaKeySystemAccessFunc(keySystem, supportedConfigurations);
     };
     _proto.getMediaKeysPromise = function getMediaKeysPromise(keySystem, audioCodecs, videoCodecs) {
-      var _this4 = 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];
@@ -22604,24 +22375,24 @@
           keySystemAccess: keySystemAccess
         };
         keySystemAccess.catch(function (error) {
-          _this4.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) {
-          _this4.log("Access for key-system \"" + mediaKeySystemAccess.keySystem + "\" obtained");
-          var certificateRequest = _this4.fetchServerCertificate(keySystem);
-          _this4.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) {
-            _this4.log("Media-keys created for \"" + keySystem + "\"");
+            _this3.log("Media-keys created for \"" + keySystem + "\"");
             _keySystemAccessPromises.hasMediaKeys = true;
             return certificateRequest.then(function (certificate) {
               if (certificate) {
-                return _this4.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
+                return _this3.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
               }
               return mediaKeys;
             });
           });
           _keySystemAccessPromises.mediaKeys.catch(function (error) {
-            _this4.error("Failed to create media-keys for \"" + keySystem + "\"}: " + error);
+            _this3.error("Failed to create media-keys for \"" + keySystem + "\"}: " + error);
           });
           return _keySystemAccessPromises.mediaKeys;
         });
@@ -22630,10 +22401,10 @@
         return keySystemAccessPromises.mediaKeys;
       });
     };
-    _proto.createMediaKeySessionContext = function createMediaKeySessionContext(_ref2) {
-      var decryptdata = _ref2.decryptdata,
-        keySystem = _ref2.keySystem,
-        mediaKeys = _ref2.mediaKeys;
+    _proto.createMediaKeySessionContext = function createMediaKeySessionContext(_ref) {
+      var decryptdata = _ref.decryptdata,
+        keySystem = _ref.keySystem,
+        mediaKeys = _ref.mediaKeys;
       this.log("Creating key-system session \"" + keySystem + "\" keyId: " + Hex.hexDump(decryptdata.keyId || []));
       var mediaKeysSession = mediaKeys.createSession();
       var mediaKeySessionContext = {
@@ -22674,35 +22445,35 @@
       return keySession.update(data);
     };
     _proto.getSelectedKeySystemFormats = function getSelectedKeySystemFormats() {
-      var _this5 = this;
+      var _this4 = this;
       return Object.keys(this.keySystemAccessPromises).map(function (keySystem) {
         return {
           keySystem: keySystem,
-          hasMediaKeys: _this5.keySystemAccessPromises[keySystem].hasMediaKeys
+          hasMediaKeys: _this4.keySystemAccessPromises[keySystem].hasMediaKeys
         };
-      }).filter(function (_ref3) {
-        var hasMediaKeys = _ref3.hasMediaKeys;
+      }).filter(function (_ref2) {
+        var hasMediaKeys = _ref2.hasMediaKeys;
         return !!hasMediaKeys;
-      }).map(function (_ref4) {
-        var keySystem = _ref4.keySystem;
+      }).map(function (_ref3) {
+        var keySystem = _ref3.keySystem;
         return keySystemDomainToKeySystemFormat(keySystem);
       }).filter(function (keySystem) {
         return !!keySystem;
       });
     };
     _proto.getKeySystemAccess = function getKeySystemAccess(keySystemsToAttempt) {
-      var _this6 = this;
-      return this.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref5) {
-        var keySystem = _ref5.keySystem,
-          mediaKeys = _ref5.mediaKeys;
-        return _this6.attemptSetMediaKeys(keySystem, mediaKeys);
+      var _this5 = this;
+      return this.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref4) {
+        var keySystem = _ref4.keySystem,
+          mediaKeys = _ref4.mediaKeys;
+        return _this5.attemptSetMediaKeys(keySystem, mediaKeys);
       });
     };
     _proto.selectKeySystem = function selectKeySystem(keySystemsToAttempt) {
-      var _this7 = this;
+      var _this6 = this;
       return new Promise(function (resolve, reject) {
-        return _this7.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref6) {
-          var keySystem = _ref6.keySystem;
+        return _this6.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref5) {
+          var keySystem = _ref5.keySystem;
           var keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
           if (keySystemFormat) {
             resolve(keySystemFormat);
@@ -22728,21 +22499,21 @@
       return this.selectKeySystem(keySystemsToAttempt);
     };
     _proto.loadKey = function loadKey(data) {
-      var _this8 = this;
+      var _this7 = 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 keyContextPromise = this.keyIdToKeySessionPromise[keyId];
       if (!keyContextPromise) {
-        keyContextPromise = this.getKeySystemForKeyPromise(decryptdata).then(function (_ref7) {
-          var keySystem = _ref7.keySystem,
-            mediaKeys = _ref7.mediaKeys;
-          _this8.throwIfDestroyed();
-          _this8.log("Handle encrypted media sn: " + data.frag.sn + " " + data.frag.type + ": " + data.frag.level + " using key " + keyDetails);
-          return _this8.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
-            _this8.throwIfDestroyed();
-            return _this8.createMediaKeySessionContext({
+        keyContextPromise = this.getKeySystemForKeyPromise(decryptdata).then(function (_ref6) {
+          var keySystem = _ref6.keySystem,
+            mediaKeys = _ref6.mediaKeys;
+          _this7.throwIfDestroyed();
+          _this7.log("Handle encrypted media sn: " + data.frag.sn + " " + data.frag.type + ": " + data.frag.level + " using key " + keyDetails);
+          return _this7.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
+            _this7.throwIfDestroyed();
+            return _this7.createMediaKeySessionContext({
               keySystem: keySystem,
               mediaKeys: mediaKeys,
               decryptdata: decryptdata
@@ -22752,10 +22523,10 @@
         var keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = keyContextPromise.then(function (keySessionContext) {
           var scheme = 'cenc';
           var initData = decryptdata.pssh ? decryptdata.pssh.buffer : null;
-          return _this8.generateRequestWithPreferredKeySession(keySessionContext, scheme, initData, 'playlist-key');
+          return _this7.generateRequestWithPreferredKeySession(keySessionContext, scheme, initData, 'playlist-key');
         });
         keySessionContextPromise.catch(function (error) {
-          return _this8.handleError(error);
+          return _this7.handleError(error);
         });
       }
       return keyContextPromise;
@@ -22807,7 +22578,7 @@
       return this.attemptKeySystemAccess(keySystemsToAttempt);
     };
     _proto.attemptSetMediaKeys = function attemptSetMediaKeys(keySystem, mediaKeys) {
-      var _this9 = this;
+      var _this8 = this;
       if (this.mediaKeys === mediaKeys) {
         return Promise.resolve();
       }
@@ -22816,18 +22587,18 @@
       // Only one setMediaKeys() can run at one time, and multiple setMediaKeys() operations
       // can be queued for execution for multiple key sessions.
       var setMediaKeysPromise = Promise.all(queue).then(function () {
-        if (!_this9.media) {
-          _this9.mediaKeys = null;
+        if (!_this8.media) {
+          _this8.mediaKeys = null;
           throw new Error('Attempted to set mediaKeys without media element attached');
         }
-        return _this9.media.setMediaKeys(mediaKeys);
+        return _this8.media.setMediaKeys(mediaKeys);
       });
       this.mediaKeys = mediaKeys;
       this.setMediaKeysQueue.push(setMediaKeysPromise);
       return setMediaKeysPromise.then(function () {
-        _this9.log("Media-keys set for \"" + keySystem + "\"");
+        _this8.log("Media-keys set for \"" + keySystem + "\"");
         queue.push(setMediaKeysPromise);
-        _this9.setMediaKeysQueue = _this9.setMediaKeysQueue.filter(function (p) {
+        _this8.setMediaKeysQueue = _this8.setMediaKeysQueue.filter(function (p) {
           return queue.indexOf(p) === -1;
         });
       });
@@ -22835,7 +22606,7 @@
     _proto.generateRequestWithPreferredKeySession = function generateRequestWithPreferredKeySession(context, initDataType, initData, reason) {
       var _this$config$drmSyste,
         _this$config$drmSyste2,
-        _this0 = this;
+        _this9 = this;
       var generateRequestFilter = (_this$config$drmSyste = this.config.drmSystems) == null ? void 0 : (_this$config$drmSyste2 = _this$config$drmSyste[context.keySystem]) == null ? void 0 : _this$config$drmSyste2.generateRequest;
       if (generateRequestFilter) {
         try {
@@ -22869,22 +22640,22 @@
         }
         var messageType = event.messageType,
           message = event.message;
-        _this0.log("\"" + messageType + "\" message event for session \"" + keySession.sessionId + "\" message size: " + message.byteLength);
+        _this9.log("\"" + messageType + "\" message event for session \"" + keySession.sessionId + "\" message size: " + message.byteLength);
         if (messageType === 'license-request' || messageType === 'license-renewal') {
-          _this0.renewLicense(context, message).catch(function (error) {
+          _this9.renewLicense(context, message).catch(function (error) {
             if (licenseStatus.eventNames().length) {
               licenseStatus.emit('error', error);
             } else {
-              _this0.handleError(error);
+              _this9.handleError(error);
             }
           });
         } else if (messageType === 'license-release') {
           if (context.keySystem === KeySystems.FAIRPLAY) {
-            _this0.updateKeySession(context, strToUtf8array('acknowledged'));
-            _this0.removeSession(context);
+            _this9.updateKeySession(context, strToUtf8array('acknowledged'));
+            _this9.removeSession(context);
           }
         } else {
-          _this0.warn("unhandled media key message type \"" + messageType + "\"");
+          _this9.warn("unhandled media key message type \"" + messageType + "\"");
         }
       };
       var onkeystatuseschange = context._onkeystatuseschange = function (event) {
@@ -22893,12 +22664,12 @@
           licenseStatus.emit('error', new Error('invalid state'));
           return;
         }
-        _this0.onKeyStatusChange(context);
+        _this9.onKeyStatusChange(context);
         var keyStatus = context.keyStatus;
         licenseStatus.emit('keyStatus', keyStatus);
         if (keyStatus === 'expired') {
-          _this0.warn(context.keySystem + " expired for key " + keyId);
-          _this0.renewKeySession(context);
+          _this9.warn(context.keySystem + " expired for key " + keyId);
+          _this9.renewKeySession(context);
         }
       };
       addEventListener(context.mediaKeysSession, 'message', onmessage);
@@ -22923,13 +22694,13 @@
           } else if (keyStatus === 'expired') {
             reject(new Error('key expired while generating request'));
           } else {
-            _this0.warn("unhandled key status change \"" + keyStatus + "\"");
+            _this9.warn("unhandled key status change \"" + keyStatus + "\"");
           }
         });
       });
       return context.mediaKeysSession.generateRequest(initDataType, initData).then(function () {
         var _context$mediaKeysSes;
-        _this0.log("Request generated for key-session \"" + ((_context$mediaKeysSes = context.mediaKeysSession) == null ? void 0 : _context$mediaKeysSes.sessionId) + "\" keyId: " + keyId);
+        _this9.log("Request generated for key-session \"" + ((_context$mediaKeysSes = context.mediaKeysSession) == null ? void 0 : _context$mediaKeysSes.sessionId) + "\" keyId: " + keyId);
       }).catch(function (error) {
         throw new EMEKeyError({
           type: ErrorTypes.KEY_SYSTEM_ERROR,
@@ -22941,7 +22712,7 @@
         return keyUsablePromise;
       }).catch(function (error) {
         licenseStatus.removeAllListeners();
-        _this0.removeSession(context);
+        _this9.removeSession(context);
         throw error;
       }).then(function () {
         licenseStatus.removeAllListeners();
@@ -22949,7 +22720,7 @@
       });
     };
     _proto.onKeyStatusChange = function onKeyStatusChange(mediaKeySessionContext) {
-      var _this1 = this;
+      var _this0 = this;
       mediaKeySessionContext.mediaKeysSession.keyStatuses.forEach(function (status, keyId) {
         // keyStatuses.forEach is not standard API so the callback value looks weird on xboxone
         // xboxone callback(keyId, status) so we need to exchange them
@@ -22958,7 +22729,7 @@
           keyId = status;
           status = temp;
         }
-        _this1.log("key status change \"" + status + "\" for keyStatuses keyId: " + Hex.hexDump('buffer' in keyId ? new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength) : new Uint8Array(keyId)) + " session keyId: " + Hex.hexDump(new Uint8Array(mediaKeySessionContext.decryptdata.keyId || [])) + " uri: " + mediaKeySessionContext.decryptdata.uri);
+        _this0.log("key status change \"" + status + "\" for keyStatuses keyId: " + Hex.hexDump('buffer' in keyId ? new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength) : new Uint8Array(keyId)) + " session keyId: " + Hex.hexDump(new Uint8Array(mediaKeySessionContext.decryptdata.keyId || [])) + " uri: " + mediaKeySessionContext.decryptdata.uri);
         mediaKeySessionContext.keyStatus = status;
       });
     };
@@ -23020,10 +22791,10 @@
       });
     };
     _proto.setMediaKeysServerCertificate = function setMediaKeysServerCertificate(mediaKeys, keySystem, cert) {
-      var _this10 = this;
+      var _this1 = this;
       return new Promise(function (resolve, reject) {
         mediaKeys.setServerCertificate(cert).then(function (success) {
-          _this10.log("setServerCertificate " + (success ? 'success' : 'not supported by CDM') + " (" + (cert == null ? void 0 : cert.byteLength) + ") on \"" + keySystem + "\"");
+          _this1.log("setServerCertificate " + (success ? 'success' : 'not supported by CDM') + " (" + (cert == null ? void 0 : cert.byteLength) + ") on \"" + keySystem + "\"");
           resolve(mediaKeys);
         }).catch(function (error) {
           reject(new EMEKeyError({
@@ -23036,9 +22807,9 @@
       });
     };
     _proto.renewLicense = function renewLicense(context, keyMessage) {
-      var _this11 = this;
+      var _this10 = this;
       return this.requestLicense(context, new Uint8Array(keyMessage)).then(function (data) {
-        return _this11.updateKeySession(context, new Uint8Array(data)).catch(function (error) {
+        return _this10.updateKeySession(context, new Uint8Array(data)).catch(function (error) {
           throw new EMEKeyError({
             type: ErrorTypes.KEY_SYSTEM_ERROR,
             details: ErrorDetails.KEY_SYSTEM_SESSION_UPDATE_FAILED,
@@ -23086,7 +22857,7 @@
       return strToUtf8array(atob(challengeText));
     };
     _proto.setupLicenseXHR = function setupLicenseXHR(xhr, url, keysListItem, licenseChallenge) {
-      var _this12 = this;
+      var _this11 = this;
       var licenseXhrSetup = this.config.licenseXhrSetup;
       if (!licenseXhrSetup) {
         xhr.open('POST', url, true);
@@ -23099,7 +22870,7 @@
         if (!keysListItem.decryptdata) {
           throw new Error('Key removed');
         }
-        return licenseXhrSetup.call(_this12.hls, xhr, url, keysListItem, licenseChallenge);
+        return licenseXhrSetup.call(_this11.hls, xhr, url, keysListItem, licenseChallenge);
       }).catch(function (error) {
         if (!keysListItem.decryptdata) {
           // Key session removed. Cancel license request.
@@ -23107,7 +22878,7 @@
         }
         // let's try to open before running setup
         xhr.open('POST', url, true);
-        return licenseXhrSetup.call(_this12.hls, xhr, url, keysListItem, licenseChallenge);
+        return licenseXhrSetup.call(_this11.hls, xhr, url, keysListItem, licenseChallenge);
       }).then(function (licenseXhrSetupResult) {
         // if licenseXhrSetup did not yet call open, let's do it now
         if (!xhr.readyState) {
@@ -23121,36 +22892,36 @@
       });
     };
     _proto.requestLicense = function requestLicense(keySessionContext, licenseChallenge) {
-      var _this13 = this;
+      var _this12 = this;
       var keyLoadPolicy = this.config.keyLoadPolicy.default;
       return new Promise(function (resolve, reject) {
-        var url = _this13.getLicenseServerUrlOrThrow(keySessionContext.keySystem);
-        _this13.log("Sending license request to URL: " + url);
+        var url = _this12.getLicenseServerUrlOrThrow(keySessionContext.keySystem);
+        _this12.log("Sending license request to URL: " + url);
         var xhr = new XMLHttpRequest();
         xhr.responseType = 'arraybuffer';
         xhr.onreadystatechange = function () {
-          if (!_this13.hls || !keySessionContext.mediaKeysSession) {
+          if (!_this12.hls || !keySessionContext.mediaKeysSession) {
             return reject(new Error('invalid state'));
           }
           if (xhr.readyState === 4) {
             if (xhr.status === 200) {
-              _this13._requestLicenseFailureCount = 0;
+              _this12._requestLicenseFailureCount = 0;
               var data = xhr.response;
-              _this13.log("License received " + (data instanceof ArrayBuffer ? data.byteLength : data));
-              var licenseResponseCallback = _this13.config.licenseResponseCallback;
+              _this12.log("License received " + (data instanceof ArrayBuffer ? data.byteLength : data));
+              var licenseResponseCallback = _this12.config.licenseResponseCallback;
               if (licenseResponseCallback) {
                 try {
-                  data = licenseResponseCallback.call(_this13.hls, xhr, url, keySessionContext);
+                  data = licenseResponseCallback.call(_this12.hls, xhr, url, keySessionContext);
                 } catch (error) {
-                  _this13.error(error);
+                  _this12.error(error);
                 }
               }
               resolve(data);
             } else {
               var retryConfig = keyLoadPolicy.errorRetry;
               var maxNumRetry = retryConfig ? retryConfig.maxNumRetry : 0;
-              _this13._requestLicenseFailureCount++;
-              if (_this13._requestLicenseFailureCount > maxNumRetry || xhr.status >= 400 && xhr.status < 500) {
+              _this12._requestLicenseFailureCount++;
+              if (_this12._requestLicenseFailureCount > maxNumRetry || xhr.status >= 400 && xhr.status < 500) {
                 reject(new EMEKeyError({
                   type: ErrorTypes.KEY_SYSTEM_ERROR,
                   details: ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED,
@@ -23164,9 +22935,9 @@
                   }
                 }, "License Request XHR failed (" + url + "). Status: " + xhr.status + " (" + xhr.statusText + ")"));
               } else {
-                var attemptsLeft = maxNumRetry - _this13._requestLicenseFailureCount + 1;
-                _this13.warn("Retrying license request, " + attemptsLeft + " attempts left");
-                _this13.requestLicense(keySessionContext, licenseChallenge).then(resolve, reject);
+                var attemptsLeft = maxNumRetry - _this12._requestLicenseFailureCount + 1;
+                _this12.warn("Retrying license request, " + attemptsLeft + " attempts left");
+                _this12.requestLicense(keySessionContext, licenseChallenge).then(resolve, reject);
               }
             }
           }
@@ -23175,11 +22946,11 @@
           keySessionContext.licenseXhr.abort();
         }
         keySessionContext.licenseXhr = xhr;
-        _this13.setupLicenseXHR(xhr, url, keySessionContext, licenseChallenge).then(function (_ref8) {
-          var xhr = _ref8.xhr,
-            licenseChallenge = _ref8.licenseChallenge;
+        _this12.setupLicenseXHR(xhr, url, keySessionContext, licenseChallenge).then(function (_ref7) {
+          var xhr = _ref7.xhr,
+            licenseChallenge = _ref7.licenseChallenge;
           if (keySessionContext.keySystem == KeySystems.PLAYREADY) {
-            licenseChallenge = _this13.unpackPlayReadyKeyMessage(xhr, licenseChallenge);
+            licenseChallenge = _this12.unpackPlayReadyKeyMessage(xhr, licenseChallenge);
           }
           xhr.send(licenseChallenge);
         });
@@ -23197,20 +22968,18 @@
 
       // keep reference of media
       this.media = media;
-      addEventListener(media, 'encrypted', this.onMediaEncrypted);
       addEventListener(media, 'waitingforkey', this.onWaitingForKey);
     };
     _proto.onMediaDetached = function onMediaDetached() {
       var media = this.media;
       if (media) {
-        removeEventListener(media, 'encrypted', this.onMediaEncrypted);
         removeEventListener(media, 'waitingforkey', this.onWaitingForKey);
         this.media = null;
         this.mediaKeys = null;
       }
     };
     _proto._clear = function _clear() {
-      var _this14 = this,
+      var _this13 = this,
         _media$setMediaKeys;
       this._requestLicenseFailureCount = 0;
       this.keyIdToKeySessionPromise = {};
@@ -23226,20 +22995,20 @@
       // Close all sessions and remove media keys from the video element.
       var keySessionCount = mediaKeysList.length;
       EMEController.CDMCleanupPromise = Promise.all(mediaKeysList.map(function (mediaKeySessionContext) {
-        return _this14.removeSession(mediaKeySessionContext);
+        return _this13.removeSession(mediaKeySessionContext);
       }).concat(media == null ? void 0 : (_media$setMediaKeys = media.setMediaKeys(null)) == null ? void 0 : _media$setMediaKeys.catch(function (error) {
-        var _this14$hls;
-        _this14.log("Could not clear media keys: " + error);
-        (_this14$hls = _this14.hls) == null ? void 0 : _this14$hls.trigger(Events.ERROR, {
+        var _this13$hls;
+        _this13.log("Could not clear media keys: " + error);
+        (_this13$hls = _this13.hls) == null ? void 0 : _this13$hls.trigger(Events.ERROR, {
           type: ErrorTypes.OTHER_ERROR,
           details: ErrorDetails.KEY_SYSTEM_DESTROY_MEDIA_KEYS_ERROR,
           fatal: false,
           error: new Error("Could not clear media keys: " + error)
         });
       }))).catch(function (error) {
-        var _this14$hls2;
-        _this14.log("Could not close sessions and clear media keys: " + error);
-        (_this14$hls2 = _this14.hls) == null ? void 0 : _this14$hls2.trigger(Events.ERROR, {
+        var _this13$hls2;
+        _this13.log("Could not close sessions and clear media keys: " + error);
+        (_this13$hls2 = _this13.hls) == null ? void 0 : _this13$hls2.trigger(Events.ERROR, {
           type: ErrorTypes.OTHER_ERROR,
           details: ErrorDetails.KEY_SYSTEM_DESTROY_CLOSE_SESSION_ERROR,
           fatal: false,
@@ -23247,15 +23016,15 @@
         });
       }).then(function () {
         if (keySessionCount) {
-          _this14.log('finished closing key sessions and clearing media keys');
+          _this13.log('finished closing key sessions and clearing media keys');
         }
       });
     };
     _proto.onManifestLoading = function onManifestLoading() {
       this.keyFormatPromise = null;
     };
-    _proto.onManifestLoaded = function onManifestLoaded(event, _ref9) {
-      var sessionKeys = _ref9.sessionKeys;
+    _proto.onManifestLoaded = function onManifestLoaded(event, _ref8) {
+      var sessionKeys = _ref8.sessionKeys;
       if (!sessionKeys || !this.config.emeEnabled) {
         return;
       }
@@ -23271,7 +23040,7 @@
       }
     };
     _proto.removeSession = function removeSession(mediaKeySessionContext) {
-      var _this15 = this;
+      var _this14 = this;
       var mediaKeysSession = mediaKeySessionContext.mediaKeysSession,
         licenseXhr = mediaKeySessionContext.licenseXhr;
       if (mediaKeysSession) {
@@ -23300,9 +23069,9 @@
           mediaKeysSession.remove().then(resolve);
         }) : Promise.resolve();
         return removePromise.catch(function (error) {
-          var _this15$hls;
-          _this15.log("Could not remove session: " + error);
-          (_this15$hls = _this15.hls) == null ? void 0 : _this15$hls.trigger(Events.ERROR, {
+          var _this14$hls;
+          _this14.log("Could not remove session: " + error);
+          (_this14$hls = _this14.hls) == null ? void 0 : _this14$hls.trigger(Events.ERROR, {
             type: ErrorTypes.OTHER_ERROR,
             details: ErrorDetails.KEY_SYSTEM_DESTROY_REMOVE_SESSION_ERROR,
             fatal: false,
@@ -23311,9 +23080,9 @@
         }).then(function () {
           return mediaKeysSession.close();
         }).catch(function (error) {
-          var _this15$hls2;
-          _this15.log("Could not close session: " + error);
-          (_this15$hls2 = _this15.hls) == null ? void 0 : _this15$hls2.trigger(Events.ERROR, {
+          var _this14$hls2;
+          _this14.log("Could not close session: " + error);
+          (_this14$hls2 = _this14.hls) == null ? void 0 : _this14$hls2.trigger(Events.ERROR, {
             type: ErrorTypes.OTHER_ERROR,
             details: ErrorDetails.KEY_SYSTEM_DESTROY_CLOSE_SESSION_ERROR,
             fatal: false,
@@ -23327,13 +23096,13 @@
   EMEController.CDMCleanupPromise = void 0;
   var EMEKeyError = /*#__PURE__*/function (_Error) {
     function EMEKeyError(data, message) {
-      var _this16;
-      _this16 = _Error.call(this, message) || this;
-      _this16.data = void 0;
+      var _this15;
+      _this15 = _Error.call(this, message) || this;
+      _this15.data = void 0;
       data.error || (data.error = new Error(message));
-      _this16.data = data;
+      _this15.data = data;
       data.err = data.error;
-      return _this16;
+      return _this15;
     }
     _inheritsLoose(EMEKeyError, _Error);
     return EMEKeyError;
@@ -32184,9 +31953,6 @@
     }
     return Number.POSITIVE_INFINITY;
   }();
-  function hexToArrayBuffer(str) {
-    return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
-  }
   var ID3TrackController = /*#__PURE__*/function () {
     function ID3TrackController(hls) {
       var _this = this;
@@ -34756,7 +34522,8 @@
             _ret = _loop();
             if (_ret) return _ret.v;
           }
-        } else if (this.config.requireKeySystemAccessOnStart) {
+        }
+        if (this.config.requireKeySystemAccessOnStart) {
           var keySystemsInConfig = getKeySystemsForConfig(this.config);
           if (keySystemsInConfig.length) {
             return this.emeController.getKeySystemAccess(keySystemsInConfig);