hls.js 1.5.18 → 1.5.20

package/dist/hls.light.mjs

@@ -411,7 +411,7 @@ function enableLogs(debugConfig, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      exportedLogger.log(`Debug logs enabled for "${id}" in hls.js version ${"1.5.18"}`);
+      exportedLogger.log(`Debug logs enabled for "${id}" in hls.js version ${"1.5.20"}`);
     } catch (e) {
       exportedLogger = fakeLogger;
     }
@@ -4730,15 +4730,16 @@ function mergeDetails(oldDetails, newDetails) {
     delete oldDetails.fragmentHint.endPTS;
   }
   // check if old/new playlists have fragments in common
-  // loop through overlapping SN and update startPTS , cc, and duration if any found
-  let ccOffset = 0;
+  // loop through overlapping SN and update startPTS, cc, and duration if any found
   let PTSFrag;
-  mapFragmentIntersection(oldDetails, newDetails, (oldFrag, newFrag) => {
-    if (oldFrag.relurl) {
-      // Do not compare CC if the old fragment has no url. This is a level.fragmentHint used by LL-HLS parts.
-      // It maybe be off by 1 if it was created before any parts or discontinuity tags were appended to the end
-      // of the playlist.
-      ccOffset = oldFrag.cc - newFrag.cc;
+  mapFragmentIntersection(oldDetails, newDetails, (oldFrag, newFrag, newFragIndex, newFragments) => {
+    if (newDetails.skippedSegments) {
+      if (newFrag.cc !== oldFrag.cc) {
+        const ccOffset = oldFrag.cc - newFrag.cc;
+        for (let i = newFragIndex; i < newFragments.length; i++) {
+          newFragments[i].cc += ccOffset;
+        }
+      }
     }
     if (isFiniteNumber(oldFrag.startPTS) && isFiniteNumber(oldFrag.endPTS)) {
       newFrag.start = newFrag.startPTS = oldFrag.startPTS;
@@ -4763,8 +4764,9 @@ function mergeDetails(oldDetails, newDetails) {
       currentInitSegment = oldFrag.initSegment;
     }
   });
+  const newFragments = newDetails.fragments;
   if (currentInitSegment) {
-    const fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
+    const fragmentsToCheck = newDetails.fragmentHint ? newFragments.concat(newDetails.fragmentHint) : newFragments;
     fragmentsToCheck.forEach(frag => {
       var _currentInitSegment;
       if (frag && (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.relurl))) {
@@ -4773,27 +4775,20 @@ function mergeDetails(oldDetails, newDetails) {
     });
   }
   if (newDetails.skippedSegments) {
-    newDetails.deltaUpdateFailed = newDetails.fragments.some(frag => !frag);
+    newDetails.deltaUpdateFailed = newFragments.some(frag => !frag);
     if (newDetails.deltaUpdateFailed) {
       logger.warn('[level-helper] Previous playlist missing segments skipped in delta playlist');
       for (let i = newDetails.skippedSegments; i--;) {
-        newDetails.fragments.shift();
+        newFragments.shift();
+      }
+      newDetails.startSN = newFragments[0].sn;
+    } else {
+      if (newDetails.canSkipDateRanges) {
+        newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails.dateRanges, newDetails.recentlyRemovedDateranges);
       }
-      newDetails.startSN = newDetails.fragments[0].sn;
-      newDetails.startCC = newDetails.fragments[0].cc;
-    } else if (newDetails.canSkipDateRanges) {
-      newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails.dateRanges, newDetails.recentlyRemovedDateranges);
-    }
-  }
-  const newFragments = newDetails.fragments;
-  if (ccOffset) {
-    logger.warn('discontinuity sliding from playlist, take drift into account');
-    for (let i = 0; i < newFragments.length; i++) {
-      newFragments[i].cc += ccOffset;
     }
-  }
-  if (newDetails.skippedSegments) {
     newDetails.startCC = newDetails.fragments[0].cc;
+    newDetails.endCC = newFragments[newFragments.length - 1].cc;
   }
 
   // Merge parts
@@ -4877,7 +4872,7 @@ function mapFragmentIntersection(oldDetails, newDetails, intersectionFn) {
       newFrag = newDetails.fragments[i] = oldFrag;
     }
     if (oldFrag && newFrag) {
-      intersectionFn(oldFrag, newFrag);
+      intersectionFn(oldFrag, newFrag, i, newFrags);
     }
   }
 }
@@ -10944,7 +10939,7 @@ class KeyLoader {
     }
   }
   load(frag) {
-    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(keySystemFormat => {
         return this.loadInternal(frag, keySystemFormat);
@@ -19748,7 +19743,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.18";
+    return "1.5.20";
   }
 
   /**