stormcloud-video-player 0.6.13 → 0.6.14

package/lib/player/StormcloudVideoPlayer.cjs

@@ -3730,7 +3730,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         _this.adLayer.showPlaceholder();
                     }
                     if (_this.inAdBreak && _this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
-                        _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                        _this.scheduleAdStopAtBreakBoundary();
                         if (_this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Starting ad break timer on content_pause (first ad starting)");
                         }
@@ -4164,12 +4164,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         if (marker.durationSeconds != null) {
                             var newDurationMs = marker.durationSeconds * 1e3;
                             if (this.expectedAdBreakDurationMs == null || newDurationMs > this.expectedAdBreakDurationMs) {
-                                this.expectedAdBreakDurationMs = newDurationMs;
-                                var elapsedMs = this.currentAdBreakStartWallClockMs != null ? Date.now() - this.currentAdBreakStartWallClockMs : 0;
-                                var remainingMs = Math.max(0, newDurationMs - elapsedMs);
-                                this.scheduleAdStopCountdown(remainingMs);
+                                this.setAdBreakDurationBoundary(newDurationMs);
+                                this.scheduleAdStopAtBreakBoundary();
                                 if (this.config.debugAdTiming) {
-                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(remainingMs, "ms"));
+                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(this.getRemainingAdMs(), "ms"));
                                 }
                             }
                         }
@@ -4177,8 +4175,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     }
                     this.inAdBreak = true;
                     var durationMs = marker.durationSeconds != null ? marker.durationSeconds * 1e3 : ((_this_pendingAdBreak = this.pendingAdBreak) === null || _this_pendingAdBreak === void 0 ? void 0 : _this_pendingAdBreak.marker.durationSeconds) != null ? this.pendingAdBreak.marker.durationSeconds * 1e3 : void 0;
-                    this.expectedAdBreakDurationMs = durationMs;
-                    this.currentAdBreakStartWallClockMs = Date.now();
+                    this.currentAdBreakStartWallClockMs = this.resolveScteBreakStartWallClockMs(marker);
+                    this.setAdBreakDurationBoundary(durationMs);
                     if (this.config.licenseKey) {
                         var _this_pendingAdBreak1;
                         var adDetectInfo = _object_spread({
@@ -4242,20 +4240,14 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         this.clearAdStartTimer();
                         this.handleAdStart(marker);
                     }
-                    if (this.expectedAdBreakDurationMs != null) {
-                        this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
-                    }
+                    this.scheduleAdStopAtBreakBoundary();
                     return;
                 }
                 if (marker.type === "progress" && this.inAdBreak) {
                     if (marker.durationSeconds != null) {
-                        this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
-                    }
-                    if (this.expectedAdBreakDurationMs != null && this.currentAdBreakStartWallClockMs != null) {
-                        var elapsedMs1 = Date.now() - this.currentAdBreakStartWallClockMs;
-                        var remainingMs1 = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs1);
-                        this.scheduleAdStopCountdown(remainingMs1);
+                        this.setAdBreakDurationBoundary(marker.durationSeconds * 1e3);
                     }
+                    this.scheduleAdStopAtBreakBoundary();
                     if (!this.adLayer.isAdPlaying() && this.pendingNextAdBids != null && this.pendingNextAdBids.length > 0) {
                         var bids = this.pendingNextAdBids;
                         this.pendingNextAdBids = null;
@@ -4286,15 +4278,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }
                         return;
                     }
