hls.js 1.6.0-beta.1.0.canary.10821 → 1.6.0-beta.1.0.canary.10824

package/dist/hls.js

@@ -1058,7 +1058,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.6.0-beta.1.0.canary.10821");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10824");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16297,7 +16297,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10821";
+  var version = "1.6.0-beta.1.0.canary.10824";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -22773,8 +22773,7 @@
     return (hash >>> 0).toString();
   }
 
-  var ALIGNED_END_THRESHOLD_SECONDS = 0.02; // 0.1 // 0.2
-
+  var ALIGNED_END_THRESHOLD_SECONDS = 0.02;
   var TimelineOccupancy = /*#__PURE__*/function (TimelineOccupancy) {
     TimelineOccupancy[TimelineOccupancy["Point"] = 0] = "Point";
     TimelineOccupancy[TimelineOccupancy["Range"] = 1] = "Range";
@@ -23176,19 +23175,23 @@
   }();
 
   var ABUTTING_THRESHOLD_SECONDS = 0.033;
-  var InterstitialsSchedule = /*#__PURE__*/function () {
-    function InterstitialsSchedule(onScheduleUpdate) {
-      this.onScheduleUpdate = void 0;
-      this.eventMap = {};
-      this.events = null;
-      this.items = null;
-      this.durations = {
+  var InterstitialsSchedule = /*#__PURE__*/function (_Logger) {
+    function InterstitialsSchedule(onScheduleUpdate, logger) {
+      var _this;
+      _this = _Logger.call(this, 'interstitials-sched', logger) || this;
+      _this.onScheduleUpdate = void 0;
+      _this.eventMap = {};
+      _this.events = null;
+      _this.items = null;
+      _this.durations = {
         primary: 0,
         playout: 0,
         integrated: 0
       };
-      this.onScheduleUpdate = onScheduleUpdate;
+      _this.onScheduleUpdate = onScheduleUpdate;
+      return _this;
     }
+    _inheritsLoose(InterstitialsSchedule, _Logger);
     var _proto = InterstitialsSchedule.prototype;
     _proto.destroy = function destroy() {
       this.reset();
@@ -23298,7 +23301,7 @@
       return 0;
     };
     _proto.parseInterstitialDateRanges = function parseInterstitialDateRanges(mediaSelection) {
-      var _this = this;
+      var _this2 = this;
       var details = mediaSelection.main.details;
       var dateRanges = details.dateRanges;
       var previousInterstitialEvents = this.events;
@@ -23343,7 +23346,7 @@
 
       // Clear removed DateRanges from buffered list (kills playback of active Interstitials)
       removedInterstitials.forEach(function (interstitial) {
-        _this.removeEvent(interstitial);
+        _this2.removeEvent(interstitial);
       });
       this.updateSchedule(mediaSelection, removedInterstitials);
     };
@@ -23554,7 +23557,7 @@
       };
     };
     _proto.resolveOffsets = function resolveOffsets(interstitialEvents, mediaSelection) {
-      var _this2 = this;
+      var _this3 = this;
       var details = mediaSelection.main.details;
       var primaryDuration = details.live ? Infinity : details.edge;
 
@@ -23565,7 +23568,7 @@
         var preroll = interstitial.cue.pre;
         var postroll = interstitial.cue.post;
         var eventStart = preroll ? 0 : postroll ? primaryDuration : interstitial.startTime;
-        _this2.updateAssetDurations(interstitial);
+        _this3.updateAssetDurations(interstitial);
 
         // X-RESUME-OFFSET values of interstitials scheduled at the same time are cumulative
         var inSameStartTimeSequence = lastScheduledStart === eventStart;
@@ -23581,7 +23584,7 @@
         }
         // Check if primary fragments align with resumption offset and disable appendInPlace if they do not
         if (interstitial.appendInPlace && !interstitial.appendInPlaceStarted) {
-          var alignedSegmentStart = _this2.primaryCanResumeInPlaceAt(interstitial, mediaSelection);
+          var alignedSegmentStart = _this3.primaryCanResumeInPlaceAt(interstitial, mediaSelection);
           if (!alignedSegmentStart) {
             interstitial.appendInPlace = false;
           }
@@ -23601,31 +23604,33 @@
       });
     };
     _proto.primaryCanResumeInPlaceAt = function primaryCanResumeInPlaceAt(interstitial, mediaSelection) {
+      var _this4 = this;
       var resumeTime = interstitial.resumeTime;
       var 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(function (playlistType) {
         var details = mediaSelection[playlistType].details;
         var playlistEnd = details.edge;
         if (resumeTime > playlistEnd) {
-          logger.log("Interstitial resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
+          _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " past " + playlistType + " playlist end " + playlistEnd);
           return true;
         }
         var startFragment = findFragmentByPTS(null, details.fragments, resumeTime);
         if (!startFragment) {
-          logger.log("Interstitial resumption " + resumeTime + " does not overlap with any fragments in " + playlistType + " playlist");
+          _this4.log("\"" + interstitial.identifier + "\" resumption " + resumeTime + " does not align with any fragments in " + playlistType + " playlist");
           return true;
         }
-        var alignedWithSegment = Math.abs(startFragment.start - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS || Math.abs(startFragment.end - resumeTime) < ALIGNED_END_THRESHOLD_SECONDS;
+        var endAllowance = playlistType === 'audio' ? 0.175 : 0;
+        var 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 + ")");
+          _this4.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;
@@ -23682,7 +23687,7 @@
         return null;
       }
     }]);
-  }();
+  }(Logger);
   function segmentToString(segment) {
     return "[" + (segment.event ? '"' + segment.event.identifier + '"' : 'primary') + ": " + segment.start.toFixed(2) + "-" + segment.end.toFixed(2) + "]";
   }
@@ -23776,6 +23781,9 @@
     return AssetListLoader;
   }();
 
+  function playWithCatch(media) {
+    media == null ? void 0 : media.play().catch() /* no-op */;
+  }
   var InterstitialsController = /*#__PURE__*/function (_Logger) {
     function InterstitialsController(hls, HlsPlayerClass) {
       var _this;
@@ -23989,7 +23997,7 @@
       _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();
       return _this;
     }
@@ -24193,8 +24201,8 @@
         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: media
@@ -24416,14 +24424,12 @@
         }
         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)