@remotion/cli 4.0.0-prefetch.11 → 4.0.0-prefetch.12

package/dist/event-source-events.d.ts

@@ -3,4 +3,7 @@ export declare type EventSourceEvent = {
     newProps: object;
 } | {
     type: 'init';
+} | {
+    type: 'new-env-variables';
+    newEnvVariables: Record<string, string>;
 };

package/dist/event-source.js

@@ -7,22 +7,24 @@ const openEventSource = () => {
     source = new EventSource('/events');
     source.addEventListener('message', (event) => {
         const newEvent = JSON.parse(event.data);
-        if (newEvent.type === 'new-input-props') {
+        if (newEvent.type === 'new-input-props' ||
+            newEvent.type === 'new-env-variables') {
             window.location.reload();
         }
     });
     source.addEventListener('open', () => {
         var _a;
         (_a = ServerDisconnected_1.serverDisconnectedRef.current) === null || _a === void 0 ? void 0 : _a.setServerConnected();
-    });
-    source.addEventListener('error', () => {
-        var _a;
-        // Display an error message that the preview server has disconnected.
-        (_a = ServerDisconnected_1.serverDisconnectedRef.current) === null || _a === void 0 ? void 0 : _a.setServerDisconnected();
-        // Retry later
-        setTimeout(() => {
-            (0, exports.openEventSource)();
-        }, 1000);
+        source.addEventListener('error', () => {
+            var _a;
+            // Display an error message that the preview server has disconnected.
+            (_a = ServerDisconnected_1.serverDisconnectedRef.current) === null || _a === void 0 ? void 0 : _a.setServerDisconnected();
+            source === null || source === void 0 ? void 0 : source.close();
+            // Retry later
+            setTimeout(() => {
+                (0, exports.openEventSource)();
+            }, 1000);
+        }, { once: true });
     });
 };
 exports.openEventSource = openEventSource;

package/dist/get-cli-options.d.ts

@@ -1,19 +1,27 @@
-import type { BrowserExecutable, ChromiumOptions, FrameRange } from '@remotion/renderer';
+import type { BrowserExecutable, ChromiumOptions, Codec, FrameRange } from '@remotion/renderer';
+export declare const validateFfmpegCanUseCodec: (codec: Codec) => Promise<void>;
+export declare const getFinalCodec: (options: {
+    downloadName: string | null;
+    outName: string | null;
+}) => {
+    codec: Codec;
+    reason: string;
+};
 export declare const getAndValidateAbsoluteOutputFile: (relativeOutputLocation: string, overwrite: boolean) => string;
 export declare const getCliOptions: (options: {
     isLambda: boolean;
     type: 'still' | 'series' | 'get-compositions';
+    codec: Codec;
 }) => Promise<{
     puppeteerTimeout: number;
-    parallelism: number | null;
+    concurrency: number | null;
     frameRange: FrameRange | null;
     shouldOutputImageSequence: boolean;
-    codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     inputProps: object;
     envVariables: Record<string, string>;
     quality: number | undefined;
     browser: import("@remotion/renderer").Browser;
-    crf: number | null;
+    crf: import("@remotion/renderer").Crf | null;
     pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
     imageFormat: "png" | "jpeg" | "none";
     proResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | undefined;
@@ -30,6 +38,8 @@ export declare const getCliOptions: (options: {
     port: number | null;
     muted: boolean;
     enforceAudioTrack: boolean;
-    keyboardShortcutsEnables: boolean;
     publicDir: string | null;
+    ffmpegOverride: import("@remotion/renderer").FfmpegOverrideFn;
+    audioBitrate: string | null;
+    videoBitrate: string | null;
 }>;

package/dist/get-cli-options.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCliOptions = exports.getAndValidateAbsoluteOutputFile = void 0;
+exports.getCliOptions = exports.getAndValidateAbsoluteOutputFile = exports.getFinalCodec = exports.validateFfmpegCanUseCodec = void 0;
 const renderer_1 = require("@remotion/renderer");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -13,7 +13,7 @@ const get_final_output_codec_1 = require("./get-final-output-codec");
 const get_input_props_1 = require("./get-input-props");
 const image_formats_1 = require("./image-formats");
 const log_1 = require("./log");
-const user_passed_output_location_1 = require("./user-passed-output-location");
+const parse_command_line_1 = require("./parse-command-line");
 const getAndValidateFrameRange = () => {
     const frameRange = config_1.ConfigInternals.getRange();
     if (typeof frameRange === 'number') {
@@ -23,20 +23,11 @@ const getAndValidateFrameRange = () => {
     }
     return frameRange;
 };
-const getFinalCodec = async (options) => {
-    const userCodec = config_1.ConfigInternals.getOutputCodecOrUndefined();
-    const codec = (0, get_final_output_codec_1.getFinalOutputCodec)({
-        codec: userCodec,
-        fileExtension: options.isLambda
-            ? null
-            : renderer_1.RenderInternals.getExtensionOfFilename((0, user_passed_output_location_1.getUserPassedOutputLocation)()),
-        emitWarning: true,
-    });
+const validateFfmpegCanUseCodec = async (codec) => {
     const ffmpegExecutable = config_1.ConfigInternals.getCustomFfmpegExecutable();
     if (codec === 'vp8' &&
         !(await renderer_1.RenderInternals.ffmpegHasFeature({
             feature: 'enable-libvpx',
-            isLambda: options.isLambda,
             ffmpegExecutable,
         }))) {
         log_1.Log.error("The Vp8 codec has been selected, but your FFMPEG binary wasn't compiled with the --enable-lipvpx flag.");
@@ -45,7 +36,6 @@ const getFinalCodec = async (options) => {
     if (codec === 'h265' &&
         !(await renderer_1.RenderInternals.ffmpegHasFeature({
             feature: 'enable-gpl',
-            isLambda: options.isLambda,
             ffmpegExecutable,
         }))) {
         log_1.Log.error("The H265 codec has been selected, but your FFMPEG binary wasn't compiled with the --enable-gpl flag.");
@@ -54,14 +44,24 @@ const getFinalCodec = async (options) => {
     if (codec === 'h265' &&
         !(await renderer_1.RenderInternals.ffmpegHasFeature({
             feature: 'enable-libx265',
-            isLambda: options.isLambda,
             ffmpegExecutable,
         }))) {
         log_1.Log.error("The H265 codec has been selected, but your FFMPEG binary wasn't compiled with the --enable-libx265 flag.");
         log_1.Log.error('This does not work, please recompile your FFMPEG binary with --enable-gpl --enable-libx265 or choose a different codec.');
     }
-    return codec;
 };
+exports.validateFfmpegCanUseCodec = validateFfmpegCanUseCodec;
+const getFinalCodec = (options) => {
+    var _a;
+    const { codec, reason } = (0, get_final_output_codec_1.getFinalOutputCodec)({
+        cliFlag: parse_command_line_1.parsedCli.codec,
+        configFile: (_a = config_1.ConfigInternals.getOutputCodecOrUndefined()) !== null && _a !== void 0 ? _a : null,
+        downloadName: options.downloadName,
+        outName: options.outName,
+    });
+    return { codec, reason };
+};
+exports.getFinalCodec = getFinalCodec;
 const getBrowser = () => { var _a; return (_a = config_1.ConfigInternals.getBrowser()) !== null && _a !== void 0 ? _a : renderer_1.RenderInternals.DEFAULT_BROWSER; };
 const getAndValidateAbsoluteOutputFile = (relativeOutputLocation, overwrite) => {
     const absoluteOutputFile = path_1.default.resolve(process.cwd(), relativeOutputLocation);
@@ -80,13 +80,10 @@ const getAndValidateShouldOutputImageSequence = async ({ frameRange, isLambda, }
     }
     return shouldOutputImageSequence;
 };
-const getAndValidateCrf = (shouldOutputImageSequence, codec) => {
+const getCrf = (shouldOutputImageSequence) => {
     const crf = shouldOutputImageSequence
         ? null
-        : config_1.ConfigInternals.getActualCrf(codec);
-    if (crf !== null) {
-        renderer_1.RenderInternals.validateSelectedCrfAndCodecCombination(crf, codec);
-    }
+        : config_1.ConfigInternals.getCrfOrUndefined();
     return crf;
 };
 const getAndValidatePixelFormat = (codec) => {
@@ -94,9 +91,8 @@ const getAndValidatePixelFormat = (codec) => {
     renderer_1.RenderInternals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
     return pixelFormat;
 };
-const getAndValidateProResProfile = (actualCodec) => {
+const getProResProfile = () => {
     const proResProfile = config_1.ConfigInternals.getProResProfile();
-    renderer_1.RenderInternals.validateSelectedCodecAndProResCombination(actualCodec, proResProfile);
     return proResProfile;
 };
 const getAndValidateImageFormat = ({ shouldOutputImageSequence, codec, pixelFormat, }) => {
@@ -119,26 +115,29 @@ const getAndValidateBrowser = async (browserExecutable) => {
 const getCliOptions = async (options) => {
     var _a;
     const frameRange = getAndValidateFrameRange();
-    const codec = options.type === 'get-compositions'
-        ? 'h264'
-        : await getFinalCodec({
-            isLambda: options.isLambda,
-        });
     const shouldOutputImageSequence = options.type === 'still'
         ? true
         : await getAndValidateShouldOutputImageSequence({
             frameRange,
             isLambda: options.isLambda,
         });
-    const overwrite = config_1.ConfigInternals.getShouldOverwrite();
-    const crf = getAndValidateCrf(shouldOutputImageSequence, codec);
-    const pixelFormat = getAndValidatePixelFormat(codec);
+    const overwrite = config_1.ConfigInternals.getShouldOverwrite({
+        defaultValue: !options.isLambda,
+    });
+    const crf = getCrf(shouldOutputImageSequence);
+    const videoBitrate = config_1.ConfigInternals.getVideoBitrate();
+    renderer_1.RenderInternals.validateQualitySettings({
+        crf,
+        codec: options.codec,
+        videoBitrate,
+    });
+    const pixelFormat = getAndValidatePixelFormat(options.codec);
     const imageFormat = getAndValidateImageFormat({
         shouldOutputImageSequence,
-        codec,
+        codec: options.codec,
         pixelFormat,
     });
-    const proResProfile = getAndValidateProResProfile(codec);
+    const proResProfile = getProResProfile();
     const browserExecutable = config_1.ConfigInternals.getBrowserExecutable();
     const ffmpegExecutable = config_1.ConfigInternals.getCustomFfmpegExecutable();
     const ffprobeExecutable = config_1.ConfigInternals.getCustomFfprobeExecutable();
@@ -150,18 +149,17 @@ const getCliOptions = async (options) => {
         headless: config_1.ConfigInternals.getChromiumHeadlessMode(),
         gl: (_a = config_1.ConfigInternals.getChromiumOpenGlRenderer()) !== null && _a !== void 0 ? _a : renderer_1.RenderInternals.DEFAULT_OPENGL_RENDERER,
     };
-    const everyNthFrame = config_1.ConfigInternals.getAndValidateEveryNthFrame(codec);
-    const numberOfGifLoops = config_1.ConfigInternals.getAndValidateNumberOfGifLoops(codec);
-    const parallelism = config_1.ConfigInternals.getConcurrency();
-    renderer_1.RenderInternals.validateConcurrency(parallelism, 'concurrency');
+    const everyNthFrame = config_1.ConfigInternals.getAndValidateEveryNthFrame(options.codec);
+    const numberOfGifLoops = config_1.ConfigInternals.getAndValidateNumberOfGifLoops(options.codec);
+    const concurrency = config_1.ConfigInternals.getConcurrency();
+    renderer_1.RenderInternals.validateConcurrency(concurrency, 'concurrency');
     return {
         puppeteerTimeout: config_1.ConfigInternals.getCurrentPuppeteerTimeout(),
-        parallelism,
+        concurrency,
         frameRange,
         shouldOutputImageSequence,
-        codec,
         inputProps: (0, get_input_props_1.getInputProps)(() => undefined),
-        envVariables: await (0, get_env_1.getEnvironmentVariables)(),
+        envVariables: await (0, get_env_1.getEnvironmentVariables)(() => undefined),
         quality: config_1.ConfigInternals.getQuality(),
         browser: await getAndValidateBrowser(browserExecutable),
         crf,
@@ -181,8 +179,10 @@ const getCliOptions = async (options) => {
         port: port !== null && port !== void 0 ? port : null,
         muted: config_1.ConfigInternals.getMuted(),
         enforceAudioTrack: config_1.ConfigInternals.getEnforceAudioTrack(),
-        keyboardShortcutsEnables: config_1.ConfigInternals.getKeyboardShortcutsEnabled(),
         publicDir: config_1.ConfigInternals.getPublicDir(),
+        ffmpegOverride: config_1.ConfigInternals.getFfmpegOverrideFunction(),
+        audioBitrate: config_1.ConfigInternals.getAudioBitrate(),
+        videoBitrate,
     };
 };
 exports.getCliOptions = getCliOptions;

package/dist/get-env.d.ts

@@ -1 +1 @@
-export declare const getEnvironmentVariables: () => Promise<Record<string, string>>;
+export declare const getEnvironmentVariables: (onUpdate: (newProps: Record<string, string>) => void) => Promise<Record<string, string>>;