hls.js 1.6.7-0.canary.11369 → 1.6.7-0.canary.11371

package/dist/hls.light.mjs

@@ -523,7 +523,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.6.7-0.canary.11369"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.7-0.canary.11371"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -8423,7 +8423,7 @@ class BaseStreamController extends TaskLoop {
         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`);
       }
@@ -19904,7 +19904,7 @@ function assignTrackIdsByGroup(tracks) {
   });
 }
 
-const version = "1.6.7-0.canary.11369";
+const version = "1.6.7-0.canary.11371";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -21657,29 +21657,28 @@ class KeyLoader {
       networkDetails
     });
   }
-  loadClear(loadingFrag, encryptedFragments) {
+  loadClear(loadingFrag, encryptedFragments, startFragRequested) {
     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) {
-        const {
-          sn,
-          cc
-        } = loadingFrag;
-        for (let i = 0; i < encryptedFragments.length; i++) {
+        for (let i = 0, l = encryptedFragments.length; i < l; i++) {
           const 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 this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
+              if (!this.emeController) {
+                return;
+              }
               frag.setKeyFormat(keySystemFormat);
-              if (this.emeController && this.config.requireKeySystemAccessOnStart) {
-                const keySystem = emptyEsExports.keySystemFormatToKeySystemDomain(keySystemFormat);
-                if (keySystem) {
-                  return this.emeController.getKeySystemAccess([keySystem]);
-                }
+              const keySystem = emptyEsExports.keySystemFormatToKeySystemDomain(keySystemFormat);
+              if (keySystem) {
+                return this.emeController.getKeySystemAccess([keySystem]);
               }
             });
           }
         }
-      } else if (this.config.requireKeySystemAccessOnStart) {
+      }
+      if (this.config.requireKeySystemAccessOnStart) {
         const keySystemsInConfig = emptyEsExports.getKeySystemsForConfig(this.config);
         if (keySystemsInConfig.length) {
           return this.emeController.getKeySystemAccess(keySystemsInConfig);