stormcloud-video-player 0.7.44 → 0.7.46

package/lib/index.d.cts

@@ -4081,14 +4081,6 @@ interface SwirlOverlay {
 }
 declare function timeStringToSeconds(timeStr: string): number;
 declare function isOverlayActive(overlay: SwirlOverlay, currentTime: number): boolean;
-declare const SWIRL_HD_AUTHORING_WIDTH = 1920;
-declare const SWIRL_HD_AUTHORING_HEIGHT = 1080;
-declare function overlayAuthoringDimensions(overlay: SwirlOverlay, decodeWidth: number, decodeHeight: number): {
-    width: number;
-    height: number;
-};
-declare function swirlProjectHasNabDemoMixedWithOther(overlays: SwirlOverlay[]): boolean;
-declare function inferSwirlOverlayCoordinateSpace(overlays: SwirlOverlay[], videoWidth: number, videoHeight: number): OverlayCoordinateSpace;
 declare function normalizeSwirlOverlay(raw: SwirlOverlay & Record<string, unknown>): SwirlOverlay;
 declare function fetchProjectOverlays(projectId: number, apiBaseUrl?: string): Promise<SwirlOverlay[]>;
 declare function resolveImageUrl(imageUrl: string, apiBaseUrl?: string): string;
@@ -4150,4 +4142,4 @@ interface AdStormAdLayer extends AdController {
 }
 declare function createAdStormPlayer(contentVideo: HTMLVideoElement, options: AdStormPlayerOptions): AdStormAdLayer;
 
-export { type AdBreak, type AdSchedule, type AdStormAdLayer, type AdStormLayerOptionsUpdate, type AdStormPlayerOptions, type BaseStormcloudPlayerProps, type BrowserInfo, type ClientInfo, type HeartbeatData, IS_BROWSER, IS_GLOBAL, IS_IOS, IS_SAFARI, type LateJoinPolicy, OVERLAY_API_BASE, type OnProgressProps, type OverlayCoordinateSpace, SUPPORTS_DASH, SUPPORTS_HLS, SWIRL_HD_AUTHORING_HEIGHT, SWIRL_HD_AUTHORING_WIDTH, StormcloudPlayer, StormcloudVideoPlayer, StormcloudVideoPlayerComponent, type StormcloudVideoPlayerConfig, type StormcloudVideoPlayerProps, type SwirlOverlay, type SwirlOverlayType, type SwirlScrollerConfig, type TrackingData, type VastBidResponse, canPlay, createAdStormPlayer, createStormcloudPlayer, StormcloudVideoPlayerComponent as default, detectBrowser, fetchProjectOverlays, getBrowserConfigOverrides, getBrowserID, getClientInfo, inferSwirlOverlayCoordinateSpace, initializePolyfills, isMediaStream, isOverlayActive, lazy, logBrowserInfo, merge, normalizeSwirlOverlay, omit, overlayAuthoringDimensions, parseQuery, players, randomString, resolveImageUrl, sendHeartbeat, sendInitialTracking, supportsFeature, supportsModernJS, supportsWebKitPresentationMode, swirlProjectHasNabDemoMixedWithOther, timeStringToSeconds };
+export { type AdBreak, type AdSchedule, type AdStormAdLayer, type AdStormLayerOptionsUpdate, type AdStormPlayerOptions, type BaseStormcloudPlayerProps, type BrowserInfo, type ClientInfo, type HeartbeatData, IS_BROWSER, IS_GLOBAL, IS_IOS, IS_SAFARI, type LateJoinPolicy, OVERLAY_API_BASE, type OnProgressProps, type OverlayCoordinateSpace, SUPPORTS_DASH, SUPPORTS_HLS, StormcloudPlayer, StormcloudVideoPlayer, StormcloudVideoPlayerComponent, type StormcloudVideoPlayerConfig, type StormcloudVideoPlayerProps, type SwirlOverlay, type SwirlOverlayType, type SwirlScrollerConfig, type TrackingData, type VastBidResponse, canPlay, createAdStormPlayer, createStormcloudPlayer, StormcloudVideoPlayerComponent as default, detectBrowser, fetchProjectOverlays, getBrowserConfigOverrides, getBrowserID, getClientInfo, initializePolyfills, isMediaStream, isOverlayActive, lazy, logBrowserInfo, merge, normalizeSwirlOverlay, omit, parseQuery, players, randomString, resolveImageUrl, sendHeartbeat, sendInitialTracking, supportsFeature, supportsModernJS, supportsWebKitPresentationMode, timeStringToSeconds };

