hls.js 1.6.7-0.canary.11370 → 1.6.7

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.7-0.canary.11370");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.7");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -17275,7 +17275,7 @@
           keyLoadingPromise = Promise.reject(new Error("frag load aborted, context changed in KEY_LOADING"));
         }
       } else if (!frag.encrypted) {
-        keyLoadingPromise = this.keyLoader.loadClear(frag, details.encryptedFragments);
+        keyLoadingPromise = this.keyLoader.loadClear(frag, details.encryptedFragments, this.startFragRequested);
         if (keyLoadingPromise) {
           this.log("[eme] blocking frag load until media-keys acquired");
         }
@@ -20535,7 +20535,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.7-0.canary.11370";
+  var version = "1.6.7";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -22256,31 +22256,31 @@
         networkDetails: networkDetails
       });
     };
-    _proto.loadClear = function loadClear(loadingFrag, encryptedFragments) {
+    _proto.loadClear = function loadClear(loadingFrag, encryptedFragments, startFragRequested) {
       var _this = this;
       if (this.emeController && this.config.emeEnabled && !this.emeController.getSelectedKeySystemFormats().length) {
-        // access key-system with nearest key on start (loading frag is unencrypted)
+        // 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)) {
+              // Loading at or before segment with EXT-X-KEY, or first frag loading and last EXT-X-KEY
+              if (loadingFrag.cc <= frag.cc && (!isMediaFragment(loadingFrag) || !isMediaFragment(frag) || loadingFrag.sn < frag.sn) || !startFragRequested && i == l - 1) {
                 return {
                   v: _this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
+                    if (!_this.emeController) {
+                      return;
+                    }
                     frag.setKeyFormat(keySystemFormat);
-                    if (_this.emeController && _this.config.requireKeySystemAccessOnStart) {
-                      var keySystem = emptyExports.keySystemFormatToKeySystemDomain(keySystemFormat);
-                      if (keySystem) {
-                        return _this.emeController.getKeySystemAccess([keySystem]);
-                      }
+                    var keySystem = emptyExports.keySystemFormatToKeySystemDomain(keySystemFormat);
+                    if (keySystem) {
+                      return _this.emeController.getKeySystemAccess([keySystem]);
                     }
                   })
                 };
               }
             },
             _ret;
-          for (var i = 0; i < encryptedFragments.length; i++) {
+          for (var i = 0, l = encryptedFragments.length; i < l; i++) {
             _ret = _loop();
             if (_ret) return _ret.v;
           }