hls.js 1.6.3-0.canary.11253 → 1.6.3-0.canary.11255

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.3-0.canary.11253"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.3-0.canary.11255"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -3707,7 +3707,6 @@ function findFragmentByPDT(fragments, PDTValue, maxFragLookUpTolerance) {
   if (PDTValue >= (endPDT || 0)) {
     return null;
   }
-  maxFragLookUpTolerance = maxFragLookUpTolerance || 0;
   for (let seg = 0; seg < fragments.length; ++seg) {
     const frag = fragments[seg];
     if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) {
@@ -3818,16 +3817,37 @@ function pdtWithinToleranceTest(pdtBufferEnd, maxFragLookUpTolerance, candidate)
   const endProgramDateTime = candidate.endProgramDateTime || 0;
   return endProgramDateTime - candidateLookupTolerance > pdtBufferEnd;
 }
-function findFragWithCC(fragments, cc) {
-  return BinarySearch.search(fragments, candidate => {
-    if (candidate.cc < cc) {
-      return 1;
-    } else if (candidate.cc > cc) {
-      return -1;
-    } else {
-      return 0;
+function findNearestWithCC(details, cc, pos) {
+  if (details) {
+    if (details.startCC <= cc && details.endCC >= cc) {
+      let fragments = details.fragments;
+      const {
+        fragmentHint
+      } = details;
+      if (fragmentHint) {
+        fragments = fragments.concat(fragmentHint);
+      }
+      let closest;
+      BinarySearch.search(fragments, candidate => {
+        if (candidate.cc < cc) {
+          return 1;
+        }
+        if (candidate.cc > cc) {
+          return -1;
+        }
+        closest = candidate;
+        if (candidate.end <= pos) {
+          return 1;
+        }
+        if (candidate.start > pos) {
+          return -1;
+        }
+        return 0;
+      });
+      return closest || null;
     }
-  });
+  }
+  return null;
 }
 
 function isTimeoutError(error) {
@@ -8415,8 +8435,11 @@ class BaseStreamController extends TaskLoop {
       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`);
+      }
     }
     const fragPrevious = this.fragPrevious;
     if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
@@ -8771,7 +8794,7 @@ class BaseStreamController extends TaskLoop {
           this.log(`LL-Part loading ON for initial live fragment`);
           this.loadingParts = true;
         }
-        frag = this.getInitialLiveFragment(levelDetails, fragments);
+        frag = this.getInitialLiveFragment(levelDetails);
         const mainStart = this.hls.startPosition;
         const liveSyncPosition = this.hls.liveSyncPosition;
         const startPosition = frag ? (mainStart !== -1 && mainStart >= start ? mainStart : liveSyncPosition) || frag.start : pos;
@@ -8868,7 +8891,8 @@ class BaseStreamController extends TaskLoop {
    "sliding" of the playlist, which is its offset from the start of playback. After sliding we can compute the real
    start and end times for each fragment in the playlist (after which this method will not need to be called).
   */
-  getInitialLiveFragment(levelDetails, fragments) {
+  getInitialLiveFragment(levelDetails) {
+    const fragments = levelDetails.fragments;
     const fragPrevious = this.fragPrevious;
     let frag = null;
     if (fragPrevious) {
@@ -8891,7 +8915,7 @@ class BaseStreamController extends TaskLoop {
         // It's important to stay within the continuity range if available; otherwise the fragments in the playlist
         // will have the wrong start times
         if (!frag) {
-          frag = findFragWithCC(fragments, fragPrevious.cc);
+          frag = findNearestWithCC(levelDetails, fragPrevious.cc, fragPrevious.end);
           if (frag) {
             this.log(`Live playlist, switching playlist, load frag with same CC: ${frag.sn}`);
           }
@@ -17763,6 +17787,8 @@ const hlsDefaultConfig = _objectSpread2(_objectSpread2({
   // used by eme-controller
   requestMediaKeySystemAccessFunc: null,
   // used by eme-controller
+  requireKeySystemAccessOnStart: false,
+  // used by eme-controller
   testBandwidth: true,
   progressive: false,
   lowLatencyMode: true,
@@ -19871,7 +19897,7 @@ function assignTrackIdsByGroup(tracks) {
   });
 }
 
-const version = "1.6.3-0.canary.11253";
+const version = "1.6.3-0.canary.11255";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -21621,22 +21647,35 @@ class KeyLoader {
     });
   }
   loadClear(loadingFrag, encryptedFragments) {
-    if (this.emeController && this.config.emeEnabled) {
-      // access key-system with nearest key on start (loaidng frag is unencrypted)
-      const {
-        sn,
-        cc
-      } = loadingFrag;
-      for (let i = 0; i < encryptedFragments.length; i++) {
-        const frag = encryptedFragments[i];
-        if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
-          this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
-            frag.setKeyFormat(keySystemFormat);
-          });
-          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) {
+        const {
+          sn,
+          cc
+        } = loadingFrag;
+        for (let i = 0; i < encryptedFragments.length; i++) {
+          const frag = encryptedFragments[i];
+          if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
+            return this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
+              frag.setKeyFormat(keySystemFormat);
+              if (this.emeController && this.config.requireKeySystemAccessOnStart) {
+                const keySystem = emptyEsExports.keySystemFormatToKeySystemDomain(keySystemFormat);
+                if (keySystem) {
+                  return this.emeController.getKeySystemAccess([keySystem]);
+                }
+              }
+            });
+          }
+        }
+      } else if (this.config.requireKeySystemAccessOnStart) {
+        const keySystemsInConfig = emptyEsExports.getKeySystemsForConfig(this.config);
+        if (keySystemsInConfig.length) {
+          return this.emeController.getKeySystemAccess(keySystemsInConfig);
         }
       }
     }
+    return null;
   }
   load(frag) {
     if (!frag.decryptdata && frag.encrypted && this.emeController && this.config.emeEnabled) {