hls.js 1.6.3-0.canary.11254 → 1.6.3-0.canary.11257

package/dist/hls.light.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.11254");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11257");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -15399,6 +15399,8 @@
     // used by eme-controller
     requestMediaKeySystemAccessFunc: null,
     // used by eme-controller
+    requireKeySystemAccessOnStart: false,
+    // used by eme-controller
     testBandwidth: true,
     progressive: false,
     lowLatencyMode: true,
@@ -17261,8 +17263,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)) {
@@ -20519,7 +20524,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11254";
+  var version = "1.6.3-0.canary.11257";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -22238,23 +22243,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 = emptyExports.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 = emptyExports.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;