-                    if (adPlaying || remaining > 500) {
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Ignoring premature SCTE-35 end marker - ads still active or time remaining");
-                        }
-                        return;
-                    }
-                    this.inAdBreak = false;
-                    this.expectedAdBreakDurationMs = void 0;
-                    this.currentAdBreakStartWallClockMs = void 0;
+                    this.scteAdBreakEndWallClockMs = Date.now();
                     this.clearAdStartTimer();
                     this.clearAdStopTimer();
                     if (adPlaying) {
@@ -4305,6 +4289,42 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "resolveScteBreakStartWallClockMs",
+            value: function resolveScteBreakStartWallClockMs(marker) {
+                var nowWallClockMs = Date.now();
+                if (typeof marker.ptsSeconds !== "number") {
+                    return nowWallClockMs;
+                }
+                var nowMs = this.video.currentTime * 1e3;
+                var estimatedCurrentPtsMs = nowMs - this.ptsDriftEmaMs;
+                var deltaMs = marker.ptsSeconds * 1e3 - estimatedCurrentPtsMs;
+                if (!Number.isFinite(deltaMs)) {
+                    return nowWallClockMs;
+                }
+                return nowWallClockMs + Math.floor(deltaMs);
+            }
+        },
+        {
+            key: "setAdBreakDurationBoundary",
+            value: function setAdBreakDurationBoundary(durationMs) {
+                this.expectedAdBreakDurationMs = durationMs;
+                if (durationMs != null && this.currentAdBreakStartWallClockMs != null) {
+                    this.scteAdBreakEndWallClockMs = this.currentAdBreakStartWallClockMs + durationMs;
+                } else {
+                    this.scteAdBreakEndWallClockMs = void 0;
+                }
+            }
+        },
+        {
+            key: "scheduleAdStopAtBreakBoundary",
+            value: function scheduleAdStopAtBreakBoundary() {
+                if (this.expectedAdBreakDurationMs == null) {
+                    return;
+                }
+                this.scheduleAdStopCountdown(this.getRemainingAdMs());
+            }
+        },
         {
             key: "parseCueOutDuration",
             value: function parseCueOutDuration(value) {
@@ -4940,7 +4960,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                             case 9:
                                                 _state.sent();
                                                 if (_this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
-                                                    _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                                                    _this.scheduleAdStopAtBreakBoundary();
                                                 }
                                                 _this.adLayer.setAdVolume(_this.adLayer.getOriginalMutedState() ? 1 : _this.adLayer.getOriginalVolume());
                                                 return [
@@ -5045,7 +5065,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                             case 19:
                                                 _state.sent();
                                                 if (_this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
-                                                    _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                                                    _this.scheduleAdStopAtBreakBoundary();
                                                 }
                                                 _this.adLayer.setAdVolume(_this.adLayer.getOriginalMutedState() ? 1 : _this.adLayer.getOriginalVolume());
                                                 _state.label = 20;
@@ -5128,7 +5148,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "handleAdStart",
             value: function handleAdStart(_marker) {
                 return _async_to_generator(function() {
-                    var _this_savedMutedStateBeforeScte, adBreakDurationMs, mode, state, adBreakToken, adVolume, token, remaining, err;
+                    var _this_savedMutedStateBeforeScte, adBreakDurationMs, mode, state, fillerRemainingMs, adBreakToken, adVolume, token, remaining, err;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -5162,20 +5182,21 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     }
                                 }
                                 this.inAdBreak = true;
-                                this.currentAdBreakStartWallClockMs = Date.now();
                                 this.currentAdIndex = 0;
                                 this.totalAdsInBreak = Math.max(1, this.preloadedTokens.length);
                                 this.adPodQueue = [];
                                 if (!this.config.disableFiller) this.showAds = true;
-                                if (adBreakDurationMs != null) {
-                                    this.startFillerBreakTimer(adBreakDurationMs);
+                                if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
+                                    this.currentAdBreakStartWallClockMs = Date.now();
+                                    this.setAdBreakDurationBoundary(adBreakDurationMs);
+                                }
+                                fillerRemainingMs = this.getRemainingAdMs();
+                                if (this.expectedAdBreakDurationMs != null && fillerRemainingMs > 0) {
+                                    this.startFillerBreakTimer(fillerRemainingMs);
                                 } else if (!this.config.disableFiller && this.preloadedTokens.length === 0) {
                                     this.showPlaceholderLayer();
                                 }
                                 if (!this.config.disableFiller) this.adLayer.showPlaceholder();
-                                if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
-                                    this.expectedAdBreakDurationMs = adBreakDurationMs;
-                                }
                                 this.clearPendingAdBreak();
                                 adBreakToken = Date.now();
                                 this.activeAdRequestToken = adBreakToken;
@@ -5212,7 +5233,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 2:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adLayer.setAdVolume(adVolume);
                                 return [
@@ -5398,7 +5419,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 4:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adLayer.setAdVolume(this.adLayer.getOriginalMutedState() ? 1 : this.adLayer.getOriginalVolume());
                                 _state.label = 5;
@@ -5640,21 +5661,16 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "ensureAdStoppedByTimer",
             value: function ensureAdStoppedByTimer() {
-                var _this_config_adBreakCheckIntervalMs, _this_expectedAdBreakDurationMs;
+                var _this_config_adBreakCheckIntervalMs, _this_getAdBreakEndWallClockMs;
                 if (!this.inAdBreak) return;
                 this.adStopTimerId = void 0;
                 var adPlaying = this.adLayer.isAdPlaying();
-                var pendingAds = this.adPodQueue.length > 0;
                 var checkIntervalMs = Math.max(250, Math.floor((_this_config_adBreakCheckIntervalMs = this.config.adBreakCheckIntervalMs) !== null && _this_config_adBreakCheckIntervalMs !== void 0 ? _this_config_adBreakCheckIntervalMs : 1e3));
                 var maxExtensionMsConfig = this.config.maxAdBreakExtensionMs;
-                var maxExtensionMs = typeof maxExtensionMsConfig === "number" && maxExtensionMsConfig > 0 ? maxExtensionMsConfig : 6e4;
-                var elapsedSinceStartMs = 0;
-                if (this.currentAdBreakStartWallClockMs != null) {
-                    elapsedSinceStartMs = Date.now() - this.currentAdBreakStartWallClockMs;
-                }
-                var expectedDurationMs = (_this_expectedAdBreakDurationMs = this.expectedAdBreakDurationMs) !== null && _this_expectedAdBreakDurationMs !== void 0 ? _this_expectedAdBreakDurationMs : 0;
-                var overrunMs = Math.max(0, elapsedSinceStartMs - expectedDurationMs);
-                var shouldExtendAdBreak = (adPlaying || pendingAds || this.showAds) && overrunMs < maxExtensionMs;
+                var maxExtensionMs = typeof maxExtensionMsConfig === "number" && maxExtensionMsConfig > 0 ? maxExtensionMsConfig : 0;
+                var endWallClockMs = (_this_getAdBreakEndWallClockMs = this.getAdBreakEndWallClockMs()) !== null && _this_getAdBreakEndWallClockMs !== void 0 ? _this_getAdBreakEndWallClockMs : Date.now();
+                var overrunMs = Math.max(0, Date.now() - endWallClockMs);
+                var shouldExtendAdBreak = adPlaying && overrunMs < maxExtensionMs;
                 if (shouldExtendAdBreak) {
                     this.scheduleAdStopCountdown(checkIntervalMs);
                     return;
@@ -5728,6 +5744,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.inAdBreak = false;
                 this.expectedAdBreakDurationMs = void 0;
                 this.currentAdBreakStartWallClockMs = void 0;
+                this.scteAdBreakEndWallClockMs = void 0;
                 this.clearAdStartTimer();
                 this.clearAdStopTimer();
                 this.adPodQueue = [];
@@ -5989,10 +6006,25 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "getRemainingAdMs",
             value: function getRemainingAdMs() {
+                var endWallClockMs = this.getAdBreakEndWallClockMs();
+                if (endWallClockMs != null) {
+                    return Math.max(0, endWallClockMs - Date.now());
+                }
                 if (this.currentAdBreakStartWallClockMs == null) return 0;
                 if (this.expectedAdBreakDurationMs == null) return Number.MAX_SAFE_INTEGER;
-                var elapsed = Date.now() - this.currentAdBreakStartWallClockMs;
-                return Math.max(0, this.expectedAdBreakDurationMs - elapsed);
+                return 0;
+            }
+        },
+        {
+            key: "getAdBreakEndWallClockMs",
+            value: function getAdBreakEndWallClockMs() {
+                if (this.scteAdBreakEndWallClockMs != null) {
+                    return this.scteAdBreakEndWallClockMs;
+                }
+                if (this.expectedAdBreakDurationMs == null || this.currentAdBreakStartWallClockMs == null) {
+                    return void 0;
+                }
+                return this.currentAdBreakStartWallClockMs + this.expectedAdBreakDurationMs;
             }
         },
         {