@remotion/cli 3.3.36 → 3.3.37

package/dist/preview-server/render-queue/job.d.ts

@@ -1,4 +1,4 @@
-import type { Codec, makeCancelSignal, StillImageFormat } from '@remotion/renderer';
+import type { Codec, makeCancelSignal, PixelFormat, ProResProfile, StillImageFormat } from '@remotion/renderer';
 declare type RenderJobDynamicStatus = {
     status: 'done';
 } | {
@@ -30,6 +30,19 @@ declare type RenderJobDynamicFields = {
     quality: number | null;
     scale: number;
     codec: Codec;
+    concurrency: number;
+    crf: number | null;
+    startFrame: number;
+    endFrame: number;
+    muted: boolean;
+    enforceAudioTrack: boolean;
+    proResProfile: ProResProfile | null;
+    pixelFormat: PixelFormat;
+    audioBitrate: string | null;
+    videoBitrate: string | null;
+    everyNthFrame: number;
+    numberOfGifLoops: number | null;
+    delayRenderTimeout: number;
 };
 export declare type RenderJob = {
     startedAt: number;
@@ -57,6 +70,19 @@ declare type AddRenderRequestDynamicFields = {
     quality: number | null;
     scale: number;
     verbose: boolean;
+    concurrency: number;
+    crf: number | null;
+    startFrame: number;
+    endFrame: number;
+    muted: boolean;
+    enforceAudioTrack: boolean;
+    proResProfile: ProResProfile | null;
+    pixelFormat: PixelFormat;
+    audioBitrate: string | null;
+    videoBitrate: string | null;
+    everyNthFrame: number;
+    numberOfGifLoops: number | null;
+    delayRenderTimeout: number;
 };
 export declare type CancelRenderRequest = {
     jobId: string;

package/dist/preview-server/render-queue/make-retry-payload.js

@@ -1,35 +1,77 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRetryPayload = void 0;
+const get_default_video_contexts_1 = require("./get-default-video-contexts");
 const makeRetryPayload = (job) => {
+    var _a, _b, _c;
+    const defaults = window.remotion_renderDefaults;
+    if (!defaults) {
+        throw new Error('defaults not set');
+    }
     if (job.type === 'still') {
+        const { initialAudioCodec, initialRenderType, initialVideoCodec } = (0, get_default_video_contexts_1.getDefaultCodecs)({
+            defaultCodec: defaults.codec,
+            isStill: true,
+        });
         return {
             type: 'render',
             compositionId: job.compositionId,
             initialFrame: job.frame,
-            initialImageFormat: job.imageFormat,
-            initialQuality: job.quality,
+            initialStillImageFormat: job.imageFormat,
+            // TODO: Take from config
+            initialVideoImageFormat: 'jpeg',
+            initialQuality: (_a = job.quality) !== null && _a !== void 0 ? _a : defaults.quality,
             initialOutName: job.outName,
             initialScale: job.scale,
             initialVerbose: job.verbose,
-            initialRenderType: 'still',
-            // TODO: take initial codec from config file
-            initialCodec: 'h264',
+            initialAudioCodec,
+            initialRenderType,
+            initialVideoCodec,
+            initialConcurrency: defaults.concurrency,
+            maxConcurrency: defaults.maxConcurrency,
+            minConcurrency: defaults.minConcurrency,
+            initialMuted: defaults.muted,
+            initialEnforceAudioTrack: defaults.enforceAudioTrack,
+            initialProResProfile: defaults.proResProfile,
+            initialPixelFormat: defaults.pixelFormat,
+            initialAudioBitrate: defaults.audioBitrate,
+            initialVideoBitrate: defaults.videoBitrate,
+            initialEveryNthFrame: defaults.everyNthFrame,
+            initialNumberOfGifLoops: defaults.numberOfGifLoops,
+            initialDelayRenderTimeout: defaults.delayRenderTimeout,
         };
     }
     if (job.type === 'video') {
-        // TODO: Implement correct retry mechanism for video
+        const { initialAudioCodec, initialRenderType, initialVideoCodec } = (0, get_default_video_contexts_1.getDefaultCodecs)({
+            defaultCodec: defaults.codec,
+            isStill: false,
+        });
         return {
             type: 'render',
             compositionId: job.compositionId,
-            initialImageFormat: job.imageFormat,
-            initialQuality: job.quality,
+            // TODO: Take from config
+            initialStillImageFormat: 'png',
+            initialVideoImageFormat: job.imageFormat,
+            initialQuality: (_b = job.quality) !== null && _b !== void 0 ? _b : defaults.quality,
             initialOutName: job.outName,
             initialScale: job.scale,
             initialVerbose: job.verbose,
             initialFrame: 0,
-            initialRenderType: 'video',
-            initialCodec: job.codec,
+            initialConcurrency: job.concurrency,
+            maxConcurrency: defaults.maxConcurrency,
+            minConcurrency: defaults.minConcurrency,
+            initialMuted: job.muted,
+            initialAudioCodec,
+            initialEnforceAudioTrack: job.enforceAudioTrack,
+            initialRenderType,
+            initialVideoCodec,
+            initialProResProfile: (_c = job.proResProfile) !== null && _c !== void 0 ? _c : defaults.proResProfile,
+            initialPixelFormat: job.pixelFormat,
+            initialAudioBitrate: job.audioBitrate,
+            initialVideoBitrate: job.videoBitrate,
+            initialEveryNthFrame: job.everyNthFrame,
+            initialNumberOfGifLoops: job.numberOfGifLoops,
+            initialDelayRenderTimeout: job.delayRenderTimeout,
         };
     }
     throw new Error(`Job ${JSON.stringify(job)} Not implemented`);

package/dist/preview-server/render-queue/process-video.js

@@ -5,11 +5,12 @@ const convert_entry_point_to_serve_url_1 = require("../../convert-entry-point-to
 const get_cli_options_1 = require("../../get-cli-options");
 const render_1 = require("../../render-flows/render");
 const processVideoJob = async ({ job, remotionRoot, entryPoint, onProgress, addCleanupCallback, }) => {
-    var _a;
+    var _a, _b;
     if (job.type !== 'video') {
         throw new Error('Expected video job');
     }
-    const { publicDir, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, port, browser, puppeteerTimeout, } = await (0, get_cli_options_1.getCliOptions)({
+    // TODO: Change until none can be derived from UI
+    const { publicDir, browserExecutable, ffmpegExecutable, ffprobeExecutable, chromiumOptions, envVariables, inputProps, port, browser, ffmpegOverride, } = await (0, get_cli_options_1.getCliOptions)({
         isLambda: false,
         type: 'still',
         remotionRoot,
@@ -30,7 +31,7 @@ const processVideoJob = async ({ job, remotionRoot, entryPoint, onProgress, addC
         overwrite: true,
         port,
         publicDir,
-        puppeteerTimeout,
+        puppeteerTimeout: job.delayRenderTimeout,
         quality: (_a = job.quality) !== null && _a !== void 0 ? _a : undefined,
         remainingArgs: [],
         scale: job.scale,
@@ -40,12 +41,9 @@ const processVideoJob = async ({ job, remotionRoot, entryPoint, onProgress, addC
         logLevel: job.verbose ? 'verbose' : 'info',
         onProgress,
         indent: true,
-        // TODO: Make configurable
-        concurrency: null,
-        // TODO: Make configurable
-        everyNthFrame: 1,
-        // TODO: Make configurable
-        frameRange: null,
+        concurrency: job.concurrency,
+        everyNthFrame: job.everyNthFrame,
+        frameRange: [job.startFrame, job.endFrame],
         quiet: false,
         shouldOutputImageSequence: false,
         addCleanupCallback,
@@ -53,6 +51,15 @@ const processVideoJob = async ({ job, remotionRoot, entryPoint, onProgress, addC
         uiCodec: job.codec,
         uiImageFormat: job.imageFormat,
         cancelSignal: job.cancelToken.cancelSignal,
+        crf: job.crf,
+        ffmpegOverride,
+        audioBitrate: job.audioBitrate,
+        muted: job.muted,
+        enforceAudioTrack: job.enforceAudioTrack,
+        proResProfile: (_b = job.proResProfile) !== null && _b !== void 0 ? _b : undefined,
+        pixelFormat: job.pixelFormat,
+        videoBitrate: job.videoBitrate,
+        numberOfGifLoops: job.numberOfGifLoops,
     });
     // TODO: Accept CLI options
 };

package/dist/preview-server/routes/add-render.js

@@ -24,6 +24,19 @@ const handleAddRender = ({ input, entryPoint, remotionRoot, }) => {
                 startedAt: Date.now(),
                 verbose: input.verbose,
                 cancelToken: (0, renderer_1.makeCancelSignal)(),
+                concurrency: input.concurrency,
+                crf: input.crf,
+                endFrame: input.endFrame,
+                startFrame: input.startFrame,
+                muted: input.muted,
+                enforceAudioTrack: input.enforceAudioTrack,
+                proResProfile: input.proResProfile,
+                pixelFormat: input.pixelFormat,
+                audioBitrate: input.audioBitrate,
+                videoBitrate: input.videoBitrate,
+                everyNthFrame: input.everyNthFrame,
+                numberOfGifLoops: input.numberOfGifLoops,
+                delayRenderTimeout: input.delayRenderTimeout,
             },
         });
     }

package/dist/render-flows/render.d.ts

@@ -1,6 +1,7 @@
-import type { Browser, BrowserExecutable, CancelSignal, ChromiumOptions, Codec, FfmpegExecutable, FrameRange, ImageFormat, LogLevel } from '@remotion/renderer';
+import type { Browser, BrowserExecutable, CancelSignal, ChromiumOptions, Codec, Crf, FfmpegExecutable, FfmpegOverrideFn, FrameRange, ImageFormat, LogLevel, PixelFormat, ProResProfile } from '@remotion/renderer';
+import type { Loop } from '../config/number-of-gif-loops';
 import type { JobProgressCallback } from '../preview-server/render-queue/job';
-export declare const renderCompFlow: ({ remotionRoot, fullEntryPoint, ffmpegExecutable, ffprobeExecutable, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, configFileImageFormat, outputLocationFromUI, quality, onProgress, addCleanupCallback, uiCodec, uiImageFormat, cancelSignal, }: {
+export declare const renderCompFlow: ({ remotionRoot, fullEntryPoint, ffmpegExecutable, ffprobeExecutable, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, configFileImageFormat, outputLocationFromUI, quality, onProgress, addCleanupCallback, cancelSignal, crf, uiCodec, uiImageFormat, ffmpegOverride, audioBitrate, muted, enforceAudioTrack, proResProfile, pixelFormat, videoBitrate, numberOfGifLoops, }: {
     remotionRoot: string;
     fullEntryPoint: string;
     entryPointReason: string;
@@ -32,7 +33,16 @@ export declare const renderCompFlow: ({ remotionRoot, fullEntryPoint, ffmpegExec
     quality: number | undefined;
     onProgress: JobProgressCallback;
     addCleanupCallback: (cb: () => Promise<void>) => void;
-    uiCodec: Codec | null;
-    uiImageFormat: ImageFormat | null;
+    crf: Crf | null;
     cancelSignal: CancelSignal | null;
+    uiCodec: Codec | null;
+    uiImageFormat: 'png' | 'jpeg' | 'none' | null;
+    ffmpegOverride: FfmpegOverrideFn;
+    audioBitrate: string | null;
+    videoBitrate: string | null;
+    muted: boolean;
+    enforceAudioTrack: boolean;
+    proResProfile: ProResProfile | undefined;
+    pixelFormat: PixelFormat;
+    numberOfGifLoops: Loop;
 }) => Promise<void>;

package/dist/render-flows/render.js

@@ -14,7 +14,6 @@ const get_cli_options_1 = require("../get-cli-options");
 const get_composition_with_dimension_override_1 = require("../get-composition-with-dimension-override");
 const get_filename_1 = require("../get-filename");
 const get_final_output_codec_1 = require("../get-final-output-codec");
-const get_render_media_options_1 = require("../get-render-media-options");
 const image_formats_1 = require("../image-formats");
 const log_1 = require("../log");
 const parse_command_line_1 = require("../parse-command-line");
@@ -22,7 +21,7 @@ const progress_bar_1 = require("../progress-bar");
 const setup_cache_1 = require("../setup-cache");
 const truthy_1 = require("../truthy");
 const user_passed_output_location_1 = require("../user-passed-output-location");
-const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable, ffprobeExecutable, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, configFileImageFormat, outputLocationFromUI, quality, onProgress, addCleanupCallback, uiCodec, uiImageFormat, cancelSignal, }) => {
+const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable, ffprobeExecutable, indent, logLevel, browserExecutable, browser, chromiumOptions, scale, shouldOutputImageSequence, publicDir, inputProps, envVariables, puppeteerTimeout, port, height, width, remainingArgs, compositionIdFromUi, entryPointReason, overwrite, quiet, concurrency, frameRange, everyNthFrame, configFileImageFormat, outputLocationFromUI, quality, onProgress, addCleanupCallback, cancelSignal, crf, uiCodec, uiImageFormat, ffmpegOverride, audioBitrate, muted, enforceAudioTrack, proResProfile, pixelFormat, videoBitrate, numberOfGifLoops, }) => {
     var _a;
     const downloads = [];
     const downloadMap = renderer_1.RenderInternals.makeDownloadMap();
@@ -101,7 +100,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
         outName: (0, user_passed_output_location_1.getUserPassedOutputLocation)(argsAfterComposition),
         uiCodec,
     });
-    (0, get_cli_options_1.validateFfmpegCanUseCodec)(codec, remotionRoot);
+    await (0, get_cli_options_1.validateFfmpegCanUseCodec)(codec, remotionRoot);
     renderer_1.RenderInternals.validateEvenDimensionsWithCodec({
         width: config.width,
         height: config.height,
@@ -112,7 +111,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
         codec,
         imageSequence: shouldOutputImageSequence,
         compositionName: compositionId,
-        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec, 'final'),
+        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec),
         args: argsAfterComposition,
         indent,
         fromUi: outputLocationFromUI,
@@ -135,6 +134,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
     let encodedDoneIn = null;
     let renderedDoneIn = null;
     let stitchStage = 'encoding';
+    const actualConcurrency = renderer_1.RenderInternals.getActualConcurrency(concurrency);
     const updateRenderProgress = () => {
         if (totalFrames.length === 0) {
             throw new Error('totalFrames should not be 0');
@@ -143,7 +143,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
             rendering: {
                 frames: renderedFrames,
                 totalFrames: totalFrames.length,
-                concurrency: renderer_1.RenderInternals.getActualConcurrency(concurrency),
+                concurrency: actualConcurrency,
                 doneIn: renderedDoneIn,
                 steps,
             },
@@ -202,7 +202,7 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
             everyNthFrame,
             envVariables,
             frameRange,
-            concurrency,
+            concurrency: actualConcurrency,
             puppeteerInstance,
             quality,
             timeoutInMilliseconds: puppeteerTimeout,
@@ -215,17 +215,43 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
             downloadMap,
         });
         updateRenderProgress();
+        process.stdout.write('\n');
         log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
     }
-    const options = await (0, get_render_media_options_1.getRenderMediaOptions)({
-        config,
+    await (0, renderer_1.renderMedia)({
         outputLocation: absoluteOutputFile,
+        composition: {
+            ...config,
+            width: width !== null && width !== void 0 ? width : config.width,
+            height: height !== null && height !== void 0 ? height : config.height,
+        },
+        crf,
+        envVariables,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        frameRange,
+        inputProps,
+        overwrite,
+        pixelFormat,
+        proResProfile,
+        quality,
+        dumpBrowserLogs: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+        chromiumOptions,
+        timeoutInMilliseconds: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
+        scale,
+        port,
+        numberOfGifLoops,
+        everyNthFrame,
+        verbose: renderer_1.RenderInternals.isEqualOrBelowLogLevel(logLevel, 'verbose'),
+        muted,
+        enforceAudioTrack,
+        browserExecutable,
+        ffmpegOverride,
+        concurrency,
         serveUrl: urlOrBundle,
         codec,
-        remotionRoot,
-    });
-    await (0, renderer_1.renderMedia)({
-        ...options,
+        audioBitrate,
+        videoBitrate,
         onProgress: (update) => {
             encodedDoneIn = update.encodedDoneIn;
             encodedFrames = update.encodedFrames;
@@ -247,7 +273,8 @@ const renderCompFlow = async ({ remotionRoot, fullEntryPoint, ffmpegExecutable,
         },
         printLog: (...str) => log_1.Log.verboseAdvanced({ indent, logLevel }, ...str),
     });
-    log_1.Log.infoAdvanced({ indent, logLevel });
+    updateRenderProgress();
+    process.stdout.write('\n');
     log_1.Log.infoAdvanced({ indent, logLevel }, chalk_1.chalk.cyan(`▶ ${absoluteOutputFile}`));
     for (const line of renderer_1.RenderInternals.perf.getPerf()) {
         log_1.Log.verboseAdvanced({ indent, logLevel }, line);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.3.36",
+	"version": "3.3.37",
 	"description": "CLI for Remotion",
 	"main": "dist/index.js",
 	"sideEffects": false,
@@ -22,16 +22,16 @@
 	"author": "Jonny Burger <jonny@remotion.dev>",
 	"license": "SEE LICENSE IN LICENSE.md",
 	"dependencies": {
-		"@remotion/bundler": "3.3.36",
-		"@remotion/media-utils": "3.3.36",
-		"@remotion/player": "3.3.36",
-		"@remotion/renderer": "3.3.36",
+		"@remotion/bundler": "3.3.37",
+		"@remotion/media-utils": "3.3.37",
+		"@remotion/player": "3.3.37",
+		"@remotion/renderer": "3.3.37",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
 		"prompts": "2.4.1",
-		"remotion": "3.3.36",
+		"remotion": "3.3.37",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "623bf1e883e7b26b9d02458037c930ccbe8857e4"
+	"gitHead": "ead6bdacc14a9953cae738159c49bf3daf09e9b0"
 }