stormcloud-video-player 0.6.4 → 0.6.5

package/lib/index.js

@@ -1037,6 +1037,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;
@@ -4000,12 +4008,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;
                     }
@@ -4086,9 +4099,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;