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

package/dist/hls.mjs

@@ -420,7 +420,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.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();
@@ -8674,30 +8674,14 @@ function findFirstFragWithCC(fragments, cc) {
   }
   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) {
-  const prevFrags = prevDetails.fragments;
-  const curFrags = curDetails.fragments;
-  if (!curFrags.length || !prevFrags.length) {
-    logger.log('No fragments to align');
-    return;
-  }
-  const 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) {
     const start = frag.start + sliding;
@@ -8732,7 +8716,7 @@ function alignStream(lastFrag, switchDetails, details) {
   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
@@ -8748,20 +8732,24 @@ function alignStream(lastFrag, switchDetails, details) {
 }
 
 /**
- * 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)) {
-    const 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;
   }
+  const targetCC = Math.min(refDetails.endCC, details.endCC);
+  const refFrag = findFirstFragWithCC(refDetails.fragments, targetCC);
+  const frag = findFirstFragWithCC(details.fragments, targetCC);
+  if (!refFrag || !frag) {
+    return;
+  }
+  logger.log(`Aligning playlist at start of dicontinuity sequence ${targetCC}`);
+  const delta = refFrag.start - frag.start;
+  adjustSlidingStart(delta, details);
 }
 
 /**
@@ -9896,7 +9884,7 @@ class BaseStreamController extends TaskLoop {
         return;
       }
       if ('payload' in data) {
-        this.log(`Loaded fragment ${frag.sn} of level ${frag.level}`);
+        this.log(`Loaded ${frag.type} sn: ${frag.sn} of ${this.playlistLabel()} ${frag.level}`);
         this.hls.trigger(Events.FRAG_LOADED, data);
       }
 
@@ -10046,9 +10034,9 @@ class BaseStreamController extends TaskLoop {
     return !frag || !fragCurrent || frag.sn !== fragCurrent.sn || frag.level !== fragCurrent.level;
   }
   fragBufferedComplete(frag, part) {
-    var _frag$startPTS, _frag$endPTS, _this$fragCurrent, _this$fragPrevious;
+    var _this$fragCurrent, _this$fragPrevious;
     const 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) {
@@ -10105,7 +10093,7 @@ class BaseStreamController extends TaskLoop {
     }
     let 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(keyLoadedData => {
@@ -10144,7 +10132,7 @@ class BaseStreamController extends TaskLoop {
         const partIndex = this.getNextPart(partList, frag, targetBufferTime);
         if (partIndex > -1) {
           const 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;
           let _result;
@@ -10180,7 +10168,7 @@ class BaseStreamController extends TaskLoop {
       // 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;
@@ -10959,11 +10947,19 @@ class BaseStreamController extends TaskLoop {
       // 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,
       part
     });
   }
+  playlistLabel() {
+    return this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track';
+  }
+  fragInfo(frag, pts = true) {
+    var _ref, _ref2;
+    return `${this.playlistLabel()} ${frag.level} (frag:[${((_ref = pts ? frag.startPTS : frag.start) != null ? _ref : NaN).toFixed(3)}-${((_ref2 = pts ? frag.endPTS : frag.end) != null ? _ref2 : NaN).toFixed(3)}]`;
+  }
   resetTransmuxer() {
     if (this.transmuxer) {
       this.transmuxer.destroy();
@@ -29268,7 +29264,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.14-0.canary.10427";
+    return "1.5.14-0.canary.10431";
   }
 
   /**