hls.js 1.5.18 → 1.5.20

package/dist/hls.light.js

@@ -521,7 +521,7 @@
       // 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;
       }
@@ -4979,15 +4979,16 @@
       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
-    var ccOffset = 0;
+    // loop through overlapping SN and update startPTS, cc, and duration if any found
     var PTSFrag;
-    mapFragmentIntersection(oldDetails, newDetails, function (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, function (oldFrag, newFrag, newFragIndex, newFragments) {
+      if (newDetails.skippedSegments) {
+        if (newFrag.cc !== oldFrag.cc) {
+          var ccOffset = oldFrag.cc - newFrag.cc;
+          for (var _i = newFragIndex; _i < newFragments.length; _i++) {
+            newFragments[_i].cc += ccOffset;
+          }
+        }
       }
       if (isFiniteNumber(oldFrag.startPTS) && isFiniteNumber(oldFrag.endPTS)) {
         newFrag.start = newFrag.startPTS = oldFrag.startPTS;
@@ -5012,8 +5013,9 @@
         currentInitSegment = oldFrag.initSegment;
       }
     });
+    var newFragments = newDetails.fragments;
     if (currentInitSegment) {
-      var fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
+      var fragmentsToCheck = newDetails.fragmentHint ? newFragments.concat(newDetails.fragmentHint) : newFragments;
       fragmentsToCheck.forEach(function (frag) {
         var _currentInitSegment;
         if (frag && (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.relurl))) {
@@ -5022,29 +5024,22 @@
       });
     }
     if (newDetails.skippedSegments) {
-      newDetails.deltaUpdateFailed = newDetails.fragments.some(function (frag) {
+      newDetails.deltaUpdateFailed = newFragments.some(function (frag) {
         return !frag;
       });
       if (newDetails.deltaUpdateFailed) {
         logger.warn('[level-helper] Previous playlist missing segments skipped in delta playlist');
-        for (var _i = newDetails.skippedSegments; _i--;) {
-          newDetails.fragments.shift();
+        for (var _i2 = newDetails.skippedSegments; _i2--;) {
+          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);
-      }
-    }
-    var newFragments = newDetails.fragments;
-    if (ccOffset) {
-      logger.warn('discontinuity sliding from playlist, take drift into account');
-      for (var _i2 = 0; _i2 < newFragments.length; _i2++) {
-        newFragments[_i2].cc += ccOffset;
       }
-    }
-    if (newDetails.skippedSegments) {
       newDetails.startCC = newDetails.fragments[0].cc;
+      newDetails.endCC = newFragments[newFragments.length - 1].cc;
     }
 
     // Merge parts
@@ -5128,7 +5123,7 @@
         _newFrag = newDetails.fragments[i] = _oldFrag;
       }
       if (_oldFrag && _newFrag) {
-        intersectionFn(_oldFrag, _newFrag);
+        intersectionFn(_oldFrag, _newFrag, i, newFrags);
       }
     }
   }
@@ -11266,7 +11261,7 @@
     };
     _proto.load = function load(frag) {
       var _this2 = this;
-      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(function (keySystemFormat) {
           return _this2.loadInternal(frag, keySystemFormat);
@@ -21090,7 +21085,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.18";
+        return "1.5.20";
       }
     }, {
       key: "Events",