package/lib/index.d.ts

@@ -4081,14 +4081,6 @@ interface SwirlOverlay {
 }
 declare function timeStringToSeconds(timeStr: string): number;
 declare function isOverlayActive(overlay: SwirlOverlay, currentTime: number): boolean;
-declare const SWIRL_HD_AUTHORING_WIDTH = 1920;
-declare const SWIRL_HD_AUTHORING_HEIGHT = 1080;
-declare function overlayAuthoringDimensions(overlay: SwirlOverlay, decodeWidth: number, decodeHeight: number): {
-    width: number;
-    height: number;
-};
-declare function swirlProjectHasNabDemoMixedWithOther(overlays: SwirlOverlay[]): boolean;
-declare function inferSwirlOverlayCoordinateSpace(overlays: SwirlOverlay[], videoWidth: number, videoHeight: number): OverlayCoordinateSpace;
 declare function normalizeSwirlOverlay(raw: SwirlOverlay & Record<string, unknown>): SwirlOverlay;
 declare function fetchProjectOverlays(projectId: number, apiBaseUrl?: string): Promise<SwirlOverlay[]>;
 declare function resolveImageUrl(imageUrl: string, apiBaseUrl?: string): string;
@@ -4150,4 +4142,4 @@ interface AdStormAdLayer extends AdController {
 }
 declare function createAdStormPlayer(contentVideo: HTMLVideoElement, options: AdStormPlayerOptions): AdStormAdLayer;
 
-export { type AdBreak, type AdSchedule, type AdStormAdLayer, type AdStormLayerOptionsUpdate, type AdStormPlayerOptions, type BaseStormcloudPlayerProps, type BrowserInfo, type ClientInfo, type HeartbeatData, IS_BROWSER, IS_GLOBAL, IS_IOS, IS_SAFARI, type LateJoinPolicy, OVERLAY_API_BASE, type OnProgressProps, type OverlayCoordinateSpace, SUPPORTS_DASH, SUPPORTS_HLS, SWIRL_HD_AUTHORING_HEIGHT, SWIRL_HD_AUTHORING_WIDTH, StormcloudPlayer, StormcloudVideoPlayer, StormcloudVideoPlayerComponent, type StormcloudVideoPlayerConfig, type StormcloudVideoPlayerProps, type SwirlOverlay, type SwirlOverlayType, type SwirlScrollerConfig, type TrackingData, type VastBidResponse, canPlay, createAdStormPlayer, createStormcloudPlayer, StormcloudVideoPlayerComponent as default, detectBrowser, fetchProjectOverlays, getBrowserConfigOverrides, getBrowserID, getClientInfo, inferSwirlOverlayCoordinateSpace, initializePolyfills, isMediaStream, isOverlayActive, lazy, logBrowserInfo, merge, normalizeSwirlOverlay, omit, overlayAuthoringDimensions, parseQuery, players, randomString, resolveImageUrl, sendHeartbeat, sendInitialTracking, supportsFeature, supportsModernJS, supportsWebKitPresentationMode, swirlProjectHasNabDemoMixedWithOther, timeStringToSeconds };
+export { type AdBreak, type AdSchedule, type AdStormAdLayer, type AdStormLayerOptionsUpdate, type AdStormPlayerOptions, type BaseStormcloudPlayerProps, type BrowserInfo, type ClientInfo, type HeartbeatData, IS_BROWSER, IS_GLOBAL, IS_IOS, IS_SAFARI, type LateJoinPolicy, OVERLAY_API_BASE, type OnProgressProps, type OverlayCoordinateSpace, SUPPORTS_DASH, SUPPORTS_HLS, StormcloudPlayer, StormcloudVideoPlayer, StormcloudVideoPlayerComponent, type StormcloudVideoPlayerConfig, type StormcloudVideoPlayerProps, type SwirlOverlay, type SwirlOverlayType, type SwirlScrollerConfig, type TrackingData, type VastBidResponse, canPlay, createAdStormPlayer, createStormcloudPlayer, StormcloudVideoPlayerComponent as default, detectBrowser, fetchProjectOverlays, getBrowserConfigOverrides, getBrowserID, getClientInfo, initializePolyfills, isMediaStream, isOverlayActive, lazy, logBrowserInfo, merge, normalizeSwirlOverlay, omit, parseQuery, players, randomString, resolveImageUrl, sendHeartbeat, sendInitialTracking, supportsFeature, supportsModernJS, supportsWebKitPresentationMode, timeStringToSeconds };

