hls.js 1.6.0-beta.2.0.canary.10876 → 1.6.0-beta.2.0.canary.10877

package/dist/hls.js

@@ -1058,7 +1058,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.0-beta.2.0.canary.10876");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.2.0.canary.10877");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16320,7 +16320,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10876";
+  var version = "1.6.0-beta.2.0.canary.10877";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -21773,121 +21773,143 @@
         if (initData === null) {
           return;
         }
-        var keyId;
-        var keySystemDomain;
-        if (initDataType === 'sinf' && _this.getLicenseServerUrl(KeySystems.FAIRPLAY)) {
-          // Match sinf keyId to playlist skd://keyId=
-          var json = bin2str(new Uint8Array(initData));
-          try {
-            var sinf = base64Decode(JSON.parse(json).sinf);
-            var tenc = parseSinf(sinf);
-            if (!tenc) {
-              throw new Error("'schm' box missing or not cbcs/cenc with schi > tenc");
-            }
-            keyId = tenc.subarray(8, 24);
-            keySystemDomain = KeySystems.FAIRPLAY;
-          } catch (error) {
-            _this.warn(logMessage + " Failed to parse sinf: " + error);
-            return;
-          }
-        } else if (_this.getLicenseServerUrl(KeySystems.WIDEVINE)) {
-          // Support Widevine clear-lead key-session creation (otherwise depend on playlist keys)
-          var psshResults = parseMultiPssh(initData);
-
-          // TODO: If using keySystemAccessPromises we might want to wait until one is resolved
+        if (!_this.keyFormatPromise) {
           var keySystems = Object.keys(_this.keySystemAccessPromises);
           if (!keySystems.length) {
             keySystems = getKeySystemsForConfig(_this.config);
           }
-          var psshInfo = psshResults.filter(function (pssh) {
-            var keySystem = pssh.systemId ? keySystemIdToKeySystemDomain(pssh.systemId) : null;
-            return keySystem ? keySystems.indexOf(keySystem) > -1 : false;
-          })[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");
+          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;
             }
-            return;
-          }
-          keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-          if (psshInfo.version === 0 && psshInfo.data) {
-            if (keySystemDomain === KeySystems.WIDEVINE) {
-              var offset = psshInfo.data.length - 22;
-              keyId = psshInfo.data.subarray(offset, offset + 16);
-            } else if (keySystemDomain === KeySystems.PLAYREADY) {
-              keyId = parsePlayReadyWRM(psshInfo.data);
+            // 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 = tenc.subarray(8, 24);
+              keySystemDomain = KeySystems.FAIRPLAY;
+            } catch (error) {
+              _this.warn(logMessage + " Failed to parse sinf: " + error);
+              return;
             }
-          }
-        }
-        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
+          } 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;
             }
-            var oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-            if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-              keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-              if (decryptdata.pssh) {
+            // 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) {
+              _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 = 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
               }
-              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;
             }
-          },
-          _ret;
-        for (var i = 0; i < mediaKeySessions.length; i++) {
-          _ret = _loop();
-          if (_ret === 0) continue;
-          if (_ret === 1) break;
-        }
-        if (!keySessionContextPromise) {
-          // Clear-lead key (not encountered in playlist)
-          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = _this.getKeySystemSelectionPromise([keySystemDomain]).then(function (_ref) {
-            var _keySystemToKeySystem;
-            var keySystem = _ref.keySystem,
-              mediaKeys = _ref.mediaKeys;
-            _this.throwIfDestroyed();
-            var decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
-            decryptdata.pssh = new Uint8Array(initData);
-            decryptdata.keyId = keyId;
-            return _this.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
+            // "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 keySessionContext = _this.createMediaKeySessionContext({
-                decryptdata: decryptdata,
-                keySystem: keySystem,
-                mediaKeys: mediaKeys
+              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');
               });
-              return _this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
             });
-          });
-          keySessionContextPromise.catch(function (error) {
-            return _this.handleError(error);
-          });
-        }
+            keySessionContextPromise.catch(function (error) {
+              return _this.handleError(error);
+            });
+          }
+        });
       };
       _this.onWaitingForKey = function (event) {
         _this.log("\"" + event.type + "\" event");
@@ -33472,7 +33494,7 @@
     };
     _proto.load = function load(frag) {
       var _this2 = this;
-      if (!frag.decryptdata && frag.encrypted && this.emeController) {
+      if (!frag.decryptdata && frag.encrypted && this.emeController && this.config.emeEnabled) {
         // Multiple keys, but none selected, resolve in eme-controller
         return this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
           return _this2.loadInternal(frag, keySystemFormat);