remotion 4.0.30 → 4.0.31

package/dist/cjs/audio/Audio.js

@@ -4,6 +4,7 @@ exports.Audio = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const absolute_src_js_1 = require("../absolute-src.js");
+const calculate_loop_js_1 = require("../calculate-loop.js");
 const cancel_render_js_1 = require("../cancel-render.js");
 const get_remotion_environment_js_1 = require("../get-remotion-environment.js");
 const index_js_1 = require("../loop/index.js");
@@ -29,7 +30,7 @@ const AudioRefForwardingFunction = (props, ref) => {
     const onError = (0, react_1.useCallback)((e) => {
         console.log(e.currentTarget.error);
         // If there is no `loop` property, we don't need to get the duration
-        // and thsi does not need to be a fatal error
+        // and this does not need to be a fatal error
         const errMessage = `Could not play audio with src ${otherProps.src}: ${e.currentTarget.error}. See https://remotion.dev/docs/media-playback-error for help.`;
         if (loop) {
             (0, cancel_render_js_1.cancelRender)(new Error(errMessage));
@@ -43,9 +44,12 @@ const AudioRefForwardingFunction = (props, ref) => {
     }, [setDurations]);
     if (loop && props.src && durations[(0, absolute_src_js_1.getAbsoluteSrc)(props.src)] !== undefined) {
         const duration = Math.floor(durations[(0, absolute_src_js_1.getAbsoluteSrc)(props.src)] * fps);
-        const playbackRate = (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1;
-        const actualDuration = duration / playbackRate;
-        return ((0, jsx_runtime_1.jsx)(index_js_1.Loop, { layout: "none", durationInFrames: Math.floor(actualDuration), children: (0, jsx_runtime_1.jsx)(exports.Audio, { ...propsOtherThanLoop, ref: ref }) }));
+        return ((0, jsx_runtime_1.jsx)(index_js_1.Loop, { layout: "none", durationInFrames: (0, calculate_loop_js_1.calculateLoopDuration)({
+                endAt,
+                mediaDuration: duration,
+                playbackRate: (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1,
+                startFrom,
+            }), children: (0, jsx_runtime_1.jsx)(exports.Audio, { ...propsOtherThanLoop, ref: ref }) }));
     }
     if (typeof startFrom !== 'undefined' || typeof endAt !== 'undefined') {
         (0, validate_start_from_props_js_1.validateStartFromProps)(startFrom, endAt);

package/dist/cjs/calculate-loop.d.ts

@@ -0,0 +1,6 @@
+export declare const calculateLoopDuration: ({ endAt, mediaDuration, playbackRate, startFrom, }: {
+    mediaDuration: number;
+    playbackRate: number;
+    startFrom: number | undefined;
+    endAt: number | undefined;
+}) => number;

package/dist/cjs/calculate-loop.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateLoopDuration = void 0;
+const calculateLoopDuration = ({ endAt, mediaDuration, playbackRate, startFrom, }) => {
+    let duration = mediaDuration;
+    // Account for endAt
+    if (typeof endAt !== 'undefined') {
+        duration = endAt;
+    }
+    // Account for startFrom
+    if (typeof startFrom !== 'undefined') {
+        duration -= startFrom;
+    }
+    const actualDuration = duration / playbackRate;
+    return Math.floor(actualDuration);
+};
+exports.calculateLoopDuration = calculateLoopDuration;

package/dist/cjs/get-environment.d.ts

@@ -0,0 +1,3 @@
+export type RemotionEnvironment = 'preview' | 'rendering' | 'player-development' | 'player-production';
+export declare const getRemotionEnvironment: () => RemotionEnvironment;
+export declare const useRemotionEnvironment: () => RemotionEnvironment;

package/dist/cjs/get-environment.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useRemotionEnvironment = exports.getRemotionEnvironment = void 0;
+const is_player_js_1 = require("./is-player.js");
+const getRemotionEnvironment = () => {
+    if (process.env.NODE_ENV === 'production') {
+        if (typeof window !== 'undefined' && window.remotion_isPlayer) {
+            return 'player-production';
+        }
+        return 'rendering';
+    }
+    // The Vitest framework sets NODE_ENV as test.
+    // Right now we don't need to treat it in a special
+    // way which is good - defaulting to `rendering`.
+    if (process.env.NODE_ENV === 'test') {
+        return 'rendering';
+    }
+    if (typeof window !== 'undefined' && window.remotion_isPlayer) {
+        return 'player-development';
+    }
+    return 'preview';
+};
+exports.getRemotionEnvironment = getRemotionEnvironment;
+const useRemotionEnvironment = () => {
+    const isPlayer = (0, is_player_js_1.useIsPlayer)();
+    if (isPlayer) {
+        if (process.env.NODE_ENV === 'production') {
+            return 'player-production';
+        }
+        return 'player-development';
+    }
+    return (0, exports.getRemotionEnvironment)();
+};
+exports.useRemotionEnvironment = useRemotionEnvironment;

package/dist/cjs/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.0.30";
+export declare const VERSION = "4.0.31";

package/dist/cjs/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // Automatically generated on publish
-exports.VERSION = '4.0.30';
+exports.VERSION = '4.0.31';

package/dist/cjs/video/Video.js

@@ -4,6 +4,7 @@ exports.Video = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const absolute_src_js_1 = require("../absolute-src.js");
+const calculate_loop_js_1 = require("../calculate-loop.js");
 const get_remotion_environment_js_1 = require("../get-remotion-environment.js");
 const index_js_1 = require("../loop/index.js");
 const Sequence_js_1 = require("../Sequence.js");
@@ -30,10 +31,13 @@ const VideoForwardingFunction = (props, ref) => {
         setDurations({ type: 'got-duration', durationInSeconds, src });
     }, [setDurations]);
     if (loop && props.src && durations[(0, absolute_src_js_1.getAbsoluteSrc)(props.src)] !== undefined) {
-        const naturalDuration = durations[(0, absolute_src_js_1.getAbsoluteSrc)(props.src)] * fps;
-        const playbackRate = (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1;
-        const durationInFrames = Math.floor(naturalDuration / playbackRate);
-        return ((0, jsx_runtime_1.jsx)(index_js_1.Loop, { durationInFrames: durationInFrames, children: (0, jsx_runtime_1.jsx)(exports.Video, { ...propsOtherThanLoop, ref: ref }) }));
+        const mediaDuration = durations[(0, absolute_src_js_1.getAbsoluteSrc)(props.src)] * fps;
+        return ((0, jsx_runtime_1.jsx)(index_js_1.Loop, { durationInFrames: (0, calculate_loop_js_1.calculateLoopDuration)({
+                endAt,
+                mediaDuration,
+                playbackRate: (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1,
+                startFrom,
+            }), children: (0, jsx_runtime_1.jsx)(exports.Video, { ...propsOtherThanLoop, ref: ref }) }));
     }
     if (typeof startFrom !== 'undefined' || typeof endAt !== 'undefined') {
         (0, validate_start_from_props_js_1.validateStartFromProps)(startFrom, endAt);

package/dist/esm/index.mjs

@@ -59,7 +59,7 @@ function truthy(value) {
 }
 
 // Automatically generated on publish
-const VERSION = '4.0.30';
+const VERSION = '4.0.31';
 
 const checkMultipleRemotionVersions = () => {
     if (typeof globalThis === 'undefined') {
@@ -136,6 +136,20 @@ const getAbsoluteSrc = (relativeSrc) => {
     return new URL(relativeSrc, window.location.origin).href;
 };
 
+const calculateLoopDuration = ({ endAt, mediaDuration, playbackRate, startFrom, }) => {
+    let duration = mediaDuration;
+    // Account for endAt
+    if (typeof endAt !== 'undefined') {
+        duration = endAt;
+    }
+    // Account for startFrom
+    if (typeof startFrom !== 'undefined') {
+        duration -= startFrom;
+    }
+    const actualDuration = duration / playbackRate;
+    return Math.floor(actualDuration);
+};
+
 const isErrorLike = (err) => {
     if (err === null) {
         return false;
@@ -2525,7 +2539,7 @@ const AudioRefForwardingFunction = (props, ref) => {
     const onError = useCallback((e) => {
         console.log(e.currentTarget.error);
         // If there is no `loop` property, we don't need to get the duration
-        // and thsi does not need to be a fatal error
+        // and this does not need to be a fatal error
         const errMessage = `Could not play audio with src ${otherProps.src}: ${e.currentTarget.error}. See https://remotion.dev/docs/media-playback-error for help.`;
         if (loop) {
             cancelRender(new Error(errMessage));
@@ -2539,9 +2553,12 @@ const AudioRefForwardingFunction = (props, ref) => {
     }, [setDurations]);
     if (loop && props.src && durations[getAbsoluteSrc(props.src)] !== undefined) {
         const duration = Math.floor(durations[getAbsoluteSrc(props.src)] * fps);
-        const playbackRate = (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1;
-        const actualDuration = duration / playbackRate;
-        return (jsx(Loop, { layout: "none", durationInFrames: Math.floor(actualDuration), children: jsx(Audio, { ...propsOtherThanLoop, ref: ref }) }));
+        return (jsx(Loop, { layout: "none", durationInFrames: calculateLoopDuration({
+                endAt,
+                mediaDuration: duration,
+                playbackRate: (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1,
+                startFrom,
+            }), children: jsx(Audio, { ...propsOtherThanLoop, ref: ref }) }));
     }
     if (typeof startFrom !== 'undefined' || typeof endAt !== 'undefined') {
         validateStartFromProps(startFrom, endAt);
@@ -4719,10 +4736,13 @@ const VideoForwardingFunction = (props, ref) => {
         setDurations({ type: 'got-duration', durationInSeconds, src });
     }, [setDurations]);
     if (loop && props.src && durations[getAbsoluteSrc(props.src)] !== undefined) {
-        const naturalDuration = durations[getAbsoluteSrc(props.src)] * fps;
-        const playbackRate = (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1;
-        const durationInFrames = Math.floor(naturalDuration / playbackRate);
-        return (jsx(Loop, { durationInFrames: durationInFrames, children: jsx(Video, { ...propsOtherThanLoop, ref: ref }) }));
+        const mediaDuration = durations[getAbsoluteSrc(props.src)] * fps;
+        return (jsx(Loop, { durationInFrames: calculateLoopDuration({
+                endAt,
+                mediaDuration,
+                playbackRate: (_a = props.playbackRate) !== null && _a !== void 0 ? _a : 1,
+                startFrom,
+            }), children: jsx(Video, { ...propsOtherThanLoop, ref: ref }) }));
     }
     if (typeof startFrom !== 'undefined' || typeof endAt !== 'undefined') {
         validateStartFromProps(startFrom, endAt);

package/dist/esm/version.mjs

@@ -1,4 +1,4 @@
 // Automatically generated on publish
-const VERSION = '4.0.30';
+const VERSION = '4.0.31';
 
 export { VERSION };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remotion",
-  "version": "4.0.30",
+  "version": "4.0.31",
   "description": "Render videos in React",
   "main": "dist/cjs/index.js",
   "types": "dist/cjs/index.d.ts",