package/lib/index.js

@@ -5701,186 +5701,6 @@ function isOverlayActive(overlay, currentTime) {
     if (durationSec <= 0) return false;
     return currentTime >= startSec && currentTime < startSec + durationSec;
 }
-var SWIRL_HD_AUTHORING_WIDTH = 1920;
-var SWIRL_HD_AUTHORING_HEIGHT = 1080;
-var NAB_DEMO_NAME_PREFIX = "NAB Demo \u2014 ";
-function overlayAuthoringDimensions(overlay, decodeWidth, decodeHeight) {
-    if (overlay.name.startsWith(NAB_DEMO_NAME_PREFIX)) {
-        return {
-            width: SWIRL_HD_AUTHORING_WIDTH,
-            height: SWIRL_HD_AUTHORING_HEIGHT
-        };
-    }
-    if (!decodeWidth || !decodeHeight) {
-        return {
-            width: decodeWidth || SWIRL_HD_AUTHORING_WIDTH,
-            height: decodeHeight || SWIRL_HD_AUTHORING_HEIGHT
-        };
-    }
-    return {
-        width: decodeWidth,
-        height: decodeHeight
-    };
-}
-function overlayExtents(overlays) {
-    var maxR = 0;
-    var maxB = 0;
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = overlays[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var o = _step.value;
-            if (!o.visible) continue;
-            maxR = Math.max(maxR, o.x + o.width);
-            maxB = Math.max(maxB, o.y + o.height);
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return {
-        maxR: maxR,
-        maxB: maxB
-    };
-}
-function swirlProjectHasNabDemoMixedWithOther(overlays) {
-    var hasNab = false;
-    var hasOther = false;
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = overlays[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var o = _step.value;
-            if (!o.visible) continue;
-            if (o.name.startsWith(NAB_DEMO_NAME_PREFIX)) hasNab = true;
-            else hasOther = true;
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return hasNab && hasOther;
-}
-var STANDARD_16_9_LADDER = [
-    {
-        width: 384,
-        height: 216
-    },
-    {
-        width: 640,
-        height: 360
-    },
-    {
-        width: 854,
-        height: 480
-    },
-    {
-        width: 1280,
-        height: 720
-    },
-    {
-        width: 1920,
-        height: 1080
-    },
-    {
-        width: 2560,
-        height: 1440
-    },
-    {
-        width: 3840,
-        height: 2160
-    }
-];
-function smallestLadderRungContaining(maxR, maxB, eps) {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = STANDARD_16_9_LADDER[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var rung = _step.value;
-            if (maxR <= rung.width + eps && maxB <= rung.height + eps) return rung;
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return null;
-}
-function inferSwirlOverlayCoordinateSpace(overlays, videoWidth, videoHeight) {
-    if (!videoWidth || !videoHeight) {
-        return {
-            width: videoWidth || SWIRL_HD_AUTHORING_WIDTH,
-            height: videoHeight || SWIRL_HD_AUTHORING_HEIGHT
-        };
-    }
-    if (!overlays.length) {
-        return {
-            width: videoWidth,
-            height: videoHeight
-        };
-    }
-    var _overlayExtents = overlayExtents(overlays), maxR = _overlayExtents.maxR, maxB = _overlayExtents.maxB;
-    var EPS = 1;
-    if (maxR <= 0 || maxB <= 0) {
-        return {
-            width: videoWidth,
-            height: videoHeight
-        };
-    }
-    var mixed = swirlProjectHasNabDemoMixedWithOther(overlays);
-    var fitsHdCanvas = maxR <= SWIRL_HD_AUTHORING_WIDTH + EPS && maxB <= SWIRL_HD_AUTHORING_HEIGHT + EPS;
-    var exceedsDecode = maxR > videoWidth + EPS || maxB > videoHeight + EPS;
-    var decodeLargerThanHd = videoWidth > SWIRL_HD_AUTHORING_WIDTH + EPS || videoHeight > SWIRL_HD_AUTHORING_HEIGHT + EPS;
-    if (fitsHdCanvas && (decodeLargerThanHd || exceedsDecode && !mixed)) {
-        return {
-            width: SWIRL_HD_AUTHORING_WIDTH,
-            height: SWIRL_HD_AUTHORING_HEIGHT
-        };
-    }
-    if (mixed) {
-        return {
-            width: videoWidth,
-            height: videoHeight
-        };
-    }
-    var rung = smallestLadderRungContaining(maxR, maxB, EPS);
-    if (rung && rung.width < videoWidth - EPS && rung.height < videoHeight - EPS) {
-        return {
-            width: rung.width,
-            height: rung.height
-        };
-    }
-    return {
-        width: videoWidth,
-        height: videoHeight
-    };
-}
 function normalizeScrollerConfig(raw) {
     if (!raw || (typeof raw === "undefined" ? "undefined" : _type_of(raw)) !== "object") return void 0;
     var r = raw;
@@ -7764,13 +7584,8 @@ var OverlayRenderer = function OverlayRenderer(param) {
         },
         children: _to_consumable_array(fadeMap.values()).map(function(param) {
             var overlay = param.overlay, visible = param.visible;
-            var uniform = coordinateSpace && coordinateSpace.width > 0 && coordinateSpace.height > 0;
-            var auth = uniform ? {
-                width: coordinateSpace.width,
-                height: coordinateSpace.height
-            } : overlayAuthoringDimensions(overlay, dims.nativeWidth, dims.nativeHeight);
-            var scaleX = dims.displayWidth / auth.width;
-            var scaleY = dims.displayHeight / auth.height;
+            var scaleX = (coordinateSpace === null || coordinateSpace === void 0 ? void 0 : coordinateSpace.width) ? dims.displayWidth / coordinateSpace.width : dims.scaleX;
+            var scaleY = (coordinateSpace === null || coordinateSpace === void 0 ? void 0 : coordinateSpace.height) ? dims.displayHeight / coordinateSpace.height : dims.scaleY;
             var left = overlay.x * scaleX;
             var top = overlay.y * scaleY;
             var width = overlay.width * scaleX;
@@ -8292,9 +8107,10 @@ var StormcloudVideoPlayerComponent = React2.memo(function(props) {
         var _playerRef_current;
         if (!swirlProjectId) return;
         var tryResolve = function tryResolve() {
-            var _ref, _ref1;
+            var _player_getMinHlsResolution;
             var fixed = swirlOverlayCoordinateSpace;
             if (fixed && fixed.width > 0 && fixed.height > 0) {
+                console.debug("[StormcloudVideoPlayer] overlay coord space (prop):", fixed.width, "x", fixed.height);
                 setOverlayCoordSpace({
                     width: fixed.width,
                     height: fixed.height
@@ -8303,27 +8119,25 @@ var StormcloudVideoPlayerComponent = React2.memo(function(props) {
             }
             var player = playerRef.current;
             if (!player) return false;
+            var minRes = (_player_getMinHlsResolution = player.getMinHlsResolution) === null || _player_getMinHlsResolution === void 0 ? void 0 : _player_getMinHlsResolution.call(player);
+            if (minRes && minRes.width > 0 && minRes.height > 0) {
+                console.debug("[StormcloudVideoPlayer] overlay coord space (minHlsResolution):", minRes.width, "x", minRes.height);
+                setOverlayCoordSpace({
+                    width: minRes.width,
+                    height: minRes.height
+                });
+                return true;
+            }
             var video2 = player.videoElement;
-            var vw = (_ref = video2 === null || video2 === void 0 ? void 0 : video2.videoWidth) !== null && _ref !== void 0 ? _ref : 0;
-            var vh = (_ref1 = video2 === null || video2 === void 0 ? void 0 : video2.videoHeight) !== null && _ref1 !== void 0 ? _ref1 : 0;
-            if (!vw || !vh) {
-                var _player_getMaxHlsResolution;
-                var maxRes = (_player_getMaxHlsResolution = player.getMaxHlsResolution) === null || _player_getMaxHlsResolution === void 0 ? void 0 : _player_getMaxHlsResolution.call(player);
-                if (maxRes && maxRes.width > 0 && maxRes.height > 0) {
-                    vw = maxRes.width;
-                    vh = maxRes.height;
-                } else {
-                    var _player_getMinHlsResolution;
-                    var minRes = (_player_getMinHlsResolution = player.getMinHlsResolution) === null || _player_getMinHlsResolution === void 0 ? void 0 : _player_getMinHlsResolution.call(player);
-                    if (minRes && minRes.width > 0 && minRes.height > 0) {
-                        vw = minRes.width;
-                        vh = minRes.height;
-                    }
-                }
+            if (video2 && video2.videoWidth > 0 && video2.videoHeight > 0) {
+                console.debug("[StormcloudVideoPlayer] overlay coord space (videoNative):", video2.videoWidth, "x", video2.videoHeight);
+                setOverlayCoordSpace({
+                    width: video2.videoWidth,
+                    height: video2.videoHeight
+                });
+                return true;
             }
-            if (!vw || !vh) return false;
-            setOverlayCoordSpace(inferSwirlOverlayCoordinateSpace(overlays, vw, vh));
-            return true;
+            return false;
         };
         var attempts = 0;
         var maxAttempts = 40;
@@ -8349,8 +8163,7 @@ var StormcloudVideoPlayerComponent = React2.memo(function(props) {
     }, [
         swirlProjectId,
         criticalPropsKey,
-        swirlOverlayCoordinateSpace,
-        overlays
+        swirlOverlayCoordinateSpace
     ]);
     useEffect2(function() {
         if (!playerRef.current) return;
@@ -8777,11 +8590,11 @@ var StormcloudVideoPlayerComponent = React2.memo(function(props) {
                     }, restVideoAttrs), {
                         children: children
                     })),
-                    displayOverlays.length > 0 && !adStatus.showAds && !overlaysDisabled && /* @__PURE__ */ jsx2(OverlayRenderer, {
+                    displayOverlays.length > 0 && !adStatus.showAds && !overlaysDisabled && overlayCoordSpace && /* @__PURE__ */ jsx2(OverlayRenderer, {
                         overlays: displayOverlays,
                         currentTime: currentTime,
                         videoRef: videoRef,
-                        coordinateSpace: swirlOverlayCoordinateSpace && swirlOverlayCoordinateSpace.width > 0 && swirlOverlayCoordinateSpace.height > 0 ? swirlOverlayCoordinateSpace : null,
+                        coordinateSpace: overlayCoordSpace,
                         showcaseMode: !!swirlShowcaseDemo
                     }),
                     (isLoading || isBuffering) && !hideLoadingIndicator && /* @__PURE__ */ jsxs2("div", {
@@ -11379,5 +11192,5 @@ var createStormcloudPlayer = function createStormcloudPlayer(playerList, fallbac
 };
 var StormcloudPlayer = createStormcloudPlayer(players_default, players_default[players_default.length - 1]);
 var StormcloudPlayer_default = StormcloudPlayer;
-export { IS_BROWSER, IS_GLOBAL, IS_IOS, IS_SAFARI, OVERLAY_API_BASE, SUPPORTS_DASH, SUPPORTS_HLS, SWIRL_HD_AUTHORING_HEIGHT, SWIRL_HD_AUTHORING_WIDTH, StormcloudPlayer_default as StormcloudPlayer, StormcloudVideoPlayer, StormcloudVideoPlayerComponent, canPlay, createAdStormPlayer, createStormcloudPlayer, StormcloudVideoPlayerComponent as default, detectBrowser, fetchProjectOverlays, getBrowserConfigOverrides, getBrowserID, getClientInfo, inferSwirlOverlayCoordinateSpace, initializePolyfills, isMediaStream, isOverlayActive, lazy, logBrowserInfo, merge, normalizeSwirlOverlay, omit, overlayAuthoringDimensions, parseQuery, players_default as players, randomString, resolveImageUrl, sendHeartbeat, sendInitialTracking, supportsFeature, supportsModernJS, supportsWebKitPresentationMode, swirlProjectHasNabDemoMixedWithOther, timeStringToSeconds };
+export { IS_BROWSER, IS_GLOBAL, IS_IOS, IS_SAFARI, OVERLAY_API_BASE, SUPPORTS_DASH, SUPPORTS_HLS, StormcloudPlayer_default as StormcloudPlayer, StormcloudVideoPlayer, StormcloudVideoPlayerComponent, canPlay, createAdStormPlayer, createStormcloudPlayer, StormcloudVideoPlayerComponent as default, detectBrowser, fetchProjectOverlays, getBrowserConfigOverrides, getBrowserID, getClientInfo, initializePolyfills, isMediaStream, isOverlayActive, lazy, logBrowserInfo, merge, normalizeSwirlOverlay, omit, parseQuery, players_default as players, randomString, resolveImageUrl, sendHeartbeat, sendInitialTracking, supportsFeature, supportsModernJS, supportsWebKitPresentationMode, timeStringToSeconds };
 //# sourceMappingURL=index.js.map