@remotion/renderer 3.2.30 → 3.2.32

package/dist/crf.d.ts

@@ -2,4 +2,8 @@ import type { Codec } from './codec';
 export declare type Crf = number | undefined;
 export declare const getDefaultCrfForCodec: (codec: Codec) => number;
 export declare const getValidCrfRanges: (codec: Codec) => [number, number];
-export declare const validateSelectedCrfAndCodecCombination: (crf: unknown, codec: Codec) => void;
+export declare const validateQualitySettings: ({ codec, crf, videoBitrate, }: {
+    crf: unknown;
+    codec: Codec;
+    videoBitrate: string | null | undefined;
+}) => string[];

package/dist/crf.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSelectedCrfAndCodecCombination = exports.getValidCrfRanges = exports.getDefaultCrfForCodec = void 0;
+exports.validateQualitySettings = exports.getValidCrfRanges = exports.getDefaultCrfForCodec = void 0;
 const is_audio_codec_1 = require("./is-audio-codec");
 const getDefaultCrfForCodec = (codec) => {
     if ((0, is_audio_codec_1.isAudioCodec)(codec)) {
@@ -46,19 +46,46 @@ const getValidCrfRanges = (codec) => {
     throw new TypeError(`Got unexpected codec "${codec}"`);
 };
 exports.getValidCrfRanges = getValidCrfRanges;
-const validateSelectedCrfAndCodecCombination = (crf, codec) => {
-    if (crf === null) {
-        return;
+const validateQualitySettings = ({ codec, crf, videoBitrate, }) => {
+    if (crf && videoBitrate) {
+        throw new Error('"crf" and "videoBitrate" can not both be set. Choose one of either.');
+    }
+    if (videoBitrate) {
+        if (codec === 'prores') {
+            console.warn('ProRes does not support videoBitrate. Ignoring.');
+            return [];
+        }
+        if ((0, is_audio_codec_1.isAudioCodec)(codec)) {
+            console.warn(`${codec} does not support videoBitrate. Ignoring.`);
+            return [];
+        }
+        return ['-b:v', videoBitrate];
+    }
+    if (crf === null || typeof crf === 'undefined') {
+        const actualCrf = (0, exports.getDefaultCrfForCodec)(codec);
+        return ['-crf', String(actualCrf)];
     }
     if (typeof crf !== 'number') {
         throw new TypeError('Expected CRF to be a number, but is ' + JSON.stringify(crf));
     }
     const range = (0, exports.getValidCrfRanges)(codec);
     if (crf === 0 && (codec === 'h264' || codec === 'h264-mkv')) {
-        throw new TypeError("Setting the CRF to 0 with a H264 codec is not supported anymore because of it's inconsistencies between platforms. Videos with CRF 0 cannot be played on iOS/macOS. 0 is a extreme value with inefficient settings which you probably want. Set CRF to a higher value to fix this error.");
+        throw new TypeError("Setting the CRF to 0 with a H264 codec is not supported anymore because of it's inconsistencies between platforms. Videos with CRF 0 cannot be played on iOS/macOS. 0 is a extreme value with inefficient settings which you probably do not want. Set CRF to a higher value to fix this error.");
     }
     if (crf < range[0] || crf > range[1]) {
+        if (range[0] === 0 && range[1] === 0) {
+            throw new TypeError(`The "${codec}" codec does not support the --crf option.`);
+        }
         throw new TypeError(`CRF must be between ${range[0]} and ${range[1]} for codec ${codec}. Passed: ${crf}`);
     }
+    if (codec === 'prores') {
+        console.warn('ProRes does not support the "crf" option. Ignoring.');
+        return [];
+    }
+    if ((0, is_audio_codec_1.isAudioCodec)(codec)) {
+        console.warn(`${codec} does not support the "crf" option. Ignoring.`);
+        return [];
+    }
+    return ['-crf', String(crf)];
 };
-exports.validateSelectedCrfAndCodecCombination = validateSelectedCrfAndCodecCombination;
+exports.validateQualitySettings = validateQualitySettings;

package/dist/ffmpeg-args-hook.d.ts

@@ -0,0 +1,4 @@
+export declare type FfmpegArgsHook = (info: {
+    type: 'pre-stitcher' | 'stitcher';
+    args: string[];
+}) => string[];

package/dist/ffmpeg-args-hook.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/index.d.ts

@@ -126,8 +126,11 @@ export declare const RenderInternals: {
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
     DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | null;
     validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
-    getDefaultCrfForCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => number;
-    validateSelectedCrfAndCodecCombination: (crf: unknown, codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
+    validateQualitySettings: ({ codec, crf, videoBitrate, }: {
+        crf: unknown;
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
+        videoBitrate: string | null | undefined;
+    }) => string[];
     validImageFormats: readonly ["png", "jpeg", "none"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
@@ -136,7 +139,10 @@ export declare const RenderInternals: {
     DEFAULT_TIMEOUT: number;
     getValidCrfRanges: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => [number, number];
     validateSelectedPixelFormatAndCodecCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
-    validateSelectedCodecAndProResCombination: (actualCodec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", actualProResProfile: "proxy" | "4444-xq" | "4444" | "hq" | "standard" | "light" | undefined) => void;
+    validateSelectedCodecAndProResCombination: ({ codec, proResProfile, }: {
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
+        proResProfile: "proxy" | "4444-xq" | "4444" | "hq" | "standard" | "light" | undefined;
+    }) => void;
     validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "jpeg" | "png" | "none") => "none" | "valid";
     DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
@@ -151,4 +157,5 @@ export declare const RenderInternals: {
         frame: number;
         durationInFrames: number;
     }) => number;
+    validateBitrate: (bitrate: unknown, name: string) => void;
 };

package/dist/index.js

@@ -74,6 +74,7 @@ const validate_frame_1 = require("./validate-frame");
 const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_scale_1 = require("./validate-scale");
+const validate_videobitrate_1 = require("./validate-videobitrate");
 const wait_for_symbolication_error_to_be_done_1 = require("./wait-for-symbolication-error-to-be-done");
 var combine_videos_1 = require("./combine-videos");
 Object.defineProperty(exports, "combineVideos", { enumerable: true, get: function () { return combine_videos_1.combineVideos; } });
@@ -139,8 +140,7 @@ exports.RenderInternals = {
     validateFrameRange: frame_range_1.validateFrameRange,
     DEFAULT_OPENGL_RENDERER: validate_opengl_renderer_1.DEFAULT_OPENGL_RENDERER,
     validateOpenGlRenderer: validate_opengl_renderer_1.validateOpenGlRenderer,
-    getDefaultCrfForCodec: crf_1.getDefaultCrfForCodec,
-    validateSelectedCrfAndCodecCombination: crf_1.validateSelectedCrfAndCodecCombination,
+    validateQualitySettings: crf_1.validateQualitySettings,
     validImageFormats: image_format_1.validImageFormats,
     validCodecs: codec_1.validCodecs,
     DEFAULT_PIXEL_FORMAT: pixel_format_1.DEFAULT_PIXEL_FORMAT,
@@ -161,6 +161,7 @@ exports.RenderInternals = {
     makeDownloadMap: download_map_1.makeDownloadMap,
     cleanDownloadMap: download_map_1.cleanDownloadMap,
     convertToPositiveFrameIndex: convert_to_positive_frame_index_1.convertToPositiveFrameIndex,
+    validateBitrate: validate_videobitrate_1.validateBitrate,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
 (0, check_apple_silicon_1.warnIfAppleSiliconIsNotUsingArm64Architecture)();

package/dist/make-assets-download-dir.d.ts

@@ -0,0 +1 @@
+export declare const makeAssetsDownloadTmpDir: () => string;

package/dist/make-assets-download-dir.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeAssetsDownloadTmpDir = void 0;
+const tmp_dir_1 = require("./tmp-dir");
+let dir = null;
+const makeAssetsDownloadTmpDir = () => {
+    if (dir) {
+        return dir;
+    }
+    dir = (0, tmp_dir_1.tmpDir)('remotion-assets-dir');
+    return dir;
+};
+exports.makeAssetsDownloadTmpDir = makeAssetsDownloadTmpDir;

package/dist/prespawn-ffmpeg.d.ts

@@ -19,8 +19,9 @@ declare type PreSticherOptions = {
     verbose: boolean;
     ffmpegExecutable: FfmpegExecutable | undefined;
     imageFormat: ImageFormat;
-    ffmpegOverride?: FfmpegOverrideFn;
+    ffmpegOverride: FfmpegOverrideFn;
     signal: CancelSignal;
+    videoBitrate: string | null;
 };
 export declare const prespawnFfmpeg: (options: PreSticherOptions) => Promise<{
     task: execa.ExecaChildProcess<string>;

package/dist/prespawn-ffmpeg.js

@@ -15,7 +15,7 @@ const pixel_format_1 = require("./pixel-format");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const prespawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : codec_1.DEFAULT_CODEC;
@@ -26,9 +26,8 @@ const prespawnFfmpeg = async (options) => {
         codec,
         scale: 1,
     });
-    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : (0, crf_1.getDefaultCrfForCodec)(codec);
-    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : pixel_format_1.DEFAULT_PIXEL_FORMAT;
-    await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
+    const pixelFormat = (_b = options.pixelFormat) !== null && _b !== void 0 ? _b : pixel_format_1.DEFAULT_PIXEL_FORMAT;
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_c = options.ffmpegExecutable) !== null && _c !== void 0 ? _c : null);
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
     if (encoderName === null) {
@@ -36,16 +35,15 @@ const prespawnFfmpeg = async (options) => {
     }
     const supportsCrf = codec !== 'prores';
     if (options.verbose) {
-        console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
+        console.log('[verbose] ffmpeg', (_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : 'ffmpeg in PATH');
         console.log('[verbose] encoder', encoderName);
         console.log('[verbose] pixelFormat', pixelFormat);
         if (supportsCrf) {
-            console.log('[verbose] crf', crf);
+            console.log('[verbose] crf', options.crf);
         }
         console.log('[verbose] codec', codec);
         console.log('[verbose] proResProfileName', proResProfileName);
     }
-    (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
     (0, pixel_format_1.validateSelectedPixelFormatAndCodecCombination)(pixelFormat, codec);
     const ffmpegArgs = [
         ['-r', options.fps.toFixed(2)],
@@ -61,12 +59,15 @@ const prespawnFfmpeg = async (options) => {
         // and specified the video codec.
         ['-c:v', encoderName],
         proResProfileName ? ['-profile:v', proResProfileName] : null,
-        supportsCrf ? ['-crf', String(crf)] : null,
         ['-pix_fmt', pixelFormat],
         // Without explicitly disabling auto-alt-ref,
         // transparent WebM generation doesn't work
         pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
-        ['-b:v', '1M'],
+        ...(0, crf_1.validateQualitySettings)({
+            crf: options.crf,
+            videoBitrate: options.videoBitrate,
+            codec,
+        }),
         '-y',
         options.outputLocation,
     ];
@@ -78,12 +79,12 @@ const prespawnFfmpeg = async (options) => {
     const finalFfmpegString = options.ffmpegOverride
         ? options.ffmpegOverride({ type: 'pre-stitcher', args: ffmpegString })
         : ffmpegString;
-    const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', finalFfmpegString);
+    const task = (0, execa_1.default)((_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg', finalFfmpegString);
     options.signal(() => {
         task.kill();
     });
     let ffmpegOutput = '';
-    (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
+    (_f = task.stderr) === null || _f === void 0 ? void 0 : _f.on('data', (data) => {
         const str = data.toString();
         ffmpegOutput += str;
         if (options.onProgress) {

package/dist/prores-profile.d.ts

@@ -1,5 +1,8 @@
 import type { Codec } from './codec';
 declare const proResProfileOptions: readonly ["4444-xq", "4444", "hq", "standard", "light", "proxy"];
 export declare type ProResProfile = typeof proResProfileOptions[number];
-export declare const validateSelectedCodecAndProResCombination: (actualCodec: Codec, actualProResProfile: ProResProfile | undefined) => void;
+export declare const validateSelectedCodecAndProResCombination: ({ codec, proResProfile, }: {
+    codec: Codec;
+    proResProfile: ProResProfile | undefined;
+}) => void;
 export {};

package/dist/prores-profile.js

@@ -9,13 +9,13 @@ const proResProfileOptions = [
     'light',
     'proxy',
 ];
-const validateSelectedCodecAndProResCombination = (actualCodec, actualProResProfile) => {
-    if (typeof actualProResProfile !== 'undefined' && actualCodec !== 'prores') {
-        throw new TypeError('You have set a ProRes profile but the codec is not "prores". Set the codec to "prores" or remove the ProRes profile.');
+const validateSelectedCodecAndProResCombination = ({ codec, proResProfile, }) => {
+    if (typeof proResProfile !== 'undefined' && codec !== 'prores') {
+        throw new TypeError(`You have set a ProRes profile but the codec is "${codec}". Set the codec to "prores" or remove the ProRes profile.`);
     }
-    if (actualProResProfile !== undefined &&
-        !proResProfileOptions.includes(actualProResProfile)) {
-        throw new TypeError(`The ProRes profile "${actualProResProfile}" is not valid. Valid options are ${proResProfileOptions
+    if (proResProfile !== undefined &&
+        !proResProfileOptions.includes(proResProfile)) {
+        throw new TypeError(`The ProRes profile "${proResProfile}" is not valid. Valid options are ${proResProfileOptions
             .map((p) => `"${p}"`)
             .join(', ')}`);
     }

package/dist/render-media.d.ts

@@ -66,6 +66,8 @@ export declare type RenderMediaOptions = {
     muted?: boolean;
     enforceAudioTrack?: boolean;
     ffmpegOverride?: FfmpegOverrideFn;
+    audioBitrate?: string | null;
+    videoBitrate?: string | null;
     onSlowestFrames?: OnSlowestFrames;
     disallowParallelEncoding?: boolean;
 } & ServeUrlOrWebpackBundle & ConcurrencyOrParallelism;
@@ -82,5 +84,5 @@ declare type ConcurrencyOrParallelism = {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-export declare const renderMedia: ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, onSlowestFrames, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
+export declare const renderMedia: ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, onSlowestFrames, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
 export {};

package/dist/render-media.js

@@ -26,6 +26,7 @@ const overwrite_1 = require("./overwrite");
 const perf_1 = require("./perf");
 const prespawn_ffmpeg_1 = require("./prespawn-ffmpeg");
 const prestitcher_memory_usage_1 = require("./prestitcher-memory-usage");
+const prores_profile_1 = require("./prores-profile");
 const quality_1 = require("./quality");
 const render_frames_1 = require("./render-frames");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
@@ -33,6 +34,7 @@ const validate_even_dimensions_with_codec_1 = require("./validate-even-dimension
 const validate_ffmpeg_override_1 = require("./validate-ffmpeg-override");
 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 getConcurrency = (others) => {
     if ('concurrency' in others) {
@@ -48,12 +50,16 @@ const getConcurrency = (others) => {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, onSlowestFrames, ...options }) => {
+const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, onSlowestFrames, ...options }) => {
     var _a, _b, _c, _d;
     (0, quality_1.validateQuality)(options.quality);
-    if (typeof crf !== 'undefined' && crf !== null) {
-        (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
-    }
+    (0, crf_1.validateQualitySettings)({ crf, codec, videoBitrate });
+    (0, validate_videobitrate_1.validateBitrate)(audioBitrate, 'audioBitrate');
+    (0, validate_videobitrate_1.validateBitrate)(videoBitrate, 'videoBitrate');
+    (0, prores_profile_1.validateSelectedCodecAndProResCombination)({
+        codec,
+        proResProfile,
+    });
     if (outputLocation) {
         (0, validate_output_filename_1.validateOutputFilename)(codec, (0, get_extension_of_filename_1.getExtensionOfFilename)(outputLocation));
     }
@@ -152,7 +158,8 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
                 ffmpegExecutable,
                 imageFormat,
                 signal: cancelPrestitcher.cancelSignal,
-                ffmpegOverride,
+                ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : (({ args }) => args),
+                videoBitrate: videoBitrate !== null && videoBitrate !== void 0 ? videoBitrate : null,
             });
             stitcherFfmpeg = preStitcher.task;
         }
@@ -290,6 +297,8 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
                 muted: disableAudio,
                 enforceAudioTrack,
                 ffmpegOverride,
+                audioBitrate,
+                videoBitrate,
             }),
             stitchStart,
         ]);

package/dist/stitch-frames-to-video.d.ts

@@ -9,6 +9,8 @@ import type { CancelSignal } from './make-cancel-signal';
 import type { PixelFormat } from './pixel-format';
 import type { ProResProfile } from './prores-profile';
 export declare type StitcherOptions = {
+    audioBitrate?: string | null;
+    videoBitrate?: string | null;
     fps: number;
     width: number;
     height: number;

package/dist/stitch-frames-to-video.js

@@ -25,9 +25,11 @@ const merge_audio_track_1 = require("./merge-audio-track");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const pixel_format_1 = require("./pixel-format");
 const preprocess_audio_track_1 = require("./preprocess-audio-track");
+const prores_profile_1 = require("./prores-profile");
 const truthy_1 = require("./truthy");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
+const validate_videobitrate_1 = require("./validate-videobitrate");
 const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
 const packageJson = fs_1.default.existsSync(packageJsonPath)
     ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
@@ -88,15 +90,19 @@ const spawnFfmpeg = async (options) => {
         codec,
         scale: 1,
     });
+    (0, prores_profile_1.validateSelectedCodecAndProResCombination)({
+        codec,
+        proResProfile: options.proResProfile,
+    });
+    (0, validate_videobitrate_1.validateBitrate)(options.audioBitrate, 'audioBitrate');
+    (0, validate_videobitrate_1.validateBitrate)(options.videoBitrate, 'videoBitrate');
     remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', false);
-    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : (0, crf_1.getDefaultCrfForCodec)(codec);
-    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : pixel_format_1.DEFAULT_PIXEL_FORMAT;
-    await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
+    const pixelFormat = (_b = options.pixelFormat) !== null && _b !== void 0 ? _b : pixel_format_1.DEFAULT_PIXEL_FORMAT;
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_c = options.ffmpegExecutable) !== null && _c !== void 0 ? _c : null);
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
     const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
     const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
-    const supportsCrf = (0, codec_supports_media_1.codecSupportsCrf)(codec);
     const tempFile = options.outputLocation
         ? null
         : path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final')}`);
@@ -109,13 +115,10 @@ const spawnFfmpeg = async (options) => {
         throw new Error('The output format has neither audio nor video. This can happen if you are rendering an audio codec and the output file has no audio or the muted flag was passed.');
     }
     if (options.verbose) {
-        console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
+        console.log('[verbose] ffmpeg', (_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : 'ffmpeg in PATH');
         console.log('[verbose] encoder', encoderName);
         console.log('[verbose] audioCodec', audioCodecName);
         console.log('[verbose] pixelFormat', pixelFormat);
-        if (supportsCrf) {
-            console.log('[verbose] crf', crf);
-        }
         if (options.ffmpegOverride) {
             console.log('[verbose] ffmpegOverride', options.ffmpegOverride);
         }
@@ -124,7 +127,11 @@ const spawnFfmpeg = async (options) => {
         console.log('[verbose] shouldRenderVideo', shouldRenderVideo);
         console.log('[verbose] proResProfileName', proResProfileName);
     }
-    (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
+    (0, crf_1.validateQualitySettings)({
+        crf: options.crf,
+        codec,
+        videoBitrate: options.videoBitrate,
+    });
     (0, pixel_format_1.validateSelectedPixelFormatAndCodecCombination)(pixelFormat, codec);
     const expectedFrames = options.assetsInfo.assets.length;
     const updateProgress = (preStitchProgress, muxProgress) => {
@@ -138,9 +145,9 @@ const spawnFfmpeg = async (options) => {
             onDownload: options.onDownload,
             fps: options.fps,
             expectedFrames,
-            verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
-            ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
-            ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
+            verbose: (_e = options.verbose) !== null && _e !== void 0 ? _e : false,
+            ffmpegExecutable: (_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : null,
+            ffprobeExecutable: (_g = options.ffprobeExecutable) !== null && _g !== void 0 ? _g : null,
             onProgress: (prog) => updateProgress(prog, 0),
             downloadMap: options.assetsInfo.downloadMap,
         })
@@ -156,7 +163,7 @@ const spawnFfmpeg = async (options) => {
             audioCodecName,
             // Set bitrate up to 320k, for aac it might effectively be lower
             '-b:a',
-            '320k',
+            (_h = options.audioBitrate) !== null && _h !== void 0 ? _h : '320k',
             options.force ? '-y' : null,
             (_j = options.outputLocation) !== null && _j !== void 0 ? _j : tempFile,
         ].filter(remotion_1.Internals.truthy));
@@ -210,17 +217,20 @@ const spawnFfmpeg = async (options) => {
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
-                supportsCrf ? ['-crf', String(crf)] : null,
                 ['-pix_fmt', pixelFormat],
                 // Without explicitly disabling auto-alt-ref,
                 // transparent WebM generation doesn't work
                 pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
-                ['-b:v', '1M'],
+                ...(0, crf_1.validateQualitySettings)({
+                    crf: options.crf,
+                    videoBitrate: options.videoBitrate,
+                    codec,
+                }),
             ]),
         codec === 'h264' ? ['-movflags', 'faststart'] : null,
         audioCodecName ? ['-c:a', audioCodecName] : null,
         // Set max bitrate up to 1024kbps, will choose lower if that's too much
-        audioCodecName ? ['-b:a', '512K'] : null,
+        audioCodecName ? ['-b:a', options.audioBitrate || '512K'] : null,
         // Ignore metadata that may come from remote media
         ['-map_metadata', '-1'],
         [

package/dist/validate-ffmpeg-args-hook.d.ts

@@ -0,0 +1,2 @@
+import type { FfmpegOverrideFn } from './ffmpeg-override';
+export declare const validateFfmpegArgsHook: (ffmpegArgsHook?: FfmpegOverrideFn) => void;

package/dist/validate-ffmpeg-args-hook.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFfmpegArgsHook = void 0;
+const validateFfmpegArgsHook = (ffmpegArgsHook) => {
+    if (typeof ffmpegArgsHook === 'undefined') {
+        return;
+    }
+    if (ffmpegArgsHook && typeof ffmpegArgsHook !== 'function') {
+        throw new TypeError(`Argument passed for "ffmpegArgsHook" is not a function: ${ffmpegArgsHook}`);
+    }
+};
+exports.validateFfmpegArgsHook = validateFfmpegArgsHook;

package/dist/validate-ffmpeg-override-fn.d.ts

@@ -0,0 +1,2 @@
+import type { FfmpegOverrideFn } from './ffmpeg-override';
+export declare const validateFfmpegOverride: (ffmpegArgsHook?: FfmpegOverrideFn) => void;

package/dist/validate-ffmpeg-override-fn.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFfmpegOverride = void 0;
+const validateFfmpegOverride = (ffmpegArgsHook) => {
+    if (typeof ffmpegArgsHook === 'undefined') {
+        return;
+    }
+    if (ffmpegArgsHook && typeof ffmpegArgsHook !== 'function') {
+        throw new TypeError(`Argument passed for "ffmpegArgsHook" is not a function: ${ffmpegArgsHook}`);
+    }
+};
+exports.validateFfmpegOverride = validateFfmpegOverride;

package/dist/validate-videobitrate.d.ts

@@ -0,0 +1 @@
+export declare const validateBitrate: (bitrate: unknown, name: string) => void;

package/dist/validate-videobitrate.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateBitrate = void 0;
+const validateBitrate = (bitrate, name) => {
+    if (bitrate === null || typeof bitrate === 'undefined') {
+        return;
+    }
+    if (typeof bitrate === 'number') {
+        throw new TypeError(`"${name}" must be a string ending in "K" or "M". Got a number: ${bitrate}`);
+    }
+    if (typeof bitrate !== 'string') {
+        throw new TypeError(`"${name}" must be a string or null, but got ${JSON.stringify(bitrate)}`);
+    }
+    if (!bitrate.endsWith('K') &&
+        !bitrate.endsWith('k') &&
+        !bitrate.endsWith('M')) {
+        throw new TypeError(`"${name}" must end in "K", "k" or "M", but got ${JSON.stringify(bitrate)}`);
+    }
+};
+exports.validateBitrate = validateBitrate;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.30",
+	"version": "3.2.32",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.2.30",
+		"remotion": "3.2.32",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -44,7 +44,7 @@
 		"react": "18.0.0",
 		"react-dom": "18.0.0",
 		"typescript": "^4.7.0",
-		"vitest": "^0.18.0"
+		"vitest": "0.18.0"
 	},
 	"keywords": [
 		"remotion",
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5dc5f4c010c47186c7911b575998296d6a65f7cb"
+	"gitHead": "4f7ab3637405d140041f898f95f78c99943d1b40"
 }

package/dist/assets/dl-browser.d.ts

@@ -1 +0,0 @@
-export declare const downloadBrowser: (url: string) => Promise<void>;

package/dist/assets/dl-browser.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadBrowser = void 0;
-const listeners = {};
-const isDownloading = {};
-const waitForFfmpegToBeDownloaded = (url) => {
-    return new Promise((resolve) => {
-        if (!listeners[url]) {
-            listeners[url] = [];
-        }
-        listeners[url].push(resolve);
-    });
-};
-const downloadBrowser = async (url) => {
-    if (isDownloading[url]) {
-        console.log('WAITING');
-        return waitForFfmpegToBeDownloaded(url);
-    }
-    isDownloading[url] = true;
-    await new Promise((resolve) => {
-        console.log('DOWNLOADING BROWSER');
-        setTimeout(resolve, 20000);
-    });
-    isDownloading[url] = false;
-    if (!listeners[url]) {
-        listeners[url] = [];
-    }
-    listeners[url].forEach((listener) => listener());
-    listeners[url] = [];
-};
-exports.downloadBrowser = downloadBrowser;
-(0, exports.downloadBrowser)('https://remotion.dev').then(() => {
-    (0, exports.downloadBrowser)('https://remotion.dev').then(() => {
-        (0, exports.downloadBrowser)('https://remotion.dev').then(() => console.log('FINISHED DOWNLOADING'));
-        (0, exports.downloadBrowser)('https://remotion.dev').then(() => console.log('FINISHED DOWNLOADING'));
-        (0, exports.downloadBrowser)('https://remotion.dev').then(() => console.log('FINISHED DOWNLOADING'));
-    });
-});