stormcloud-video-player 0.6.4 → 0.6.6

package/lib/players/HlsPlayer.cjs

@@ -994,6 +994,7 @@ function createVastAdLayer(contentVideo, options) {
     var tornDown = false;
     var trackingFired = createEmptyTrackingState();
     var adStallTimerId;
+    var savedContentVideoStyles;
     var currentAdEventHandlers;
     var preloadSlots = /* @__PURE__ */ new Map();
     function emit(event, payload) {
@@ -1067,6 +1068,14 @@ function createVastAdLayer(contentVideo, options) {
             } else if (debug) {
                 console.warn("".concat(LOG, " forceMP4Ads: no MP4 files available, falling back to all media files"));
             }
+        } else {
+            var mp4Only1 = candidates.filter(function(f) {
+                return !isHlsMediaFile(f);
+            });
+            if (mp4Only1.length > 0) {
+                candidates = mp4Only1;
+                if (debug) console.log("".concat(LOG, " Preferring ").concat(mp4Only1.length, " MP4 file(s) over HLS (mp4-first)"));
+            }
         }
         var firstFile = candidates[0];
         if (candidates.length === 1) return firstFile;
@@ -1102,7 +1111,7 @@ function createVastAdLayer(contentVideo, options) {
         video.style.top = "0";
         video.style.width = "100%";
         video.style.height = "100%";
-        video.style.objectFit = "contain";
+        video.style.objectFit = "cover";
         video.style.backgroundColor = "#000";
         video.playsInline = true;
         video.muted = false;
@@ -1217,12 +1226,31 @@ function createVastAdLayer(contentVideo, options) {
             delete contentVideo.dataset.stormcloudAdPlaying;
         }
     }
+    function applyContentVideoAdCoverStyles() {
+        if (!singleElementMode) return;
+        savedContentVideoStyles = {
+            objectFit: contentVideo.style.objectFit,
+            width: contentVideo.style.width,
+            height: contentVideo.style.height
+        };
+        contentVideo.style.objectFit = "cover";
+        contentVideo.style.width = "100%";
+        contentVideo.style.height = "100%";
+    }
+    function restoreContentVideoStyles() {
+        if (!singleElementMode || !savedContentVideoStyles) return;
+        contentVideo.style.objectFit = savedContentVideoStyles.objectFit;
+        contentVideo.style.width = savedContentVideoStyles.width;
+        contentVideo.style.height = savedContentVideoStyles.height;
+        savedContentVideoStyles = void 0;
+    }
     function handleAdComplete() {
         if (tornDown) return;
         clearAdStallTimer();
         if (debug) console.log("".concat(LOG, " Handling ad completion"));
         adPlaying = false;
         setAdPlayingFlag(false);
+        restoreContentVideoStyles();
         if (adContainerEl) {
             adContainerEl.style.display = "none";
             adContainerEl.style.pointerEvents = "none";
@@ -1237,6 +1265,7 @@ function createVastAdLayer(contentVideo, options) {
         if (debug) console.log("".concat(LOG, " Handling ad error"));
         adPlaying = false;
         setAdPlayingFlag(false);
+        restoreContentVideoStyles();
         if (adContainerEl) {
             adContainerEl.style.display = "none";
             adContainerEl.style.pointerEvents = "none";
@@ -1407,6 +1436,7 @@ function createVastAdLayer(contentVideo, options) {
                         ];
                         contentVideo.style.visibility = "visible";
                         contentVideo.style.opacity = "1";
+                        applyContentVideoAdCoverStyles();
                         emit("content_pause");
                         setupAdEventListeners();
                         adVolume2 = originalMutedState ? 1 : originalVolume;
@@ -1645,6 +1675,7 @@ function createVastAdLayer(contentVideo, options) {
                         ];
                         contentVideo.style.visibility = "visible";
                         contentVideo.style.opacity = "1";
+                        applyContentVideoAdCoverStyles();
                         emit("content_pause");
                         setupAdEventListeners();
                         adVolume2 = originalMutedState ? 1 : originalVolume;
@@ -1795,6 +1826,7 @@ function createVastAdLayer(contentVideo, options) {
                     if (debug) console.log("".concat(LOG, " Stopping ad"));
                     adPlaying = false;
                     setAdPlayingFlag(false);
+                    restoreContentVideoStyles();
                     contentVideo.muted = originalMutedState;
                     contentVideo.volume = originalMutedState ? 0 : originalVolume;
                     contentVideo.style.visibility = "visible";
@@ -1833,6 +1865,7 @@ function createVastAdLayer(contentVideo, options) {
             destroyed = true;
             adPlaying = false;
             setAdPlayingFlag(false);
+            restoreContentVideoStyles();
             contentVideo.muted = originalMutedState;
             contentVideo.volume = originalVolume;
             var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -4002,12 +4035,17 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }
                     }
                     if (this.inAdBreak) {
-                        if (this.expectedAdBreakDurationMs == null && marker.durationSeconds != null) {
-                            this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
-                            if (this.config.debugAdTiming) {
-                                console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(this.expectedAdBreakDurationMs, "ms"));
+                        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);
+                                if (this.config.debugAdTiming) {
+                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(remainingMs, "ms"));
+                                }
                             }
-                            this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
                         }
                         return;
                     }
@@ -4088,9 +4126,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
                     }
                     if (this.expectedAdBreakDurationMs != null && this.currentAdBreakStartWallClockMs != null) {
-                        var elapsedMs = Date.now() - this.currentAdBreakStartWallClockMs;
-                        var remainingMs = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs);
-                        this.scheduleAdStopCountdown(remainingMs);
+                        var elapsedMs1 = Date.now() - this.currentAdBreakStartWallClockMs;
+                        var remainingMs1 = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs1);
+                        this.scheduleAdStopCountdown(remainingMs1);
                     }
                     if (!this.adLayer.isAdPlaying() && this.pendingNextAdBids != null && this.pendingNextAdBids.length > 0) {
                         var bids = this.pendingNextAdBids;