@remotion/renderer 4.1.0-alpha1 → 4.1.0-alpha10

package/dist/render-frames.js

@@ -21,6 +21,7 @@ const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range
 const get_frame_padded_index_1 = require("./get-frame-padded-index");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const jpeg_quality_1 = require("./jpeg-quality");
+const logger_1 = require("./logger");
 const make_cancel_signal_1 = require("./make-cancel-signal");
 const open_browser_1 = require("./open-browser");
 const perf_1 = require("./perf");
@@ -34,7 +35,7 @@ const take_frame_and_compose_1 = require("./take-frame-and-compose");
 const truthy_1 = require("./truthy");
 const validate_scale_1 = require("./validate-scale");
 const MAX_RETRIES_PER_FRAME = 1;
-const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps, jpegQuality, imageFormat, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, compositor, sourcemapContext, }) => {
+const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, jpegQuality, imageFormat, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, compositor, sourcemapContext, logLevel, indent, }) => {
     if (outputDir) {
         if (!node_fs_1.default.existsSync(outputDir)) {
             node_fs_1.default.mkdirSync(outputDir, {
@@ -47,7 +48,9 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     const framesToRender = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame);
     const lastFrame = framesToRender[framesToRender.length - 1];
     const makePage = async (context) => {
-        const page = await browserReplacer.getBrowser().newPage(context);
+        const page = await browserReplacer
+            .getBrowser()
+            .newPage(context, logLevel, indent);
         pagesArray.push(page);
         await page.setViewport({
             width: composition.width,
@@ -66,7 +69,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         }
         const initialFrame = realFrameRange[0];
         await (0, set_props_and_env_1.setPropsAndEnv)({
-            inputProps,
+            serializedInputPropsWithCustomSchema,
             envVariables,
             page,
             serveUrl,
@@ -76,14 +79,16 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             retriesRemaining: 2,
             audioEnabled: !muted,
             videoEnabled: imageFormat !== 'none',
+            indent,
+            logLevel,
         });
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             // eslint-disable-next-line max-params
-            pageFunction: (id, defaultProps, durationInFrames, fps, height, width) => {
+            pageFunction: (id, props, durationInFrames, fps, height, width) => {
                 window.remotion_setBundleMode({
                     type: 'composition',
                     compositionName: id,
-                    compositionDefaultProps: defaultProps,
+                    serializedResolvedPropsWithSchema: props,
                     compositionDurationInFrames: durationInFrames,
                     compositionFps: fps,
                     compositionHeight: height,
@@ -92,7 +97,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             },
             args: [
                 composition.id,
-                composition.defaultProps,
+                serializedResolvedPropsWithCustomSchema,
                 composition.durationInFrames,
                 composition.fps,
                 composition.height,
@@ -130,7 +135,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         stopped = true;
     });
-    const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, }) => {
+    const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, compId, }) => {
         const pool = await poolPromise;
         const freePage = await pool.acquire();
         if (stopped) {
@@ -146,7 +151,17 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             frame,
         });
         freePage.on('error', errorCallbackOnFrame);
-        await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
+        const startSeeking = Date.now();
+        await (0, seek_to_frame_1.seekToFrame)({
+            frame,
+            page: freePage,
+            composition: compId,
+            timeoutInMilliseconds,
+        });
+        const timeToSeek = Date.now() - startSeeking;
+        if (timeToSeek > 1000) {
+            logger_1.Log.verbose(`Seeking to frame ${frame} took ${timeToSeek}ms`);
+        }
         if (!outputDir && !onFrameBuffer && imageFormat !== 'none') {
             throw new Error('Called renderFrames() without specifying either `outputDir` or `onFrameBuffer`');
         }
@@ -207,6 +222,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
                 reject,
                 width: composition.width,
                 height: composition.height,
+                compId: composition.id,
             })
                 .then(() => {
                 resolve();
@@ -283,12 +299,11 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     await Promise.all(downloadPromises);
     return result;
 };
-const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions, composition, concurrency, dumpBrowserLogs, envVariables, everyNthFrame, frameRange, imageFormat, indent, inputProps, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, onFrameUpdate, onStart, outputDir, port, puppeteerInstance, scale, server, timeoutInMilliseconds, verbose, webpackBundleOrServeUrl, }) => {
+const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions, composition, concurrency, envVariables, everyNthFrame, frameRange, imageFormat, indent, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, onFrameUpdate, onStart, outputDir, port, puppeteerInstance, scale, server, timeoutInMilliseconds, logLevel, webpackBundleOrServeUrl, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, }) => {
     remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderFrames()`');
     remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderFrames()`');
     remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderFrames()`', false);
-    remotion_1.Internals.validateDurationInFrames({
-        durationInFrames: composition.durationInFrames,
+    remotion_1.Internals.validateDurationInFrames(composition.durationInFrames, {
         component: 'in the `config` object passed to `renderFrames()`',
         allowFloats: false,
     });
@@ -296,12 +311,12 @@ const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions
     (0, validate_scale_1.validateScale)(scale);
     const makeBrowser = () => (0, open_browser_1.internalOpenBrowser)({
         browser: browser_1.DEFAULT_BROWSER,
-        shouldDumpIo: dumpBrowserLogs,
         browserExecutable,
         chromiumOptions,
         forceDeviceScaleFactor: scale,
         indent,
         viewport: null,
+        logLevel,
     });
     const browserInstance = puppeteerInstance !== null && puppeteerInstance !== void 0 ? puppeteerInstance : makeBrowser();
     const actualConcurrency = (0, get_concurrency_1.getActualConcurrency)(concurrency);
@@ -323,16 +338,18 @@ const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions
                     port,
                     remotionRoot: (0, find_closest_package_json_1.findRemotionRoot)(),
                     concurrency: actualConcurrency,
-                    verbose,
+                    logLevel,
                     indent,
                 }, {
                     onDownload,
                     onError,
                 }),
                 browserInstance,
-            ]).then(([{ server: { serveUrl, offthreadPort, compositor, sourceMap, downloadMap, }, cleanupServer, }, pInstance,]) => {
-                const browserReplacer = (0, replace_browser_1.handleBrowserCrash)(pInstance);
-                cleanup.push((0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency).stopCycling);
+            ]).then(([{ server: openedServer, cleanupServer }, pInstance]) => {
+                const { serveUrl, offthreadPort, compositor, sourceMap, downloadMap } = openedServer;
+                const browserReplacer = (0, replace_browser_1.handleBrowserCrash)(pInstance, logLevel, indent);
+                cleanup.push((0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency, logLevel, indent)
+                    .stopCycling);
                 cleanup.push(() => cleanupServer(false));
                 return innerRenderFrames({
                     onError,
@@ -352,7 +369,6 @@ const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions
                     everyNthFrame,
                     frameRange,
                     imageFormat,
-                    inputProps,
                     jpegQuality,
                     muted,
                     onBrowserLog,
@@ -362,6 +378,10 @@ const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions
                     outputDir,
                     scale,
                     timeoutInMilliseconds,
+                    logLevel,
+                    indent,
+                    serializedInputPropsWithCustomSchema,
+                    serializedResolvedPropsWithCustomSchema,
                 });
             }),
         ])
@@ -384,7 +404,7 @@ const internalRenderFrames = ({ browserExecutable, cancelSignal, chromiumOptions
             else {
                 Promise.resolve(browserInstance)
                     .then((instance) => {
-                    return instance.close(true);
+                    return instance.close(true, logLevel, indent);
                 })
                     .catch((err) => {
                     if (!(err === null || err === void 0 ? void 0 : err.message.includes('Target closed'))) {
@@ -405,7 +425,7 @@ exports.internalRenderFrames = internalRenderFrames;
  * @see [Documentation](https://www.remotion.dev/docs/renderer/render-frames)
  */
 const renderFrames = (options) => {
-    const { composition, inputProps, onFrameUpdate, onStart, outputDir, serveUrl, browserExecutable, cancelSignal, chromiumOptions, concurrency, dumpBrowserLogs, envVariables, everyNthFrame, frameRange, imageFormat, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, port, puppeteerInstance, scale, timeoutInMilliseconds, verbose, quality, } = options;
+    const { composition, inputProps, onFrameUpdate, onStart, outputDir, serveUrl, browserExecutable, cancelSignal, chromiumOptions, concurrency, dumpBrowserLogs, envVariables, everyNthFrame, frameRange, imageFormat, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, port, puppeteerInstance, scale, timeoutInMilliseconds, verbose, quality, logLevel, } = options;
     if (!composition) {
         throw new Error('No `composition` option has been specified for renderFrames()');
     }
@@ -421,7 +441,6 @@ const renderFrames = (options) => {
         chromiumOptions: chromiumOptions !== null && chromiumOptions !== void 0 ? chromiumOptions : {},
         composition,
         concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : null,
-        dumpBrowserLogs: dumpBrowserLogs !== null && dumpBrowserLogs !== void 0 ? dumpBrowserLogs : false,
         envVariables: envVariables !== null && envVariables !== void 0 ? envVariables : {},
         everyNthFrame: everyNthFrame !== null && everyNthFrame !== void 0 ? everyNthFrame : 1,
         frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
@@ -429,7 +448,16 @@ const renderFrames = (options) => {
         indent: false,
         jpegQuality: jpegQuality !== null && jpegQuality !== void 0 ? jpegQuality : jpeg_quality_1.DEFAULT_JPEG_QUALITY,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : null,
-        inputProps,
+        serializedInputPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
+            indent: undefined,
+            staticBase: null,
+            data: inputProps !== null && inputProps !== void 0 ? inputProps : {},
+        }).serializedString,
+        serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
+            indent: undefined,
+            staticBase: null,
+            data: composition.props,
+        }).serializedString,
         puppeteerInstance,
         muted: muted !== null && muted !== void 0 ? muted : false,
         onBrowserLog: onBrowserLog !== null && onBrowserLog !== void 0 ? onBrowserLog : null,
@@ -439,7 +467,7 @@ const renderFrames = (options) => {
         outputDir,
         port: port !== null && port !== void 0 ? port : null,
         scale: scale !== null && scale !== void 0 ? scale : 1,
-        verbose: verbose !== null && verbose !== void 0 ? verbose : false,
+        logLevel: verbose || dumpBrowserLogs ? 'verbose' : logLevel !== null && logLevel !== void 0 ? logLevel : (0, logger_1.getLogLevel)(),
         timeoutInMilliseconds: timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : TimeoutSettings_1.DEFAULT_TIMEOUT,
         webpackBundleOrServeUrl: serveUrl,
         server: undefined,

package/dist/render-media.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import type { AnySmallCompMetadata } from 'remotion';
-import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { VideoConfig } from 'remotion';
+import { type RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { AudioCodec } from './audio-codec';
 import type { BrowserExecutable } from './browser-executable';
 import type { BrowserLog } from './browser-log';
@@ -9,6 +9,7 @@ import type { Codec } from './codec';
 import type { FfmpegOverrideFn } from './ffmpeg-override';
 import type { FrameRange } from './frame-range';
 import type { VideoImageFormat } from './image-format';
+import { type LogLevel } from './log-level';
 import type { CancelSignal } from './make-cancel-signal';
 import type { ChromiumOptions } from './open-browser';
 import type { PixelFormat } from './pixel-format';
@@ -31,8 +32,9 @@ export type RenderMediaOnProgress = (progress: {
 export type InternalRenderMediaOptions = {
     outputLocation: string | null;
     codec: Codec;
-    composition: AnySmallCompMetadata;
-    inputProps: Record<string, unknown>;
+    composition: Omit<VideoConfig, 'props' | 'defaultProps'>;
+    serializedInputPropsWithCustomSchema: string;
+    serializedResolvedPropsWithCustomSchema: string;
     crf: number | null;
     imageFormat: VideoImageFormat;
     pixelFormat: PixelFormat;
@@ -46,7 +48,6 @@ export type InternalRenderMediaOptions = {
     onProgress: RenderMediaOnProgress;
     onDownload: RenderMediaOnDownload;
     proResProfile: ProResProfile | undefined;
-    dumpBrowserLogs: boolean;
     onBrowserLog: ((log: BrowserLog) => void) | null;
     onStart: (data: OnStartData) => void;
     timeoutInMilliseconds: number;
@@ -55,7 +56,7 @@ export type InternalRenderMediaOptions = {
     port: number | null;
     cancelSignal: CancelSignal | undefined;
     browserExecutable: BrowserExecutable | null;
-    verbose: boolean;
+    logLevel: LogLevel;
     onCtrlCExit: (fn: () => void) => void;
     indent: boolean;
     server: RemotionServer | undefined;
@@ -73,7 +74,7 @@ export type InternalRenderMediaOptions = {
 export type RenderMediaOptions = {
     outputLocation?: string | null;
     codec: Codec;
-    composition: AnySmallCompMetadata;
+    composition: VideoConfig;
     inputProps?: Record<string, unknown>;
     crf?: number | null;
     imageFormat?: VideoImageFormat;
@@ -92,6 +93,9 @@ export type RenderMediaOptions = {
     onProgress?: RenderMediaOnProgress;
     onDownload?: RenderMediaOnDownload;
     proResProfile?: ProResProfile;
+    /**
+     * @deprecated Use "logLevel": "verbose" instead
+     */
     dumpBrowserLogs?: boolean;
     onBrowserLog?: ((log: BrowserLog) => void) | undefined;
     onStart?: (data: OnStartData) => void;
@@ -101,6 +105,9 @@ export type RenderMediaOptions = {
     port?: number | null;
     cancelSignal?: CancelSignal;
     browserExecutable?: BrowserExecutable;
+    /**
+     * @deprecated Use "logLevel" instead
+     */
     verbose?: boolean;
     preferLossless?: boolean;
     muted?: boolean;
@@ -112,16 +119,17 @@ export type RenderMediaOptions = {
     audioCodec?: AudioCodec | null;
     serveUrl: string;
     concurrency?: number | string | null;
+    logLevel?: LogLevel;
 };
 type RenderMediaResult = {
     buffer: Buffer | null;
     slowestFrames: SlowFrame[];
 };
-export declare const internalRenderMedia: ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, concurrency, disallowParallelEncoding, everyNthFrame, imageFormat: provisionalImageFormat, indent, jpegQuality, numberOfGifLoops, onCtrlCExit, preferLossless, serveUrl, server: reusedServer, verbose, }: InternalRenderMediaOptions) => Promise<RenderMediaResult>;
+export declare const internalRenderMedia: ({ proResProfile, crf, composition, serializedInputPropsWithCustomSchema, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, concurrency, disallowParallelEncoding, everyNthFrame, imageFormat: provisionalImageFormat, indent, jpegQuality, numberOfGifLoops, onCtrlCExit, preferLossless, serveUrl, server: reusedServer, logLevel, serializedResolvedPropsWithCustomSchema, }: InternalRenderMediaOptions) => Promise<RenderMediaResult>;
 /**
  *
  * @description Render a video from a composition
  * @see [Documentation](https://www.remotion.dev/docs/renderer/render-media)
  */
-export declare const renderMedia: ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, jpegQuality, concurrency, serveUrl, disallowParallelEncoding, everyNthFrame, imageFormat, numberOfGifLoops, preferLossless, verbose, quality, }: RenderMediaOptions) => Promise<RenderMediaResult>;
+export declare const renderMedia: ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, jpegQuality, concurrency, serveUrl, disallowParallelEncoding, everyNthFrame, imageFormat, numberOfGifLoops, dumpBrowserLogs, preferLossless, verbose, quality, logLevel, }: RenderMediaOptions) => Promise<RenderMediaResult>;
 export {};

package/dist/render-media.js

@@ -43,7 +43,7 @@ const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
 const validate_videobitrate_1 = require("./validate-videobitrate");
 const SLOWEST_FRAME_COUNT = 10;
-const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, concurrency, disallowParallelEncoding, everyNthFrame, imageFormat: provisionalImageFormat, indent, jpegQuality, numberOfGifLoops, onCtrlCExit, preferLossless, serveUrl, server: reusedServer, verbose, }) => {
+const internalRenderMedia = ({ proResProfile, crf, composition, serializedInputPropsWithCustomSchema, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, concurrency, disallowParallelEncoding, everyNthFrame, imageFormat: provisionalImageFormat, indent, jpegQuality, numberOfGifLoops, onCtrlCExit, preferLossless, serveUrl, server: reusedServer, logLevel, serializedResolvedPropsWithCustomSchema, }) => {
     (0, jpeg_quality_1.validateJpegQuality)(jpegQuality);
     (0, crf_1.validateQualitySettings)({ crf, codec, videoBitrate });
     (0, validate_videobitrate_1.validateBitrate)(audioBitrate, 'audioBitrate');
@@ -72,6 +72,7 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
     let stitcherFfmpeg;
     let preStitcher = null;
     let encodedFrames = 0;
+    let muxedFrames = 0;
     let renderedFrames = 0;
     let renderedDoneIn = null;
     let encodedDoneIn = null;
@@ -86,30 +87,32 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
         (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'renderMedia()',
     }, 'Free memory:', freeMemory, 'Estimated usage parallel encoding', estimatedUsage);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'renderMedia()',
     }, 'Codec supports parallel rendering:', (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec));
-    logger_1.Log.verboseAdvanced({
-        indent,
-        logLevel: verbose ? 'verbose' : 'info',
-        tag: 'renderMedia()',
-    }, 'User disallowed parallel encoding:', Boolean(disallowParallelEncoding));
+    if (disallowParallelEncoding) {
+        logger_1.Log.verboseAdvanced({
+            indent,
+            logLevel,
+            tag: 'renderMedia()',
+        }, 'User disallowed parallel encoding.');
+    }
     if (parallelEncoding) {
         logger_1.Log.verboseAdvanced({
             indent,
-            logLevel: verbose ? 'verbose' : 'info',
+            logLevel,
             tag: 'renderMedia()',
         }, 'Parallel encoding is enabled.');
     }
     else {
         logger_1.Log.verboseAdvanced({
             indent,
-            logLevel: verbose ? 'verbose' : 'info',
+            logLevel,
             tag: 'renderMedia()',
         }, 'Parallel encoding is disabled.');
     }
@@ -133,13 +136,12 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
     const callUpdate = () => {
         onProgress === null || onProgress === void 0 ? void 0 : onProgress({
             encodedDoneIn,
-            encodedFrames,
+            encodedFrames: Math.round(0.5 * encodedFrames + 0.5 * muxedFrames),
             renderedDoneIn,
             renderedFrames,
             stitchStage,
-            progress: Math.round(((0.7 * renderedFrames + 0.3 * encodedFrames) /
-                composition.durationInFrames) *
-                100) / 100,
+            progress: Math.round((70 * renderedFrames + 15 * encodedFrames + 15 * muxedFrames) /
+                composition.durationInFrames) / 100,
         });
     };
     const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange);
@@ -167,7 +169,7 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
                     encodedFrames = frame;
                     callUpdate();
                 },
-                verbose,
+                logLevel,
                 imageFormat,
                 signal: cancelPrestitcher.cancelSignal,
                 ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : (({ args }) => args),
@@ -225,7 +227,7 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
                 indent,
                 port,
                 remotionRoot: (0, find_closest_package_json_1.findRemotionRoot)(),
-                verbose,
+                logLevel,
                 webpackConfigOrServeUrl: serveUrl,
             }, {
                 onDownload,
@@ -248,7 +250,7 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
                     callUpdate();
                     onStart === null || onStart === void 0 ? void 0 : onStart(data);
                 },
-                inputProps,
+                serializedInputPropsWithCustomSchema,
                 envVariables,
                 imageFormat,
                 jpegQuality,
@@ -276,7 +278,6 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
                     }
                     : null,
                 webpackBundleOrServeUrl: serveUrl,
-                dumpBrowserLogs,
                 onBrowserLog,
                 onDownload,
                 timeoutInMilliseconds,
@@ -286,9 +287,10 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
                 port,
                 cancelSignal: cancelRenderFrames.cancelSignal,
                 muted: disableAudio,
-                verbose,
+                logLevel,
                 indent,
                 server,
+                serializedResolvedPropsWithCustomSchema,
             });
             return renderFramesProc;
         })
@@ -322,12 +324,17 @@ const internalRenderMedia = ({ proResProfile, crf, composition, inputProps, pixe
                     assetsInfo,
                     onProgress: (frame) => {
                         stitchStage = 'muxing';
-                        encodedFrames = frame;
+                        if (preEncodedFileLocation) {
+                            muxedFrames = frame;
+                        }
+                        else {
+                            encodedFrames = frame;
+                        }
                         callUpdate();
                     },
                     onDownload,
                     numberOfGifLoops,
-                    verbose,
+                    logLevel,
                     dir: workingDir,
                     cancelSignal: cancelStitcher.cancelSignal,
                     muted: disableAudio,
@@ -401,8 +408,8 @@ exports.internalRenderMedia = internalRenderMedia;
  * @description Render a video from a composition
  * @see [Documentation](https://www.remotion.dev/docs/renderer/render-media)
  */
-const renderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, jpegQuality, concurrency, serveUrl, disallowParallelEncoding, everyNthFrame, imageFormat, numberOfGifLoops, preferLossless, verbose, quality, }) => {
-    var _a;
+const renderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, audioCodec, jpegQuality, concurrency, serveUrl, disallowParallelEncoding, everyNthFrame, imageFormat, numberOfGifLoops, dumpBrowserLogs, preferLossless, verbose, quality, logLevel, }) => {
+    var _a, _b;
     if (quality !== undefined) {
         console.warn(`The "quality" option has been renamed. Please use "jpegQuality" instead.`);
     }
@@ -419,14 +426,17 @@ const renderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat,
         concurrency: concurrency !== null && concurrency !== void 0 ? concurrency : null,
         crf: crf !== null && crf !== void 0 ? crf : null,
         disallowParallelEncoding: disallowParallelEncoding !== null && disallowParallelEncoding !== void 0 ? disallowParallelEncoding : false,
-        dumpBrowserLogs: dumpBrowserLogs !== null && dumpBrowserLogs !== void 0 ? dumpBrowserLogs : false,
         enforceAudioTrack: enforceAudioTrack !== null && enforceAudioTrack !== void 0 ? enforceAudioTrack : false,
         envVariables: envVariables !== null && envVariables !== void 0 ? envVariables : {},
         everyNthFrame: everyNthFrame !== null && everyNthFrame !== void 0 ? everyNthFrame : 1,
         ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : undefined,
         frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
         imageFormat: imageFormat !== null && imageFormat !== void 0 ? imageFormat : image_format_1.DEFAULT_VIDEO_IMAGE_FORMAT,
-        inputProps: inputProps !== null && inputProps !== void 0 ? inputProps : {},
+        serializedInputPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
+            indent: undefined,
+            staticBase: null,
+            data: inputProps !== null && inputProps !== void 0 ? inputProps : {},
+        }).serializedString,
         jpegQuality: (_a = jpegQuality !== null && jpegQuality !== void 0 ? jpegQuality : quality) !== null && _a !== void 0 ? _a : jpeg_quality_1.DEFAULT_JPEG_QUALITY,
         muted: muted !== null && muted !== void 0 ? muted : false,
         numberOfGifLoops: numberOfGifLoops !== null && numberOfGifLoops !== void 0 ? numberOfGifLoops : null,
@@ -442,11 +452,16 @@ const renderMedia = ({ proResProfile, crf, composition, inputProps, pixelFormat,
         scale: scale !== null && scale !== void 0 ? scale : 1,
         timeoutInMilliseconds: timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : TimeoutSettings_1.DEFAULT_TIMEOUT,
         videoBitrate: videoBitrate !== null && videoBitrate !== void 0 ? videoBitrate : null,
-        verbose: verbose !== null && verbose !== void 0 ? verbose : false,
+        logLevel: verbose || dumpBrowserLogs ? 'verbose' : logLevel !== null && logLevel !== void 0 ? logLevel : (0, logger_1.getLogLevel)(),
         preferLossless: preferLossless !== null && preferLossless !== void 0 ? preferLossless : false,
         indent: false,
         onCtrlCExit: () => undefined,
         server: undefined,
+        serializedResolvedPropsWithCustomSchema: remotion_1.Internals.serializeJSONWithDate({
+            indent: undefined,
+            staticBase: null,
+            data: (_b = composition.props) !== null && _b !== void 0 ? _b : {},
+        }).serializedString,
     });
 };
 exports.renderMedia = renderMedia;

package/dist/render-still.d.ts

@@ -1,22 +1,23 @@
 /// <reference types="node" />
-import type { AnySmallCompMetadata } from 'remotion';
+import type { VideoConfig } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { BrowserExecutable } from './browser-executable';
 import type { BrowserLog } from './browser-log';
 import type { HeadlessBrowser } from './browser/Browser';
 import type { StillImageFormat } from './image-format';
+import type { LogLevel } from './log-level';
 import type { CancelSignal } from './make-cancel-signal';
 import type { ChromiumOptions } from './open-browser';
 import type { RemotionServer } from './prepare-server';
 type InternalRenderStillOptions = {
-    composition: AnySmallCompMetadata;
+    composition: VideoConfig;
     output: string | null;
     frame: number;
-    inputProps: Record<string, unknown>;
+    serializedInputPropsWithCustomSchema: string;
+    serializedResolvedPropsWithCustomSchema: string;
     imageFormat: StillImageFormat;
     jpegQuality: number;
     puppeteerInstance: HeadlessBrowser | null;
-    dumpBrowserLogs: boolean;
     envVariables: Record<string, string>;
     overwrite: boolean;
     browserExecutable: BrowserExecutable;
@@ -28,19 +29,22 @@ type InternalRenderStillOptions = {
     cancelSignal: CancelSignal | null;
     indent: boolean;
     server: RemotionServer | undefined;
-    verbose: boolean;
+    logLevel: LogLevel;
     serveUrl: string;
     port: number | null;
 };
 export type RenderStillOptions = {
     port?: number | null;
-    composition: AnySmallCompMetadata;
+    composition: VideoConfig;
     output?: string | null;
     frame?: number;
     inputProps?: Record<string, unknown>;
     imageFormat?: StillImageFormat;
     jpegQuality?: number;
     puppeteerInstance?: HeadlessBrowser;
+    /**
+     * @deprecated Use "logLevel": "verbose" instead
+     */
     dumpBrowserLogs?: boolean;
     envVariables?: Record<string, string>;
     overwrite?: boolean;
@@ -51,6 +55,9 @@ export type RenderStillOptions = {
     scale?: number;
     onDownload?: RenderMediaOnDownload;
     cancelSignal?: CancelSignal;
+    /**
+     * @deprecated Use "logLevel" instead
+     */
     verbose?: boolean;
     serveUrl: string;
     /**