@remotion/cli 3.3.40 → 3.3.42

package/dist/config/audio-codec.d.ts

@@ -0,0 +1,3 @@
+import type { AudioCodec } from '@remotion/renderer';
+export declare const setAudioCodec: (audioCodec: AudioCodec | null) => void;
+export declare const getAudioCodec: () => "mp3" | "aac" | "pcm-16" | "opus" | null;

package/dist/config/audio-codec.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAudioCodec = exports.setAudioCodec = void 0;
+const renderer_1 = require("@remotion/renderer");
+let _audioCodec = null;
+const setAudioCodec = (audioCodec) => {
+    if (audioCodec === null) {
+        _audioCodec = null;
+        return;
+    }
+    if (!renderer_1.RenderInternals.validAudioCodecs.includes(audioCodec)) {
+        throw new Error(`Audio codec must be one of the following: ${renderer_1.RenderInternals.validAudioCodecs.join(', ')}, but got ${audioCodec}`);
+    }
+    _audioCodec = audioCodec;
+};
+exports.setAudioCodec = setAudioCodec;
+const getAudioCodec = () => {
+    return _audioCodec;
+};
+exports.getAudioCodec = getAudioCodec;

package/dist/config/index.d.ts

@@ -27,6 +27,7 @@ export declare const ConfigInternals: {
     getConcurrency: () => string | number | null;
     getCurrentPuppeteerTimeout: () => number;
     getQuality: () => number | undefined;
+    getAudioCodec: () => "mp3" | "aac" | "pcm-16" | "opus" | null;
     getStillFrame: () => number;
     getShouldOutputImageSequence: (frameRange: import("@remotion/renderer").FrameRange | null) => boolean;
     getDotEnvLocation: () => string | null;

package/dist/config/index.js

@@ -49,6 +49,7 @@ const scale_1 = require("./scale");
 const still_frame_1 = require("./still-frame");
 const timeout_1 = require("./timeout");
 const webpack_caching_1 = require("./webpack-caching");
+const audio_codec_1 = require("./audio-codec");
 const bitrate_1 = require("./bitrate");
 const browser_executable_2 = require("./browser-executable");
 const chromium_flags_2 = require("./chromium-flags");
@@ -155,6 +156,8 @@ exports.Config = {
     Puppeteer,
     Rendering,
     Output,
+    // Options added after migration
+    setAudioCodec: audio_codec_1.setAudioCodec,
 };
 exports.ConfigInternals = {
     getRange: frame_range_1.getRange,
@@ -176,6 +179,7 @@ exports.ConfigInternals = {
     getConcurrency: concurrency_1.getConcurrency,
     getCurrentPuppeteerTimeout: timeout_1.getCurrentPuppeteerTimeout,
     getQuality: quality_1.getQuality,
+    getAudioCodec: audio_codec_1.getAudioCodec,
     getStillFrame: still_frame_1.getStillFrame,
     getShouldOutputImageSequence: image_sequence_1.getShouldOutputImageSequence,
     getDotEnvLocation: env_file_1.getDotEnvLocation,

package/dist/derive-codec-from-file-extension.d.ts

@@ -0,0 +1 @@
+export declare const makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif")[]>;

package/dist/derive-codec-from-file-extension.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeFileExtensionMap = void 0;
+const renderer_1 = require("@remotion/renderer");
+const makeFileExtensionMap = () => {
+    const map = {};
+    Object.keys(renderer_1.RenderInternals.defaultFileExtensionMap).forEach((_codec) => {
+        const codec = _codec;
+        const fileExtMap = renderer_1.RenderInternals.defaultFileExtensionMap[codec];
+        const audioCodecs = Object.keys(fileExtMap.forAudioCodec);
+        const possibleExtensionsForAudioCodec = audioCodecs.map((audioCodec) => fileExtMap.forAudioCodec[audioCodec].possible);
+        const allPossibleExtensions = [
+            fileExtMap.default,
+            ...possibleExtensionsForAudioCodec.flat(1),
+        ];
+        for (const extension of allPossibleExtensions) {
+            if (!map[extension]) {
+                map[extension] = [];
+            }
+            if (!map[extension].includes(codec)) {
+                map[extension].push(codec);
+            }
+        }
+    });
+    return map;
+};
+exports.makeFileExtensionMap = makeFileExtensionMap;

package/dist/get-audio-codec.d.ts

@@ -0,0 +1,2 @@
+import type { AudioCodec } from '@remotion/renderer';
+export declare const getResolvedAudioCodec: () => AudioCodec | null;

package/dist/get-audio-codec.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getResolvedAudioCodec = void 0;
+const config_1 = require("./config");
+const parse_command_line_1 = require("./parse-command-line");
+const getResolvedAudioCodec = () => {
+    var _a;
+    return (_a = parse_command_line_1.parsedCli['audio-codec']) !== null && _a !== void 0 ? _a : config_1.ConfigInternals.getAudioCodec();
+};
+exports.getResolvedAudioCodec = getResolvedAudioCodec;

package/dist/get-filename.d.ts

@@ -1,6 +1,4 @@
-import type { Codec } from '@remotion/renderer';
-export declare const getOutputFilename: ({ codec, imageSequence, compositionName, defaultExtension, args, }: {
-    codec: Codec;
+export declare const getOutputFilename: ({ imageSequence, compositionName, defaultExtension, args, }: {
     imageSequence: boolean;
     compositionName: string;
     defaultExtension: string;

package/dist/get-filename.js

@@ -4,14 +4,14 @@ exports.getOutputFilename = void 0;
 const renderer_1 = require("@remotion/renderer");
 const log_1 = require("./log");
 const user_passed_output_location_1 = require("./user-passed-output-location");
-const getOutputFilename = ({ codec, imageSequence, compositionName, defaultExtension, args, }) => {
-    let filename = (0, user_passed_output_location_1.getOutputLocation)({
+const getOutputFilename = ({ imageSequence, compositionName, defaultExtension, args, }) => {
+    const filename = (0, user_passed_output_location_1.getOutputLocation)({
         compositionId: compositionName,
         defaultExtension,
         args,
         type: imageSequence ? 'sequence' : 'asset',
     });
-    let extension = renderer_1.RenderInternals.getExtensionOfFilename(filename);
+    const extension = renderer_1.RenderInternals.getExtensionOfFilename(filename);
     if (imageSequence) {
         if (extension !== null) {
             log_1.Log.error('The output directory of the image sequence cannot have an extension. Got: ' +
@@ -21,26 +21,8 @@ const getOutputFilename = ({ codec, imageSequence, compositionName, defaultExten
         return filename;
     }
     if (extension === null && !imageSequence) {
-        if (codec === 'h264' || codec === 'h265') {
-            log_1.Log.warn('No file extension specified, adding .mp4 automatically.');
-            filename += '.mp4';
-            extension = 'mp4';
-        }
-        if (codec === 'h264-mkv') {
-            log_1.Log.warn('No file extension specified, adding .mkv automatically.');
-            filename += '.mkv';
-            extension = 'mkv';
-        }
-        if (codec === 'vp8' || codec === 'vp9') {
-            log_1.Log.warn('No file extension specified, adding .webm automatically.');
-            filename += '.webm';
-            extension = 'webm';
-        }
-        if (codec === 'prores') {
-            log_1.Log.warn('No file extension specified, adding .mov automatically.');
-            filename += '.mov';
-            extension = 'mov';
-        }
+        log_1.Log.warn(`No file extension specified, adding ${defaultExtension} automatically.`);
+        return `${filename}.${defaultExtension}`;
     }
     return filename;
 };

package/dist/get-final-output-codec.js

@@ -2,55 +2,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFinalOutputCodec = void 0;
 const renderer_1 = require("@remotion/renderer");
-const fileExtensions = {
-    webm: ['vp8', 'vp9'],
-    hevc: ['h265'],
-    mp3: ['mp3'],
-    mov: ['prores'],
-    wav: ['wav'],
-    aac: ['aac'],
-    mkv: ['h264-mkv'],
-    gif: ['gif'],
-    mp4: ['h264'],
-    m4a: ['aac'],
-};
-const deriveExtensionFromFilename = (extension) => {
-    var _a;
+const deriveCodecsFromFilename = (extension) => {
+    var _a, _b;
     if (extension === null) {
-        return [];
+        return { possible: [], default: null };
     }
-    return (_a = fileExtensions[extension]) !== null && _a !== void 0 ? _a : [];
+    return {
+        default: (_a = renderer_1.RenderInternals.defaultCodecsForFileExtension[extension]) !== null && _a !== void 0 ? _a : null,
+        possible: (_b = renderer_1.RenderInternals.makeFileExtensionMap()[extension]) !== null && _b !== void 0 ? _b : [],
+    };
 };
 const getFinalOutputCodec = ({ cliFlag, configFile, downloadName, outName, }) => {
     const downloadNameExtension = renderer_1.RenderInternals.getExtensionOfFilename(downloadName);
     const outNameExtension = renderer_1.RenderInternals.getExtensionOfFilename(outName);
-    const derivedDownloadCodecs = deriveExtensionFromFilename(downloadNameExtension);
-    const derivedOutNameCodecs = deriveExtensionFromFilename(outNameExtension);
-    if (derivedDownloadCodecs.length > 0 &&
-        derivedOutNameCodecs.length > 0 &&
-        derivedDownloadCodecs.join('') !== derivedOutNameCodecs.join('')) {
+    const derivedDownloadCodecs = deriveCodecsFromFilename(downloadNameExtension);
+    const derivedOutNameCodecs = deriveCodecsFromFilename(outNameExtension);
+    if (derivedDownloadCodecs.possible.length > 0 &&
+        derivedOutNameCodecs.possible.length > 0 &&
+        derivedDownloadCodecs.possible.join('') !==
+            derivedOutNameCodecs.possible.join('')) {
         throw new TypeError(`The download name is ${downloadName} but the output name is ${outName}. The file extensions must match`);
     }
     if (cliFlag) {
-        if (derivedDownloadCodecs.length > 0 &&
-            derivedDownloadCodecs.indexOf(cliFlag) === -1) {
-            throw new TypeError(`The download name is ${downloadName} but --codec=${cliFlag} was passed. The download name implies a codec of ${derivedDownloadCodecs.join(' or ')} which does not align with the --codec flag.`);
+        if (derivedDownloadCodecs.possible.length > 0 &&
+            derivedDownloadCodecs.possible.indexOf(cliFlag) === -1) {
+            throw new TypeError(`The download name is ${downloadName} but --codec=${cliFlag} was passed. The download name implies a codec of ${derivedDownloadCodecs.possible.join(' or ')} which does not align with the --codec flag.`);
         }
-        if (derivedOutNameCodecs.length > 0 &&
-            derivedOutNameCodecs.indexOf(cliFlag) === -1) {
-            throw new TypeError(`The out name is ${outName} but --codec=${cliFlag} was passed. The out name implies a codec of ${derivedOutNameCodecs.join(' or ')} which does not align with the --codec flag.`);
+        if (derivedOutNameCodecs.possible.length > 0 &&
+            derivedOutNameCodecs.possible.indexOf(cliFlag) === -1) {
+            throw new TypeError(`The out name is ${outName} but --codec=${cliFlag} was passed. The out name implies a codec of ${derivedOutNameCodecs.possible.join(' or ')} which does not align with the --codec flag.`);
         }
         return { codec: cliFlag, reason: 'from --codec flag' };
     }
-    if (derivedDownloadCodecs.length > 0) {
+    if (derivedDownloadCodecs.possible.length > 0) {
         return {
-            codec: derivedDownloadCodecs[0],
+            codec: derivedDownloadCodecs.default,
             reason: 'derived from download name',
         };
     }
-    if (derivedOutNameCodecs.length > 0) {
+    if (derivedOutNameCodecs.possible.length > 0) {
         return {
-            codec: derivedOutNameCodecs[0],
+            codec: derivedOutNameCodecs.default,
             reason: 'derived from out name',
         };
     }

package/dist/get-render-media-options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRenderMediaOptions = void 0;
 const renderer_1 = require("@remotion/renderer");
 const config_1 = require("./config");
+const get_audio_codec_1 = require("./get-audio-codec");
 const get_cli_options_1 = require("./get-cli-options");
 const image_formats_1 = require("./image-formats");
 const getRenderMediaOptions = async ({ outputLocation, config, serveUrl, codec, remotionRoot, }) => {
@@ -12,6 +13,7 @@ const getRenderMediaOptions = async ({ outputLocation, config, serveUrl, codec,
         remotionRoot,
     });
     const imageFormat = (0, image_formats_1.getImageFormat)(codec);
+    const audioCodec = (0, get_audio_codec_1.getResolvedAudioCodec)();
     return {
         outputLocation,
         composition: {
@@ -47,6 +49,7 @@ const getRenderMediaOptions = async ({ outputLocation, config, serveUrl, codec,
         codec,
         audioBitrate,
         videoBitrate,
+        audioCodec,
     };
 };
 exports.getRenderMediaOptions = getRenderMediaOptions;

package/dist/parse-command-line.d.ts

@@ -1,4 +1,4 @@
-import type { BrowserExecutable, Codec, FfmpegExecutable, ImageFormat, OpenGlRenderer, PixelFormat, ProResProfile } from '@remotion/renderer';
+import type { AudioCodec, BrowserExecutable, Codec, FfmpegExecutable, ImageFormat, OpenGlRenderer, PixelFormat, ProResProfile } from '@remotion/renderer';
 export declare type CommandLineOptions = {
     ['browser-executable']: BrowserExecutable;
     ['ffmpeg-executable']: FfmpegExecutable;
@@ -20,6 +20,7 @@ export declare type CommandLineOptions = {
     ['public-dir']: string;
     ['audio-bitrate']: string;
     ['video-bitrate']: string;
+    ['audio-codec']: AudioCodec;
     crf: number;
     force: boolean;
     overwrite: boolean;

package/dist/render.js

@@ -13,6 +13,7 @@ const remotion_1 = require("remotion");
 const chalk_1 = require("./chalk");
 const config_1 = require("./config");
 const entry_point_1 = require("./entry-point");
+const get_audio_codec_1 = require("./get-audio-codec");
 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");
@@ -112,11 +113,11 @@ const render = async (remotionRoot, args) => {
         codec,
         scale,
     });
+    const audioCodec = (0, get_audio_codec_1.getResolvedAudioCodec)();
     const relativeOutputLocation = (0, get_filename_1.getOutputFilename)({
-        codec,
         imageSequence: shouldOutputImageSequence,
         compositionName: compositionId,
-        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec),
+        defaultExtension: renderer_1.RenderInternals.getFileExtensionFromCodec(codec, audioCodec),
         args: argsAfterComposition,
     });
     log_1.Log.info(chalk_1.chalk.gray(`Entry point = ${path_1.default.relative(process.cwd(), file)} (${entryPointReason}), Composition = ${compositionId} (${reason}), Codec = ${codec} (${codecReason}), Output = ${relativeOutputLocation}`));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/cli",
-	"version": "3.3.40",
+	"version": "3.3.42",
 	"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.40",
-		"@remotion/media-utils": "3.3.40",
-		"@remotion/player": "3.3.40",
-		"@remotion/renderer": "3.3.40",
+		"@remotion/bundler": "3.3.42",
+		"@remotion/media-utils": "3.3.42",
+		"@remotion/player": "3.3.42",
+		"@remotion/renderer": "3.3.42",
 		"better-opn": "2.1.1",
 		"dotenv": "9.0.2",
 		"memfs": "3.4.3",
 		"minimist": "1.2.6",
 		"prompts": "2.4.1",
-		"remotion": "3.3.40",
+		"remotion": "3.3.42",
 		"semver": "7.3.5",
 		"source-map": "0.6.1"
 	},
@@ -71,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "be5f606a81761f7f8e1e191ebabd5f8d225d8c09"
+	"gitHead": "bfb8098300fb75d4c27220eead954c2dc8e5b4ce"
 }