stormcloud-video-player 0.6.1 → 0.6.2

package/lib/player/StormcloudVideoPlayer.cjs

@@ -922,7 +922,7 @@ function resolveBidToVastAd(winner, logPrefix) {
     return Promise.resolve(null);
 }
 function createVastAdLayer(contentVideo, options) {
-    var _ref, _ref1, _ref2, _ref3;
+    var _ref, _ref1, _ref2, _ref3, _ref4;
     var adPlaying = false;
     var originalMutedState = false;
     var originalVolume = Math.max(0, Math.min(1, contentVideo.volume || 1));
@@ -931,7 +931,8 @@ function createVastAdLayer(contentVideo, options) {
     var continueLiveStreamDuringAds = (_ref = options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds) !== null && _ref !== void 0 ? _ref : false;
     var smartTVMode = (_ref1 = options === null || options === void 0 ? void 0 : options.smartTVMode) !== null && _ref1 !== void 0 ? _ref1 : false;
     var singleElementMode = (_ref2 = options === null || options === void 0 ? void 0 : options.singleElementMode) !== null && _ref2 !== void 0 ? _ref2 : false;
-    var debug = (_ref3 = options === null || options === void 0 ? void 0 : options.debug) !== null && _ref3 !== void 0 ? _ref3 : false;
+    var forceMP4Ads = (_ref3 = options === null || options === void 0 ? void 0 : options.forceMP4Ads) !== null && _ref3 !== void 0 ? _ref3 : smartTVMode || singleElementMode;
+    var debug = (_ref4 = options === null || options === void 0 ? void 0 : options.debug) !== null && _ref4 !== void 0 ? _ref4 : false;
     var adVideoElement;
     var adHls;
     var adContainerEl;
@@ -1002,14 +1003,26 @@ function createVastAdLayer(contentVideo, options) {
         var _ref;
         var _scoredFiles_;
         if (mediaFiles.length === 0) throw new Error("No media files available");
-        var firstFile = mediaFiles[0];
-        if (mediaFiles.length === 1) return firstFile;
+        var candidates = mediaFiles;
+        if (forceMP4Ads) {
+            var mp4Only = candidates.filter(function(f) {
+                return !isHlsMediaFile(f);
+            });
+            if (mp4Only.length > 0) {
+                candidates = mp4Only;
+                if (debug) console.log("".concat(LOG, " forceMP4Ads: filtered to ").concat(mp4Only.length, " MP4-only file(s)"));
+            } else if (debug) {
+                console.warn("".concat(LOG, " forceMP4Ads: no MP4 files available, falling back to all media files"));
+            }
+        }
+        var firstFile = candidates[0];
+        if (candidates.length === 1) return firstFile;
         var mainQuality = getMainStreamQuality();
         if (!mainQuality) {
             if (debug) console.log("".concat(LOG, " No main stream quality info, using first media file"));
             return firstFile;
         }
-        var scoredFiles = mediaFiles.map(function(file) {
+        var scoredFiles = candidates.map(function(file) {
             var widthDiff = Math.abs(file.width - mainQuality.width);
             var heightDiff = Math.abs(file.height - mainQuality.height);
             var resolutionDiff = widthDiff + heightDiff;
@@ -1226,6 +1239,16 @@ function createVastAdLayer(contentVideo, options) {
     }
     function startPlayback(mediaFile) {
         if (!adVideoElement) return;
+        if (singleElementMode && isHlsMediaFile(mediaFile)) {
+            var mp4Fallback = currentAd === null || currentAd === void 0 ? void 0 : currentAd.mediaFiles.find(function(f) {
+                return !isHlsMediaFile(f);
+            });
+            if (mp4Fallback) {
+                if (debug) console.log("".concat(LOG, " singleElementMode: HLS ad blocked, using MP4 fallback"));
+                startNativePlayback(mp4Fallback);
+                return;
+            }
+        }
         if (isHlsMediaFile(mediaFile)) {
             startHlsPlayback(mediaFile);
         } else {
@@ -2896,10 +2919,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             debug: !!config.debugAdTiming
         } : {});
         var browserForAdLayer = detectBrowser();
+        var isSinglePipeline = browserForAdLayer.isSmartTV || !!this.config.singlePipelineMode;
         this.adLayer = createVastAdLayer(this.video, {
             continueLiveStreamDuringAds: false,
-            smartTVMode: browserForAdLayer.isSmartTV,
-            singleElementMode: browserForAdLayer.isSmartTV,
+            smartTVMode: isSinglePipeline,
+            singleElementMode: isSinglePipeline,
+            forceMP4Ads: isSinglePipeline,
             debug: !!config.debugAdTiming
         });
     }
@@ -3545,6 +3570,16 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     if (_this.fillerVideo) {
                         _this.fillerVideo.style.display = "none";
                     }
+                    if (!_this.adLayer.isAdPlaying()) {
+                        if (_this.config.debugAdTiming) {
+                            console.log("[StormcloudVideoPlayer] Filler video failed \u2014 restoring main video");
+                        }
+                        _this.adLayer.hidePlaceholder();
+                        if (_this.video.paused && _this.video.readyState >= 2) {
+                            var _this_video_play;
+                            (_this_video_play = _this.video.play()) === null || _this_video_play === void 0 ? void 0 : _this_video_play.catch(function() {});
+                        }
+                    }
                 });
                 if (this.config.debugAdTiming) {
                     console.log("[StormcloudVideoPlayer] Showing filler video layer");
@@ -4261,6 +4296,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (!this.isLiveStream) {
                     return false;
                 }
+                if (this.config.singlePipelineMode) {
+                    return false;
+                }
                 var browser = detectBrowser();
                 if (browser.isSmartTV) {
                     return false;
@@ -5411,32 +5449,56 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.video.volume = restoredVolume;
                 }
                 var browser = detectBrowser();
-                var isSmartTV = browser.tizenVersion !== void 0 || browser.webOSVersion !== void 0;
+                var isSmartTV = browser.tizenVersion !== void 0 || browser.webOSVersion !== void 0 || !!this.config.singlePipelineMode;
                 if (isSmartTV && this.hls) {
                     var hlsRef = this.hls;
                     var savedMuted = restoredMuted;
                     var savedVolume = restoredVolume;
+                    var videoRef = this.video;
+                    var debugEnabled = this.config.debugAdTiming;
+                    var tryPlay = function tryPlay1(attempt) {
+                        var _videoRef_play;
+                        if (_this.inAdBreak || _this.adLayer.isAdPlaying()) return;
+                        (_videoRef_play = videoRef.play()) === null || _videoRef_play === void 0 ? void 0 : _videoRef_play.catch(function() {
+                            if (attempt < 3) {
+                                if (debugEnabled) {
+                                    console.log("[StormcloudVideoPlayer] Smart TV: play() retry ".concat(attempt + 1, "/3 in ").concat(500 * (attempt + 1), "ms"));
+                                }
+                                setTimeout(function() {
+                                    return tryPlay(attempt + 1);
+                                }, 500 * (attempt + 1));
+                            }
+                        });
+                    };
                     var onManifestParsedRestore = function onManifestParsedRestore1() {
                         hlsRef.off(import_hls2.default.Events.MANIFEST_PARSED, onManifestParsedRestore);
                         if (!_this.inAdBreak && !_this.adLayer.isAdPlaying()) {
-                            var _this_video_play;
-                            if (_this.video.muted !== savedMuted) _this.video.muted = savedMuted;
-                            if (Math.abs(_this.video.volume - savedVolume) > 0.01) _this.video.volume = savedVolume;
-                            if (_this.config.debugAdTiming) {
+                            if (videoRef.muted !== savedMuted) videoRef.muted = savedMuted;
+                            if (Math.abs(videoRef.volume - savedVolume) > 0.01) videoRef.volume = savedVolume;
+                            if (debugEnabled) {
                                 console.log("[StormcloudVideoPlayer] Smart TV: audio state restored on MANIFEST_PARSED after re-attach");
                             }
                             hlsRef.startLoad(-1);
-                            (_this_video_play = _this.video.play()) === null || _this_video_play === void 0 ? void 0 : _this_video_play.catch(function() {});
-                            if (_this.config.debugAdTiming) {
+                            tryPlay(0);
+                            if (debugEnabled) {
                                 console.log("[StormcloudVideoPlayer] Smart TV: seeking to live edge and resuming playback after re-attach");
                             }
                         }
                     };
                     hlsRef.on(import_hls2.default.Events.MANIFEST_PARSED, onManifestParsedRestore);
-                    this.hls.attachMedia(this.video);
-                    if (this.config.debugAdTiming) {
-                        console.log("[StormcloudVideoPlayer] Smart TV: re-attached HLS to video element after ad break to restore media pipeline");
+                    var pipelineDelayMs = 300;
+                    if (debugEnabled) {
+                        console.log("[StormcloudVideoPlayer] Smart TV: waiting ".concat(pipelineDelayMs, "ms for hardware pipeline release before re-attach"));
                     }
+                    setTimeout(function() {
+                        if (_this.inAdBreak || _this.adLayer.isAdPlaying()) return;
+                        if (_this.hls) {
+                            _this.hls.attachMedia(_this.video);
+                            if (debugEnabled) {
+                                console.log("[StormcloudVideoPlayer] Smart TV: re-attached HLS to video element after ad break to restore media pipeline");
+                            }
+                        }
+                    }, pipelineDelayMs);
                 } else {
                     if (this.shouldContinueLiveStreamDuringAds()) {
                         var _this_video_play;
@@ -5510,6 +5572,15 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     }
                     this.showPlaceholderLayer();
                     this.adLayer.showPlaceholder();
+                } else if (this.inAdBreak) {
+                    if (this.config.debugAdTiming) {
+                        console.log("[CONTINUOUS-FETCH] Ad failure with no filler \u2014 restoring main video temporarily");
+                    }
+                    this.adLayer.hidePlaceholder();
+                    if (!this.adLayer.isAdPlaying() && this.video.paused && this.video.readyState >= 2) {
+                        var _this_video_play;
+                        (_this_video_play = this.video.play()) === null || _this_video_play === void 0 ? void 0 : _this_video_play.catch(function() {});
+                    }
                 }
             }
         },