hls.js 1.6.0-beta.1.0.canary.10823 → 1.6.0-beta.1.0.canary.10826

package/dist/hls.mjs

@@ -401,7 +401,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.0-beta.1.0.canary.10823"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10826"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -9836,7 +9836,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10823";
+const version = "1.6.0-beta.1.0.canary.10826";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -22644,8 +22644,7 @@ function hash(text) {
   return (hash >>> 0).toString();
 }
 
-const ALIGNED_END_THRESHOLD_SECONDS = 0.02; // 0.1 // 0.2
-
+const ALIGNED_END_THRESHOLD_SECONDS = 0.02;
 let TimelineOccupancy = /*#__PURE__*/function (TimelineOccupancy) {
   TimelineOccupancy[TimelineOccupancy["Point"] = 0] = "Point";
   TimelineOccupancy[TimelineOccupancy["Range"] = 1] = "Range";
@@ -22993,8 +22992,9 @@ class HlsAssetPlayer {
 }
 
 const ABUTTING_THRESHOLD_SECONDS = 0.033;
-class InterstitialsSchedule {
-  constructor(onScheduleUpdate) {
+class InterstitialsSchedule extends Logger {
+  constructor(onScheduleUpdate, logger) {
+    super('interstitials-sched', logger);
     this.onScheduleUpdate = void 0;
     this.eventMap = {};
     this.events = null;
@@ -23430,28 +23430,29 @@ class InterstitialsSchedule {
     const resumeTime = interstitial.resumeTime;
     const resumesInPlaceAt = interstitial.startTime + interstitial.resumptionOffset;
     if (Math.abs(resumeTime - resumesInPlaceAt) > ALIGNED_END_THRESHOLD_SECONDS) {
-      logger.log(`Interstitial resumption ${resumeTime} not aligned with estimated timeline end ${resumesInPlaceAt}`);
+      this.log(`"${interstitial.identifier}" resumption ${resumeTime} not aligned with estimated timeline end ${resumesInPlaceAt}`);
       return false;
     }
     if (!mediaSelection) {
-      logger.log(`Interstitial resumption ${resumeTime} can not be aligned with media (none selected)`);
+      this.log(`"${interstitial.identifier}" resumption ${resumeTime} can not be aligned with media (none selected)`);
       return false;
     }
     return !Object.keys(mediaSelection).some(playlistType => {
       const details = mediaSelection[playlistType].details;
       const playlistEnd = details.edge;
       if (resumeTime > playlistEnd) {
-        logger.log(`Interstitial resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
+        this.log(`"${interstitial.identifier}" resumption ${resumeTime} past ${playlistType} playlist end ${playlistEnd}`);
         return true;
       }
       const startFragment = findFragmentByPTS(null, details.fragments, resumeTime);
       if (!startFragment) {
-        logger.log(`Interstitial resumption ${resumeTime} does not overlap with any fragments in ${playlistType} playlist`);
+        this.log(`"${interstitial.identifier}" resumption ${resumeTime} does not align with any fragments in ${playlistType} playlist`);
         return true;
       }
-      const alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS;
+      const endAllowance = playlistType === 'audio' ? 0.175 : 0;
+      const alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS + endAllowance;
       if (!alignedWithSegment) {
-        logger.log(`Interstitial resumption ${resumeTime} does not overlap with fragment in ${playlistType} playlist (${startFragment.start}-${startFragment.end})`);
+        this.log(`"${interstitial.identifier}" resumption ${resumeTime} not aligned with ${playlistType} fragment bounds (${startFragment.start}-${startFragment.end} sn: ${startFragment.sn} cc: ${startFragment.cc})`);
         return true;
       }
       return false;
@@ -23573,6 +23574,9 @@ class AssetListLoader {
   }
 }
 
+function playWithCatch(media) {
+  media == null ? void 0 : media.play().catch() /* no-op */;
+}
 class InterstitialsController extends Logger {
   constructor(hls, HlsPlayerClass) {
     super('interstitials', hls.logger);
@@ -23780,7 +23784,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     this.hls = hls;
     this.HlsPlayerClass = HlsPlayerClass;
     this.assetListLoader = new AssetListLoader(hls);
-    this.schedule = new InterstitialsSchedule(this.onScheduleUpdate);
+    this.schedule = new InterstitialsSchedule(this.onScheduleUpdate, hls.logger);
     this.registerListeners();
   }
   registerListeners() {
@@ -24251,8 +24255,8 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
       if (detachedMediaSource) {
         attachMediaSourceData = this.detachedData;
         this.log(`using detachedData: MediaSource ${JSON.stringify(attachMediaSourceData)}`);
-      } else if (!this.detachedData) {
-        this.warn(`missing MediaSource (detachedData)!`);
+      } else if (!this.detachedData || this.hls.media === media) {
+        // Media is attaching when `detachedData` and `hls.media` are populated. Detach to clear the MediaSource.
         this.hls.detachMedia();
         this.detachedData = {
           media
@@ -24473,14 +24477,12 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
       }
       this.startAssetPlayer(player, assetListIndex, scheduleItems, index, media);
       if (this.shouldPlay) {
-        var _player$media;
-        (_player$media = player.media) == null ? void 0 : _player$media.play();
+        playWithCatch(player.media);
       }
     } else if (scheduledItem !== null) {
       this.resumePrimary(scheduledItem, index, currentItem);
       if (this.shouldPlay) {
-        var _this$hls$media;
-        (_this$hls$media = this.hls.media) == null ? void 0 : _this$hls$media.play();
+        playWithCatch(this.hls.media);
       }
     } else if (playingLastItem && this.isInterstitial(currentItem)) {
       // Maintain playingItem state at end of schedule (setSchedulePosition(-1) called to end program)