hls.js 1.5.14-0.canary.10593 → 1.5.14-0.canary.10596

package/dist/hls.mjs

@@ -421,7 +421,7 @@ function enableLogs(debugConfig, context, id) {
     // 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.10593"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.14-0.canary.10596"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -11079,7 +11079,7 @@ function concatUint8Arrays(chunks, dataLength) {
   return result;
 }
 
-const version = "1.5.14-0.canary.10593";
+const version = "1.5.14-0.canary.10596";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -23897,9 +23897,9 @@ class EMEController extends Logger {
     const keyId = this.getKeyIdString(decryptdata);
     const keyDetails = `(keyId: ${keyId} format: "${decryptdata.keyFormat}" method: ${decryptdata.method} uri: ${decryptdata.uri})`;
     this.log(`Starting session for key ${keyDetails}`);
-    let keySessionContextPromise = this.keyIdToKeySessionPromise[keyId];
-    if (!keySessionContextPromise) {
-      keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = this.getKeySystemForKeyPromise(decryptdata).then(({
+    let keyContextPromise = this.keyIdToKeySessionPromise[keyId];
+    if (!keyContextPromise) {
+      keyContextPromise = this.getKeySystemForKeyPromise(decryptdata).then(({
         keySystem,
         mediaKeys
       }) => {
@@ -23907,18 +23907,20 @@ class EMEController extends Logger {
         this.log(`Handle encrypted media sn: ${data.frag.sn} ${data.frag.type}: ${data.frag.level} using key ${keyDetails}`);
         return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
           this.throwIfDestroyed();
-          const keySessionContext = this.createMediaKeySessionContext({
+          return this.createMediaKeySessionContext({
             keySystem,
             mediaKeys,
             decryptdata
           });
-          const scheme = 'cenc';
-          return this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
         });
       });
+      const keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = keyContextPromise.then(keySessionContext => {
+        const scheme = 'cenc';
+        return this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
+      });
       keySessionContextPromise.catch(error => this.handleError(error));
     }
-    return keySessionContextPromise;
+    return keyContextPromise;
   }
   throwIfDestroyed(message = 'Invalid state') {
     if (!this.hls) {