hls.js 1.6.3-0.canary.11253 → 1.6.3-0.canary.11255

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.3-0.canary.11253");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11255");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -4695,7 +4695,6 @@
     if (PDTValue >= (endPDT || 0)) {
       return null;
     }
-    maxFragLookUpTolerance = maxFragLookUpTolerance || 0;
     for (var seg = 0; seg < fragments.length; ++seg) {
       var frag = fragments[seg];
       if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) {
@@ -4821,38 +4820,32 @@
     var endProgramDateTime = candidate.endProgramDateTime || 0;
     return endProgramDateTime - candidateLookupTolerance > pdtBufferEnd;
   }
-  function findFragWithCC(fragments, cc) {
-    return BinarySearch.search(fragments, function (candidate) {
-      if (candidate.cc < cc) {
-        return 1;
-      } else if (candidate.cc > cc) {
-        return -1;
-      } else {
-        return 0;
-      }
-    });
-  }
-  function findNearestWithCC(details, cc, fragment) {
+  function findNearestWithCC(details, cc, pos) {
     if (details) {
       if (details.startCC <= cc && details.endCC >= cc) {
-        var start = fragment.start;
-        var end = fragment.end;
         var fragments = details.fragments;
-        if (!fragment.relurl) {
-          var fragmentHint = details.fragmentHint;
-          if (fragmentHint) {
-            fragments = fragments.concat(fragmentHint);
-          }
+        var fragmentHint = details.fragmentHint;
+        if (fragmentHint) {
+          fragments = fragments.concat(fragmentHint);
         }
-        return BinarySearch.search(fragments, function (candidate) {
-          if (candidate.cc < cc || candidate.end <= start) {
+        var closest;
+        BinarySearch.search(fragments, function (candidate) {
+          if (candidate.cc < cc) {
             return 1;
-          } else if (candidate.cc > cc || candidate.start >= end) {
+          }
+          if (candidate.cc > cc) {
             return -1;
-          } else {
-            return 0;
           }
+          closest = candidate;
+          if (candidate.end <= pos) {
+            return 1;
+          }
+          if (candidate.start > pos) {
+            return -1;
+          }
+          return 0;
         });
+        return closest || null;
       }
     }
     return null;
@@ -9612,8 +9605,11 @@
         if (this.fragCurrent === null) {
           keyLoadingPromise = Promise.reject(new Error("frag load aborted, context changed in KEY_LOADING"));
         }
-      } else if (!frag.encrypted && details.encryptedFragments.length) {
-        this.keyLoader.loadClear(frag, details.encryptedFragments);
+      } else if (!frag.encrypted) {
+        keyLoadingPromise = this.keyLoader.loadClear(frag, details.encryptedFragments);
+        if (keyLoadingPromise) {
+          this.log("[eme] blocking frag load until media-keys acquired");
+        }
       }
       var fragPrevious = this.fragPrevious;
       if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
@@ -9969,7 +9965,7 @@
             this.log("LL-Part loading ON for initial live fragment");
             this.loadingParts = true;
           }
-          frag = this.getInitialLiveFragment(levelDetails, fragments);
+          frag = this.getInitialLiveFragment(levelDetails);
           var mainStart = this.hls.startPosition;
           var liveSyncPosition = this.hls.liveSyncPosition;
           var startPosition = frag ? (mainStart !== -1 && mainStart >= start ? mainStart : liveSyncPosition) || frag.start : pos;
@@ -10099,7 +10095,8 @@
      "sliding" of the playlist, which is its offset from the start of playback. After sliding we can compute the real
      start and end times for each fragment in the playlist (after which this method will not need to be called).
     */;
-    _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails, fragments) {
+    _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails) {
+      var fragments = levelDetails.fragments;
       var fragPrevious = this.fragPrevious;
       var frag = null;
       if (fragPrevious) {
@@ -10122,7 +10119,7 @@
           // It's important to stay within the continuity range if available; otherwise the fragments in the playlist
           // will have the wrong start times
           if (!frag) {
-            frag = findFragWithCC(fragments, fragPrevious.cc);
+            frag = findNearestWithCC(levelDetails, fragPrevious.cc, fragPrevious.end);
             if (frag) {
               this.log("Live playlist, switching playlist, load frag with same CC: " + frag.sn);
             }
@@ -16677,7 +16674,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11253";
+  var version = "1.6.3-0.canary.11255";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -17133,23 +17130,46 @@
         if (this.state === State.WAITING_INIT_PTS) {
           var waitingData = this.waitingData;
           if (!waitingData && !this.loadingParts || waitingData && waitingData.frag.cc !== cc) {
-            this.nextLoadPosition = this.findSyncFrag(frag).start;
+            this.syncWithAnchor(frag, waitingData == null ? void 0 : waitingData.frag);
           }
-          this.tick();
         } else if (!this.hls.hasEnoughToStart && inFlightFrag && inFlightFrag.cc !== cc) {
-          this.startFragRequested = false;
-          this.nextLoadPosition = this.findSyncFrag(frag).start;
           inFlightFrag.abortRequests();
-          this.resetLoadingState();
+          this.syncWithAnchor(frag, inFlightFrag);
         } else if (this.state === State.IDLE) {
           this.tick();
         }
       }
     };
-    _proto.findSyncFrag = function findSyncFrag(mainFrag) {
+    _proto.getLoadPosition = function getLoadPosition() {
+      if (!this.startFragRequested && this.nextLoadPosition >= 0) {
+        return this.nextLoadPosition;
+      }
+      return _BaseStreamController.prototype.getLoadPosition.call(this);
+    };
+    _proto.syncWithAnchor = function syncWithAnchor(mainAnchor, waitingToAppend) {
+      var _this$mainFragLoading;
+      // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
+      var mainFragLoading = ((_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag) || null;
+      if (waitingToAppend) {
+        if ((mainFragLoading == null ? void 0 : mainFragLoading.cc) === waitingToAppend.cc) {
+          // Wait for loading frag to complete and INIT_PTS_FOUND
+          return;
+        }
+      }
+      var targetDiscontinuity = (mainFragLoading || mainAnchor).cc;
       var trackDetails = this.getLevelDetails();
-      var cc = mainFrag.cc;
-      return findNearestWithCC(trackDetails, cc, mainFrag) || trackDetails && findFragWithCC(trackDetails.fragments, cc) || mainFrag;
+      var pos = this.getLoadPosition();
+      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.startFragRequested = false;
+        this.nextLoadPosition = syncFrag.start;
+        this.resetLoadingState();
+        if (this.state === State.IDLE) {
+          this.doTickIdle();
+        }
+      }
     };
     _proto.startLoad = function startLoad(startPosition, skipSeekToStartPosition) {
       if (!this.levels) {
@@ -17230,10 +17250,7 @@
                   _BaseStreamController.prototype._handleFragmentLoadComplete.call(this, data);
                 }
               } else if (mainAnchor && mainAnchor.cc !== waitingData.frag.cc) {
-                // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
-                this.log("Waiting fragment cc (" + frag.cc + ") cancelled because video is at cc " + mainAnchor.cc);
-                this.nextLoadPosition = this.findSyncFrag(mainAnchor).start;
-                this.clearWaitingFragment();
+                this.syncWithAnchor(mainAnchor, waitingData.frag);
               }
             } else {
               this.state = State.IDLE;
@@ -17242,22 +17259,12 @@
       }
       this.onTickEnd();
     };
-    _proto.clearWaitingFragment = function clearWaitingFragment() {
+    _proto.resetLoadingState = function resetLoadingState() {
       var waitingData = this.waitingData;
       if (waitingData) {
-        if (!this.hls.hasEnoughToStart) {
-          // Load overlapping fragment on start when discontinuity start times are not aligned
-          this.startFragRequested = false;
-        }
         this.fragmentTracker.removeFragment(waitingData.frag);
         this.waitingData = null;
-        if (this.state !== State.STOPPED) {
-          this.state = State.IDLE;
-        }
       }
-    };
-    _proto.resetLoadingState = function resetLoadingState() {
-      this.clearWaitingFragment();
       _BaseStreamController.prototype.resetLoadingState.call(this);
     };
     _proto.onTickEnd = function onTickEnd() {
@@ -17269,7 +17276,7 @@
       this.lastCurrentTime = media.currentTime;
     };
     _proto.doTickIdle = function doTickIdle() {
-      var _this$mainFragLoading;
+      var _this$mainFragLoading2;
       var hls = this.hls,
         levels = this.levels,
         media = this.media,
@@ -17341,7 +17348,7 @@
       }
 
       // Request audio segments up to one fragment ahead of main stream-controller
-      var mainFragLoading = ((_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag) || null;
+      var mainFragLoading = ((_this$mainFragLoading2 = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading2.frag) || null;
       if (!this.audioOnly && this.startFragRequested && mainFragLoading && isMediaFragment(frag) && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
         if (this.fragmentTracker.getState(mainFragLoading) === FragmentState.OK) {
           this.mainFragLoading = mainFragLoading = null;
@@ -22534,6 +22541,7 @@
           _this4.log("Create media-keys for \"" + keySystem + "\"");
           _keySystemAccessPromises.mediaKeys = mediaKeySystemAccess.createMediaKeys().then(function (mediaKeys) {
             _this4.log("Media-keys created for \"" + keySystem + "\"");
+            _keySystemAccessPromises.hasMediaKeys = true;
             return certificateRequest.then(function (certificate) {
               if (certificate) {
                 return _this4.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
@@ -22594,23 +22602,36 @@
       this.log("Updating key-session \"" + keySession.sessionId + "\" for keyID " + Hex.hexDump(((_mediaKeySessionConte = mediaKeySessionContext.decryptdata) == null ? void 0 : _mediaKeySessionConte.keyId) || []) + "\n      } (data length: " + (data ? data.byteLength : data) + ")");
       return keySession.update(data);
     };
-    _proto.selectKeySystemFormat = function selectKeySystemFormat(frag) {
-      var keyFormats = Object.keys(frag.levelkeys || {});
-      if (!this.keyFormatPromise) {
-        this.log("Selecting key-system from fragment (sn: " + frag.sn + " " + frag.type + ": " + frag.level + ") key formats " + keyFormats.join(', '));
-        this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
-      }
-      return this.keyFormatPromise;
-    };
-    _proto.getKeyFormatPromise = function getKeyFormatPromise(keyFormats) {
+    _proto.getSelectedKeySystemFormats = function getSelectedKeySystemFormats() {
       var _this5 = this;
+      return Object.keys(this.keySystemAccessPromises).map(function (keySystem) {
+        return {
+          keySystem: keySystem,
+          hasMediaKeys: _this5.keySystemAccessPromises[keySystem].hasMediaKeys
+        };
+      }).filter(function (_ref3) {
+        var hasMediaKeys = _ref3.hasMediaKeys;
+        return !!hasMediaKeys;
+      }).map(function (_ref4) {
+        var keySystem = _ref4.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);
+      });
+    };
+    _proto.selectKeySystem = function selectKeySystem(keySystemsToAttempt) {
+      var _this7 = this;
       return new Promise(function (resolve, reject) {
-        var keySystemsInConfig = getKeySystemsForConfig(_this5.config);
-        var keySystemsToAttempt = keyFormats.map(keySystemFormatToKeySystemDomain).filter(function (value) {
-          return !!value && keySystemsInConfig.indexOf(value) !== -1;
-        });
-        return _this5.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref3) {
-          var keySystem = _ref3.keySystem;
+        return _this7.getKeySystemSelectionPromise(keySystemsToAttempt).then(function (_ref6) {
+          var keySystem = _ref6.keySystem;
           var keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
           if (keySystemFormat) {
             resolve(keySystemFormat);
@@ -22620,22 +22641,37 @@
         }).catch(reject);
       });
     };
+    _proto.selectKeySystemFormat = function selectKeySystemFormat(frag) {
+      var keyFormats = Object.keys(frag.levelkeys || {});
+      if (!this.keyFormatPromise) {
+        this.log("Selecting key-system from fragment (sn: " + frag.sn + " " + frag.type + ": " + frag.level + ") key formats " + keyFormats.join(', '));
+        this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
+      }
+      return this.keyFormatPromise;
+    };
+    _proto.getKeyFormatPromise = function getKeyFormatPromise(keyFormats) {
+      var keySystemsInConfig = getKeySystemsForConfig(this.config);
+      var keySystemsToAttempt = keyFormats.map(keySystemFormatToKeySystemDomain).filter(function (value) {
+        return !!value && keySystemsInConfig.indexOf(value) !== -1;
+      });
+      return this.selectKeySystem(keySystemsToAttempt);
+    };
     _proto.loadKey = function loadKey(data) {
-      var _this6 = this;
+      var _this8 = 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 (_ref4) {
-          var keySystem = _ref4.keySystem,
-            mediaKeys = _ref4.mediaKeys;
-          _this6.throwIfDestroyed();
-          _this6.log("Handle encrypted media sn: " + data.frag.sn + " " + data.frag.type + ": " + data.frag.level + " using key " + keyDetails);
-          return _this6.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
-            _this6.throwIfDestroyed();
-            return _this6.createMediaKeySessionContext({
+        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({
               keySystem: keySystem,
               mediaKeys: mediaKeys,
               decryptdata: decryptdata
@@ -22645,10 +22681,10 @@
         var keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = keyContextPromise.then(function (keySessionContext) {
           var scheme = 'cenc';
           var initData = decryptdata.pssh ? decryptdata.pssh.buffer : null;
-          return _this6.generateRequestWithPreferredKeySession(keySessionContext, scheme, initData, 'playlist-key');
+          return _this8.generateRequestWithPreferredKeySession(keySessionContext, scheme, initData, 'playlist-key');
         });
         keySessionContextPromise.catch(function (error) {
-          return _this6.handleError(error);
+          return _this8.handleError(error);
         });
       }
       return keyContextPromise;
@@ -22700,22 +22736,22 @@
       return this.attemptKeySystemAccess(keySystemsToAttempt);
     };
     _proto.attemptSetMediaKeys = function attemptSetMediaKeys(keySystem, mediaKeys) {
-      var _this7 = this;
+      var _this9 = this;
       var queue = this.setMediaKeysQueue.slice();
       this.log("Setting media-keys for \"" + keySystem + "\"");
       // 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 (!_this7.media) {
+        if (!_this9.media) {
           throw new Error('Attempted to set mediaKeys without media element attached');
         }
-        return _this7.media.setMediaKeys(mediaKeys);
+        return _this9.media.setMediaKeys(mediaKeys);
       });
       this.setMediaKeysQueue.push(setMediaKeysPromise);
       return setMediaKeysPromise.then(function () {
-        _this7.log("Media-keys set for \"" + keySystem + "\"");
+        _this9.log("Media-keys set for \"" + keySystem + "\"");
         queue.push(setMediaKeysPromise);
-        _this7.setMediaKeysQueue = _this7.setMediaKeysQueue.filter(function (p) {
+        _this9.setMediaKeysQueue = _this9.setMediaKeysQueue.filter(function (p) {
           return queue.indexOf(p) === -1;
         });
       });
@@ -22723,7 +22759,7 @@
     _proto.generateRequestWithPreferredKeySession = function generateRequestWithPreferredKeySession(context, initDataType, initData, reason) {
       var _this$config$drmSyste,
         _this$config$drmSyste2,
-        _this8 = this;
+        _this0 = 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 {
@@ -22757,22 +22793,22 @@
         }
         var messageType = event.messageType,
           message = event.message;
-        _this8.log("\"" + messageType + "\" message event for session \"" + keySession.sessionId + "\" message size: " + message.byteLength);
+        _this0.log("\"" + messageType + "\" message event for session \"" + keySession.sessionId + "\" message size: " + message.byteLength);
         if (messageType === 'license-request' || messageType === 'license-renewal') {
-          _this8.renewLicense(context, message).catch(function (error) {
+          _this0.renewLicense(context, message).catch(function (error) {
             if (licenseStatus.eventNames().length) {
               licenseStatus.emit('error', error);
             } else {
-              _this8.handleError(error);
+              _this0.handleError(error);
             }
           });
         } else if (messageType === 'license-release') {
           if (context.keySystem === KeySystems.FAIRPLAY) {
-            _this8.updateKeySession(context, strToUtf8array('acknowledged'));
-            _this8.removeSession(context);
+            _this0.updateKeySession(context, strToUtf8array('acknowledged'));
+            _this0.removeSession(context);
           }
         } else {
-          _this8.warn("unhandled media key message type \"" + messageType + "\"");
+          _this0.warn("unhandled media key message type \"" + messageType + "\"");
         }
       };
       var onkeystatuseschange = context._onkeystatuseschange = function (event) {
@@ -22781,12 +22817,12 @@
           licenseStatus.emit('error', new Error('invalid state'));
           return;
         }
-        _this8.onKeyStatusChange(context);
+        _this0.onKeyStatusChange(context);
         var keyStatus = context.keyStatus;
         licenseStatus.emit('keyStatus', keyStatus);
         if (keyStatus === 'expired') {
-          _this8.warn(context.keySystem + " expired for key " + keyId);
-          _this8.renewKeySession(context);
+          _this0.warn(context.keySystem + " expired for key " + keyId);
+          _this0.renewKeySession(context);
         }
       };
       context.mediaKeysSession.addEventListener('message', onmessage);
@@ -22811,13 +22847,13 @@
           } else if (keyStatus === 'expired') {
             reject(new Error('key expired while generating request'));
           } else {
-            _this8.warn("unhandled key status change \"" + keyStatus + "\"");
+            _this0.warn("unhandled key status change \"" + keyStatus + "\"");
           }
         });
       });
       return context.mediaKeysSession.generateRequest(initDataType, initData).then(function () {
         var _context$mediaKeysSes;
-        _this8.log("Request generated for key-session \"" + ((_context$mediaKeysSes = context.mediaKeysSession) == null ? void 0 : _context$mediaKeysSes.sessionId) + "\" keyId: " + keyId);
+        _this0.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,
@@ -22829,7 +22865,7 @@
         return keyUsablePromise;
       }).catch(function (error) {
         licenseStatus.removeAllListeners();
-        _this8.removeSession(context);
+        _this0.removeSession(context);
         throw error;
       }).then(function () {
         licenseStatus.removeAllListeners();
@@ -22837,7 +22873,7 @@
       });
     };
     _proto.onKeyStatusChange = function onKeyStatusChange(mediaKeySessionContext) {
-      var _this9 = this;
+      var _this1 = 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
@@ -22846,7 +22882,7 @@
           keyId = status;
           status = temp;
         }
-        _this9.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);
+        _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);
         mediaKeySessionContext.keyStatus = status;
       });
     };
@@ -22908,10 +22944,10 @@
       });
     };
     _proto.setMediaKeysServerCertificate = function setMediaKeysServerCertificate(mediaKeys, keySystem, cert) {
-      var _this0 = this;
+      var _this10 = this;
       return new Promise(function (resolve, reject) {
         mediaKeys.setServerCertificate(cert).then(function (success) {
-          _this0.log("setServerCertificate " + (success ? 'success' : 'not supported by CDM') + " (" + (cert == null ? void 0 : cert.byteLength) + ") on \"" + keySystem + "\"");
+          _this10.log("setServerCertificate " + (success ? 'success' : 'not supported by CDM') + " (" + (cert == null ? void 0 : cert.byteLength) + ") on \"" + keySystem + "\"");
           resolve(mediaKeys);
         }).catch(function (error) {
           reject(new EMEKeyError({
@@ -22924,9 +22960,9 @@
       });
     };
     _proto.renewLicense = function renewLicense(context, keyMessage) {
-      var _this1 = this;
+      var _this11 = this;
       return this.requestLicense(context, new Uint8Array(keyMessage)).then(function (data) {
-        return _this1.updateKeySession(context, new Uint8Array(data)).catch(function (error) {
+        return _this11.updateKeySession(context, new Uint8Array(data)).catch(function (error) {
           throw new EMEKeyError({
             type: ErrorTypes.KEY_SYSTEM_ERROR,
             details: ErrorDetails.KEY_SYSTEM_SESSION_UPDATE_FAILED,
@@ -22974,7 +23010,7 @@
       return strToUtf8array(atob(challengeText));
     };
     _proto.setupLicenseXHR = function setupLicenseXHR(xhr, url, keysListItem, licenseChallenge) {
-      var _this10 = this;
+      var _this12 = this;
       var licenseXhrSetup = this.config.licenseXhrSetup;
       if (!licenseXhrSetup) {
         xhr.open('POST', url, true);
@@ -22987,7 +23023,7 @@
         if (!keysListItem.decryptdata) {
           throw new Error('Key removed');
         }
-        return licenseXhrSetup.call(_this10.hls, xhr, url, keysListItem, licenseChallenge);
+        return licenseXhrSetup.call(_this12.hls, xhr, url, keysListItem, licenseChallenge);
       }).catch(function (error) {
         if (!keysListItem.decryptdata) {
           // Key session removed. Cancel license request.
@@ -22995,7 +23031,7 @@
         }
         // let's try to open before running setup
         xhr.open('POST', url, true);
-        return licenseXhrSetup.call(_this10.hls, xhr, url, keysListItem, licenseChallenge);
+        return licenseXhrSetup.call(_this12.hls, xhr, url, keysListItem, licenseChallenge);
       }).then(function (licenseXhrSetupResult) {
         // if licenseXhrSetup did not yet call open, let's do it now
         if (!xhr.readyState) {
@@ -23009,36 +23045,36 @@
       });
     };
     _proto.requestLicense = function requestLicense(keySessionContext, licenseChallenge) {
-      var _this11 = this;
+      var _this13 = this;
       var keyLoadPolicy = this.config.keyLoadPolicy.default;
       return new Promise(function (resolve, reject) {
-        var url = _this11.getLicenseServerUrlOrThrow(keySessionContext.keySystem);
-        _this11.log("Sending license request to URL: " + url);
+        var url = _this13.getLicenseServerUrlOrThrow(keySessionContext.keySystem);
+        _this13.log("Sending license request to URL: " + url);
         var xhr = new XMLHttpRequest();
         xhr.responseType = 'arraybuffer';
         xhr.onreadystatechange = function () {
-          if (!_this11.hls || !keySessionContext.mediaKeysSession) {
+          if (!_this13.hls || !keySessionContext.mediaKeysSession) {
             return reject(new Error('invalid state'));
           }
           if (xhr.readyState === 4) {
             if (xhr.status === 200) {
-              _this11._requestLicenseFailureCount = 0;
+              _this13._requestLicenseFailureCount = 0;
               var data = xhr.response;
-              _this11.log("License received " + (data instanceof ArrayBuffer ? data.byteLength : data));
-              var licenseResponseCallback = _this11.config.licenseResponseCallback;
+              _this13.log("License received " + (data instanceof ArrayBuffer ? data.byteLength : data));
+              var licenseResponseCallback = _this13.config.licenseResponseCallback;
               if (licenseResponseCallback) {
                 try {
-                  data = licenseResponseCallback.call(_this11.hls, xhr, url, keySessionContext);
+                  data = licenseResponseCallback.call(_this13.hls, xhr, url, keySessionContext);
                 } catch (error) {
-                  _this11.error(error);
+                  _this13.error(error);
                 }
               }
               resolve(data);
             } else {
               var retryConfig = keyLoadPolicy.errorRetry;
               var maxNumRetry = retryConfig ? retryConfig.maxNumRetry : 0;
-              _this11._requestLicenseFailureCount++;
-              if (_this11._requestLicenseFailureCount > maxNumRetry || xhr.status >= 400 && xhr.status < 500) {
+              _this13._requestLicenseFailureCount++;
+              if (_this13._requestLicenseFailureCount > maxNumRetry || xhr.status >= 400 && xhr.status < 500) {
                 reject(new EMEKeyError({
                   type: ErrorTypes.KEY_SYSTEM_ERROR,
                   details: ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED,
@@ -23052,9 +23088,9 @@
                   }
                 }, "License Request XHR failed (" + url + "). Status: " + xhr.status + " (" + xhr.statusText + ")"));
               } else {
-                var attemptsLeft = maxNumRetry - _this11._requestLicenseFailureCount + 1;
-                _this11.warn("Retrying license request, " + attemptsLeft + " attempts left");
-                _this11.requestLicense(keySessionContext, licenseChallenge).then(resolve, reject);
+                var attemptsLeft = maxNumRetry - _this13._requestLicenseFailureCount + 1;
+                _this13.warn("Retrying license request, " + attemptsLeft + " attempts left");
+                _this13.requestLicense(keySessionContext, licenseChallenge).then(resolve, reject);
               }
             }
           }
@@ -23063,11 +23099,11 @@
           keySessionContext.licenseXhr.abort();
         }
         keySessionContext.licenseXhr = xhr;
-        _this11.setupLicenseXHR(xhr, url, keySessionContext, licenseChallenge).then(function (_ref5) {
-          var xhr = _ref5.xhr,
-            licenseChallenge = _ref5.licenseChallenge;
+        _this13.setupLicenseXHR(xhr, url, keySessionContext, licenseChallenge).then(function (_ref8) {
+          var xhr = _ref8.xhr,
+            licenseChallenge = _ref8.licenseChallenge;
           if (keySessionContext.keySystem == KeySystems.PLAYREADY) {
-            licenseChallenge = _this11.unpackPlayReadyKeyMessage(xhr, licenseChallenge);
+            licenseChallenge = _this13.unpackPlayReadyKeyMessage(xhr, licenseChallenge);
           }
           xhr.send(licenseChallenge);
         });
@@ -23095,7 +23131,7 @@
       }
     };
     _proto._clear = function _clear(media) {
-      var _this12 = this,
+      var _this14 = this,
         _media$setMediaKeys;
       var mediaKeysList = this.mediaKeySessions;
       this._requestLicenseFailureCount = 0;
@@ -23107,11 +23143,11 @@
       // Close all sessions and remove media keys from the video element.
       var keySessionCount = mediaKeysList.length;
       EMEController.CDMCleanupPromise = Promise.all(mediaKeysList.map(function (mediaKeySessionContext) {
-        return _this12.removeSession(mediaKeySessionContext);
+        return _this14.removeSession(mediaKeySessionContext);
       }).concat(media == null ? void 0 : (_media$setMediaKeys = media.setMediaKeys(null)) == null ? void 0 : _media$setMediaKeys.catch(function (error) {
-        var _this12$hls;
-        _this12.log("Could not clear media keys: " + error);
-        (_this12$hls = _this12.hls) == null ? void 0 : _this12$hls.trigger(Events.ERROR, {
+        var _this14$hls;
+        _this14.log("Could not clear media keys: " + error);
+        (_this14$hls = _this14.hls) == null ? void 0 : _this14$hls.trigger(Events.ERROR, {
           type: ErrorTypes.OTHER_ERROR,
           details: ErrorDetails.KEY_SYSTEM_DESTROY_MEDIA_KEYS_ERROR,
           fatal: false,
@@ -23119,13 +23155,13 @@
         });
       }))).then(function () {
         if (keySessionCount) {
-          _this12.log('finished closing key sessions and clearing media keys');
+          _this14.log('finished closing key sessions and clearing media keys');
           mediaKeysList.length = 0;
         }
       }).catch(function (error) {
-        var _this12$hls2;
-        _this12.log("Could not close sessions and clear media keys: " + error);
-        (_this12$hls2 = _this12.hls) == null ? void 0 : _this12$hls2.trigger(Events.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, {
           type: ErrorTypes.OTHER_ERROR,
           details: ErrorDetails.KEY_SYSTEM_DESTROY_CLOSE_SESSION_ERROR,
           fatal: false,
@@ -23136,8 +23172,8 @@
     _proto.onManifestLoading = function onManifestLoading() {
       this.keyFormatPromise = null;
     };
-    _proto.onManifestLoaded = function onManifestLoaded(event, _ref6) {
-      var sessionKeys = _ref6.sessionKeys;
+    _proto.onManifestLoaded = function onManifestLoaded(event, _ref9) {
+      var sessionKeys = _ref9.sessionKeys;
       if (!sessionKeys || !this.config.emeEnabled) {
         return;
       }
@@ -23153,7 +23189,7 @@
       }
     };
     _proto.removeSession = function removeSession(mediaKeySessionContext) {
-      var _this13 = this;
+      var _this15 = this;
       var mediaKeysSession = mediaKeySessionContext.mediaKeysSession,
         licenseXhr = mediaKeySessionContext.licenseXhr;
       if (mediaKeysSession) {
@@ -23182,9 +23218,9 @@
           mediaKeysSession.remove().then(resolve);
         }) : Promise.resolve();
         return removePromise.catch(function (error) {
-          var _this13$hls;
-          _this13.log("Could not remove session: " + error);
-          (_this13$hls = _this13.hls) == null ? void 0 : _this13$hls.trigger(Events.ERROR, {
+          var _this15$hls;
+          _this15.log("Could not remove session: " + error);
+          (_this15$hls = _this15.hls) == null ? void 0 : _this15$hls.trigger(Events.ERROR, {
             type: ErrorTypes.OTHER_ERROR,
             details: ErrorDetails.KEY_SYSTEM_DESTROY_REMOVE_SESSION_ERROR,
             fatal: false,
@@ -23193,9 +23229,9 @@
         }).then(function () {
           return mediaKeysSession.close();
         }).catch(function (error) {
-          var _this13$hls2;
-          _this13.log("Could not close session: " + error);
-          (_this13$hls2 = _this13.hls) == null ? void 0 : _this13$hls2.trigger(Events.ERROR, {
+          var _this15$hls2;
+          _this15.log("Could not close session: " + error);
+          (_this15$hls2 = _this15.hls) == null ? void 0 : _this15$hls2.trigger(Events.ERROR, {
             type: ErrorTypes.OTHER_ERROR,
             details: ErrorDetails.KEY_SYSTEM_DESTROY_CLOSE_SESSION_ERROR,
             fatal: false,
@@ -23209,13 +23245,13 @@
   EMEController.CDMCleanupPromise = void 0;
   var EMEKeyError = /*#__PURE__*/function (_Error) {
     function EMEKeyError(data, message) {
-      var _this14;
-      _this14 = _Error.call(this, message) || this;
-      _this14.data = void 0;
+      var _this16;
+      _this16 = _Error.call(this, message) || this;
+      _this16.data = void 0;
       data.error || (data.error = new Error(message));
-      _this14.data = data;
+      _this16.data = data;
       data.err = data.error;
-      return _this14;
+      return _this16;
     }
     _inheritsLoose(EMEKeyError, _Error);
     return EMEKeyError;
@@ -25959,7 +25995,6 @@
       var _this$schedule$items2, _this$detachedData4;
       var interstitial = player.interstitial,
         assetItem = player.assetItem;
-        player.assetId;
       var scheduleIndex = this.schedule.findEventIndex(interstitial.identifier);
       var item = (_this$schedule$items2 = this.schedule.items) == null ? void 0 : _this$schedule$items2[scheduleIndex];
       if (!item) {
@@ -31205,6 +31240,8 @@
     // used by eme-controller
     requestMediaKeySystemAccessFunc: requestMediaKeySystemAccess ,
     // used by eme-controller
+    requireKeySystemAccessOnStart: false,
+    // used by eme-controller
     testBandwidth: true,
     progressive: false,
     lowLatencyMode: true,
@@ -34589,23 +34626,40 @@
     };
     _proto.loadClear = function loadClear(loadingFrag, encryptedFragments) {
       var _this = this;
-      if (this.emeController && this.config.emeEnabled) {
-        // access key-system with nearest key on start (loaidng frag is unencrypted)
-        var sn = loadingFrag.sn,
-          cc = loadingFrag.cc;
-        var _loop = function _loop() {
-          var frag = encryptedFragments[i];
-          if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
-            _this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
-              frag.setKeyFormat(keySystemFormat);
-            });
-            return 1; // break
+      if (this.emeController && this.config.emeEnabled && !this.emeController.getSelectedKeySystemFormats().length) {
+        // access key-system with nearest key on start (loading frag is unencrypted)
+        if (encryptedFragments.length) {
+          var sn = loadingFrag.sn,
+            cc = loadingFrag.cc;
+          var _loop = function _loop() {
+              var frag = encryptedFragments[i];
+              if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
+                return {
+                  v: _this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
+                    frag.setKeyFormat(keySystemFormat);
+                    if (_this.emeController && _this.config.requireKeySystemAccessOnStart) {
+                      var keySystem = keySystemFormatToKeySystemDomain(keySystemFormat);
+                      if (keySystem) {
+                        return _this.emeController.getKeySystemAccess([keySystem]);
+                      }
+                    }
+                  })
+                };
+              }
+            },
+            _ret;
+          for (var i = 0; i < encryptedFragments.length; i++) {
+            _ret = _loop();
+            if (_ret) return _ret.v;
+          }
+        } else if (this.config.requireKeySystemAccessOnStart) {
+          var keySystemsInConfig = getKeySystemsForConfig(this.config);
+          if (keySystemsInConfig.length) {
+            return this.emeController.getKeySystemAccess(keySystemsInConfig);
           }
-        };
-        for (var i = 0; i < encryptedFragments.length; i++) {
-          if (_loop()) break;
         }
       }
+      return null;
     };
     _proto.load = function load(frag) {
       var _this2 = this;