hls.js 1.5.14-0.canary.10592 → 1.5.14-0.canary.10594

package/dist/hls.js

@@ -523,7 +523,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.14-0.canary.10592");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.14-0.canary.10594");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -17311,7 +17311,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.5.14-0.canary.10592";
+  var version = "1.5.14-0.canary.10594";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24505,29 +24505,31 @@
       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 (_ref4) {
+      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();
-            var keySessionContext = _this6.createMediaKeySessionContext({
+            return _this6.createMediaKeySessionContext({
               keySystem: keySystem,
               mediaKeys: mediaKeys,
               decryptdata: decryptdata
             });
-            var scheme = 'cenc';
-            return _this6.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
           });
         });
+        var keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = keyContextPromise.then(function (keySessionContext) {
+          var scheme = 'cenc';
+          return _this6.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
+        });
         keySessionContextPromise.catch(function (error) {
           return _this6.handleError(error);
         });
       }
-      return keySessionContextPromise;
+      return keyContextPromise;
     };
     _proto.throwIfDestroyed = function throwIfDestroyed(message) {
       if (!this.hls) {
@@ -24950,7 +24952,8 @@
       media.addEventListener('waitingforkey', this.onWaitingForKey);
     };
     _proto.onMediaDetached = function onMediaDetached() {
-      var _this14 = this;
+      var _this14 = this,
+        _media$setMediaKeys;
       var media = this.media;
       var mediaKeysList = this.mediaKeySessions;
       if (media) {
@@ -24968,7 +24971,7 @@
       var keySessionCount = mediaKeysList.length;
       EMEController.CDMCleanupPromise = Promise.all(mediaKeysList.map(function (mediaKeySessionContext) {
         return _this14.removeSession(mediaKeySessionContext);
-      }).concat(media == null ? void 0 : media.setMediaKeys(null).catch(function (error) {
+      }).concat(media == null ? void 0 : (_media$setMediaKeys = media.setMediaKeys(null)) == null ? void 0 : _media$setMediaKeys.catch(function (error) {
         _this14.log("Could not clear media keys: " + error);
       }))).then(function () {
         if (keySessionCount) {