hls.js 1.5.14-0.canary.10427 → 1.5.14-0.canary.10431

package/dist/hls.js

@@ -522,7 +522,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.5.14-0.canary.10427");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.14-0.canary.10431");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -9004,30 +9004,14 @@
     }
     return null;
   }
-  function shouldAlignOnDiscontinuities(lastFrag, switchDetails, details) {
-    if (switchDetails) {
-      if (details.endCC > details.startCC || lastFrag && lastFrag.cc < details.startCC) {
+  function shouldAlignOnDiscontinuities(refDetails, details) {
+    if (refDetails) {
+      if (details.startCC < refDetails.endCC && details.endCC > refDetails.startCC) {
         return true;
       }
     }
     return false;
   }
-
-  // Find the first frag in the previous level which matches the CC of the first frag of the new level
-  function findDiscontinuousReferenceFrag(prevDetails, curDetails) {
-    var prevFrags = prevDetails.fragments;
-    var curFrags = curDetails.fragments;
-    if (!curFrags.length || !prevFrags.length) {
-      logger.log('No fragments to align');
-      return;
-    }
-    var prevStartFrag = findFirstFragWithCC(prevFrags, curFrags[0].cc);
-    if (!prevStartFrag || prevStartFrag && !prevStartFrag.startPTS) {
-      logger.log('No frag in previous level to align on');
-      return;
-    }
-    return prevStartFrag;
-  }
   function adjustFragmentStart(frag, sliding) {
     if (frag) {
       var start = frag.start + sliding;
@@ -9062,7 +9046,7 @@
     if (!switchDetails) {
       return;
     }
-    alignDiscontinuities(lastFrag, details, switchDetails);
+    alignDiscontinuities(details, switchDetails);
     if (!details.alignedSliding && switchDetails) {
       // If the PTS wasn't figured out via discontinuity sequence that means there was no CC increase within the level.
       // Aligning via Program Date Time should therefore be reliable, since PDT should be the same within the same
@@ -9078,20 +9062,24 @@
   }
 
   /**
-   * Computes the PTS if a new level's fragments using the PTS of a fragment in the last level which shares the same
-   * discontinuity sequence.
-   * @param lastFrag - The last Fragment which shares the same discontinuity sequence
+   * Ajust the start of fragments in `details` by the difference in time between fragments of the latest
+   * shared discontinuity sequence change.
    * @param lastLevel - The details of the last loaded level
    * @param details - The details of the new level
    */
-  function alignDiscontinuities(lastFrag, details, switchDetails) {
-    if (shouldAlignOnDiscontinuities(lastFrag, switchDetails, details)) {
-      var referenceFrag = findDiscontinuousReferenceFrag(switchDetails, details);
-      if (referenceFrag && isFiniteNumber(referenceFrag.start)) {
-        logger.log("Adjusting PTS using last level due to CC increase within current level " + details.url);
-        adjustSlidingStart(referenceFrag.start, details);
-      }
+  function alignDiscontinuities(details, refDetails) {
+    if (!shouldAlignOnDiscontinuities(refDetails, details)) {
+      return;
     }
+    var targetCC = Math.min(refDetails.endCC, details.endCC);
+    var refFrag = findFirstFragWithCC(refDetails.fragments, targetCC);
+    var frag = findFirstFragWithCC(details.fragments, targetCC);
+    if (!refFrag || !frag) {
+      return;
+    }
+    logger.log("Aligning playlist at start of dicontinuity sequence " + targetCC);
+    var delta = refFrag.start - frag.start;
+    adjustSlidingStart(delta, details);
   }
 
   /**
@@ -10247,7 +10235,7 @@
           return;
         }
         if ('payload' in data) {
-          _this3.log("Loaded fragment " + frag.sn + " of level " + frag.level);
+          _this3.log("Loaded " + frag.type + " sn: " + frag.sn + " of " + _this3.playlistLabel() + " " + frag.level);
           _this3.hls.trigger(Events.FRAG_LOADED, data);
         }
 
@@ -10391,9 +10379,9 @@
       return !frag || !fragCurrent || frag.sn !== fragCurrent.sn || frag.level !== fragCurrent.level;
     };
     _proto.fragBufferedComplete = function fragBufferedComplete(frag, part) {
-      var _frag$startPTS, _frag$endPTS, _this$fragCurrent, _this$fragPrevious;
+      var _this$fragCurrent, _this$fragPrevious;
       var media = this.mediaBuffer ? this.mediaBuffer : this.media;
-      this.log("Buffered " + frag.type + " sn: " + frag.sn + (part ? ' part: ' + part.index : '') + " of " + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + " " + frag.level + " (frag:[" + ((_frag$startPTS = frag.startPTS) != null ? _frag$startPTS : NaN).toFixed(3) + "-" + ((_frag$endPTS = frag.endPTS) != null ? _frag$endPTS : NaN).toFixed(3) + "] > buffer:" + (media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)') + ")");
+      this.log("Buffered " + frag.type + " sn: " + frag.sn + (part ? ' part: ' + part.index : '') + " of " + this.fragInfo(frag) + " > buffer:" + (media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)') + ")");
       if (frag.sn !== 'initSegment') {
         var _this$levels;
         if (frag.type !== PlaylistLevelType.SUBTITLE) {
@@ -10455,7 +10443,7 @@
       }
       var keyLoadingPromise = null;
       if (frag.encrypted && !((_frag$decryptdata = frag.decryptdata) != null && _frag$decryptdata.key)) {
-        this.log("Loading key for " + frag.sn + " of [" + details.startSN + "-" + details.endSN + "], " + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + " " + frag.level);
+        this.log("Loading key for " + frag.sn + " of [" + details.startSN + "-" + details.endSN + "], " + this.playlistLabel() + " " + frag.level);
         this.state = State.KEY_LOADING;
         this.fragCurrent = frag;
         keyLoadingPromise = this.keyLoader.load(frag).then(function (keyLoadedData) {
@@ -10494,7 +10482,7 @@
           var partIndex = this.getNextPart(partList, frag, targetBufferTime);
           if (partIndex > -1) {
             var part = partList[partIndex];
-            this.log("Loading part sn: " + frag.sn + " p: " + part.index + " cc: " + frag.cc + " of playlist [" + details.startSN + "-" + details.endSN + "] parts [0-" + partIndex + "-" + (partList.length - 1) + "] " + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
+            this.log("Loading part sn: " + frag.sn + " p: " + part.index + " cc: " + frag.cc + " of playlist [" + details.startSN + "-" + details.endSN + "] parts [0-" + partIndex + "-" + (partList.length - 1) + "] " + this.playlistLabel() + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
             this.nextLoadPosition = part.start + part.duration;
             this.state = State.FRAG_LOADING;
             var _result;
@@ -10534,7 +10522,7 @@
         // Selected fragment hint for part but not loading parts
         return Promise.resolve(null);
       }
-      this.log("Loading fragment " + frag.sn + " cc: " + frag.cc + " " + (details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : '') + (this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track') + ": " + frag.level + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
+      this.log("Loading " + frag.type + " sn: " + frag.sn + " of " + this.fragInfo(frag, false) + ") cc: " + frag.cc + " " + (details ? '[' + details.startSN + '-' + details.endSN + ']' : '') + ", target: " + parseFloat(targetBufferTime.toFixed(3)));
       // Don't update nextLoadPosition for fragments which are not buffered
       if (isFiniteNumber(frag.sn) && !this.bitrateTest) {
         this.nextLoadPosition = frag.start + frag.duration;
@@ -11298,11 +11286,22 @@
         // For this error fallthrough. Marking parsed will allow advancing to next fragment.
       }
       this.state = State.PARSED;
+      this.log("Parsed " + frag.type + " sn: " + frag.sn + (part ? ' part: ' + part.index : '') + " of " + this.fragInfo(frag) + ")");
       this.hls.trigger(Events.FRAG_PARSED, {
         frag: frag,
         part: part
       });
     };
+    _proto.playlistLabel = function playlistLabel() {
+      return this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track';
+    };
+    _proto.fragInfo = function fragInfo(frag, pts) {
+      var _ref3, _ref4;
+      if (pts === void 0) {
+        pts = true;
+      }
+      return this.playlistLabel() + " " + frag.level + " (frag:[" + ((_ref3 = pts ? frag.startPTS : frag.start) != null ? _ref3 : NaN).toFixed(3) + "-" + ((_ref4 = pts ? frag.endPTS : frag.end) != null ? _ref4 : NaN).toFixed(3) + "]";
+    };
     _proto.resetTransmuxer = function resetTransmuxer() {
       if (this.transmuxer) {
         this.transmuxer.destroy();
@@ -30788,7 +30787,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.14-0.canary.10427";
+        return "1.5.14-0.canary.10431";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -328,6 +328,8 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected resetWhenMissingContext(chunkMeta: ChunkMetadata): void;
     protected removeUnbufferedFrags(start?: number): void;
     private updateLevelTiming;
+    private playlistLabel;
+    private fragInfo;
     protected resetTransmuxer(): void;
     protected recoverWorkerError(data: ErrorData): void;
     set state(nextState: string);