@remotion/renderer 4.0.0-alpha.217 → 4.0.0-alpha4

package/dist/image-format.js

@@ -2,36 +2,33 @@
 // Keeping the default image format PNG if you don't pass a
 // value to the renderer for backwards compatibility.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateStillImageFormat = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.DEFAULT_STILL_IMAGE_FORMAT = exports.DEFAULT_VIDEO_IMAGE_FORMAT = exports.validStillImageFormats = exports.validVideoImageFormats = void 0;
-exports.validVideoImageFormats = ['png', 'jpeg', 'none'];
-exports.validStillImageFormats = ['png', 'jpeg', 'pdf', 'webp'];
-exports.DEFAULT_VIDEO_IMAGE_FORMAT = 'jpeg';
-exports.DEFAULT_STILL_IMAGE_FORMAT = 'png';
+exports.validateNonNullImageFormat = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.DEFAULT_IMAGE_FORMAT = exports.validImageFormats = void 0;
+exports.validImageFormats = ['png', 'jpeg', 'none'];
+// However, the CLI will override it and use JPEG if suitable.
+exports.DEFAULT_IMAGE_FORMAT = 'png';
 // By returning a value, we improve testability as we can specifically test certain branches
-const validateSelectedPixelFormatAndImageFormatCombination = (pixelFormat, videoImageFormat) => {
-    if (videoImageFormat === 'none') {
+const validateSelectedPixelFormatAndImageFormatCombination = (pixelFormat, imageFormat) => {
+    if (imageFormat === 'none') {
         return 'none';
     }
     if (typeof pixelFormat === 'undefined') {
         return 'valid';
     }
-    if (!exports.validVideoImageFormats.includes(videoImageFormat)) {
-        throw new TypeError(`Value ${videoImageFormat} is not valid as an image format.`);
+    if (!exports.validImageFormats.includes(imageFormat)) {
+        throw new TypeError(`Value ${imageFormat} is not valid as an image format.`);
     }
     if (pixelFormat !== 'yuva420p' && pixelFormat !== 'yuva444p10le') {
         return 'valid';
     }
-    if (videoImageFormat !== 'png') {
+    if (imageFormat !== 'png') {
         throw new TypeError(`Pixel format was set to '${pixelFormat}' but the image format is not PNG. To render transparent videos, you need to set PNG as the image format.`);
     }
     return 'valid';
 };
 exports.validateSelectedPixelFormatAndImageFormatCombination = validateSelectedPixelFormatAndImageFormatCombination;
-const validateStillImageFormat = (imageFormat) => {
-    if (!exports.validStillImageFormats.includes(imageFormat)) {
-        throw new TypeError(String(`Image format should be one of: ${exports.validStillImageFormats
-            .map((v) => `"${v}"`)
-            .join(', ')}`));
+const validateNonNullImageFormat = (imageFormat) => {
+    if (imageFormat !== 'jpeg' && imageFormat !== 'png') {
+        throw new TypeError('Image format should be either "png" or "jpeg"');
     }
 };
-exports.validateStillImageFormat = validateStillImageFormat;
+exports.validateNonNullImageFormat = validateNonNullImageFormat;

package/dist/index.d.ts

@@ -11,23 +11,24 @@ export { BrowserExecutable } from './browser-executable';
 export { BrowserLog } from './browser-log';
 export { Codec, CodecOrUndefined } from './codec';
 export { Crf } from './crf';
+export { ensureFfmpeg, EnsureFfmpegOptions, ensureFfprobe, } from './ensure-ffmpeg';
 export { ErrorWithStackFrame } from './error-handling/handle-javascript-exception';
+export { FfmpegExecutable } from './ffmpeg-executable';
+export { FfmpegVersion } from './ffmpeg-flags';
 export type { FfmpegOverrideFn } from './ffmpeg-override';
 export { FileExtension } from './file-extensions';
 export { FrameRange } from './frame-range';
 export { getCanExtractFramesFast } from './get-can-extract-frames-fast';
 export { getCompositions } from './get-compositions';
-export { getActualConcurrency } from './get-concurrency';
-export { ImageFormat, StillImageFormat, validateSelectedPixelFormatAndImageFormatCombination, VideoImageFormat, } from './image-format';
+export { ImageFormat, StillImageFormat, validateSelectedPixelFormatAndImageFormatCombination, validImageFormats, } from './image-format';
 export type { LogLevel } from './log-level';
 export { CancelSignal, makeCancelSignal } from './make-cancel-signal';
 export { openBrowser } from './open-browser';
 export type { ChromiumOptions } from './open-browser';
-export { RemotionOption } from './options/option';
 export { PixelFormat } from './pixel-format';
 export { ProResProfile } from './prores-profile';
 export { renderFrames } from './render-frames';
-export { renderMedia, RenderMediaOnProgress, RenderMediaOptions, SlowFrame, StitchingState, } from './render-media';
+export { OnSlowestFrames, renderMedia, RenderMediaOnProgress, RenderMediaOptions, SlowFrame, StitchingState, } from './render-media';
 export { renderStill, RenderStillOptions } from './render-still';
 export { StitcherOptions, stitchFramesToVideo } from './stitch-frames-to-video';
 export { SymbolicatedStackFrame } from './symbolicate-stacktrace';
@@ -36,9 +37,17 @@ export { OpenGlRenderer } from './validate-opengl-renderer';
 export { validateOutputFilename } from './validate-output-filename';
 export declare const RenderInternals: {
     ensureLocalBrowser: (browser: import("./browser").Browser, preferredBrowserExecutable: import("./browser-executable").BrowserExecutable) => Promise<void>;
+    ffmpegHasFeature: ({ ffmpegExecutable, feature, remotionRoot, }: {
+        ffmpegExecutable: string | null;
+        feature: "enable-gpl" | "enable-libx265" | "enable-libvpx";
+        remotionRoot: string;
+    }) => Promise<boolean>;
     getActualConcurrency: (userPreference: string | number | null) => number;
+    validateFfmpeg: (customFfmpegBinary: string | null, remotionRoot: string, binary: "ffmpeg" | "ffprobe") => Promise<void>;
     serveStatic: (path: string | null, options: {
         port: number | null;
+        ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable;
+        ffprobeExecutable: import("./ffmpeg-executable").FfmpegExecutable;
         onDownload: import("./assets/download-and-map-assets-to-file").RenderMediaOnDownload;
         onError: (err: Error) => void;
         downloadMap: import("./assets/download-map").DownloadMap;
@@ -112,9 +121,10 @@ 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;
+    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";
-    validateJpegQuality: (q: number | undefined) => void;
+    validateQuality: (q: number | undefined) => void;
     DEFAULT_TIMEOUT: number;
     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;
@@ -129,7 +139,12 @@ export declare const RenderInternals: {
         durationInFrames: number;
     }) => number;
     findRemotionRoot: () => string;
+    getExecutableBinary: (ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable, remotionRoot: string, binary: "ffmpeg" | "ffprobe") => string | Promise<string>;
     validateBitrate: (bitrate: unknown, name: string) => void;
+    getFfmpegVersion: (options: {
+        ffmpegExecutable: string | null;
+        remotionRoot: string;
+    }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
     combineVideos: (options: {
         files: string[];
         filelistDir: string;
@@ -139,10 +154,10 @@ export declare const RenderInternals: {
         codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
         fps: number;
         numberOfGifLoops: number | null;
+        remotionRoot: string;
+        ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable;
         audioCodec: "mp3" | "aac" | "pcm-16" | "opus" | null;
     }) => Promise<void>;
-    getMinConcurrency: () => number;
-    getMaxConcurrency: () => any;
     getDefaultAudioCodec: ({ codec, preferLossless, }: {
         codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
         preferLossless: boolean;
@@ -260,47 +275,21 @@ export declare const RenderInternals: {
         };
         gif: {
             default: import("./file-extensions").FileExtension;
-            forAudioCodec: {
-                [x: string]: {
-                    possible: import("./file-extensions").FileExtension[];
-                    default: import("./file-extensions").FileExtension;
-                };
-            };
+            forAudioCodec: {};
         };
     };
     supportedAudioCodecs: {
         readonly h264: readonly ["aac", "pcm-16"];
         readonly 'h264-mkv': readonly ["pcm-16"];
         readonly aac: readonly ["aac", "pcm-16"];
-        readonly gif: const[];
+        readonly gif: readonly [];
         readonly h265: readonly ["aac", "pcm-16"];
         readonly mp3: readonly ["mp3", "pcm-16"];
-        readonly prores: readonly ["aac", "pcm-16"];
+        readonly prores: readonly ["pcm-16", "aac"];
         readonly vp8: readonly ["opus", "pcm-16"];
         readonly vp9: readonly ["opus", "pcm-16"];
         readonly wav: readonly ["pcm-16"];
     };
     makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif")[]>;
     defaultCodecsForFileExtension: Record<import("./file-extensions").FileExtension, "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">;
-    getExecutablePath: (type: "compositor" | "ffmpeg" | "ffprobe" | "ffmpeg-cwd") => string;
-    callFf: (bin: "ffmpeg" | "ffprobe", args: (string | null)[], options?: execa.Options<string> | undefined) => execa.ExecaChildProcess<string>;
-    callFfExtraOptions: () => {
-        env: {
-            DYLD_LIBRARY_PATH: string;
-            PATH?: undefined;
-            LD_LIBRARY_PATH?: undefined;
-        } | {
-            PATH: string;
-            DYLD_LIBRARY_PATH?: undefined;
-            LD_LIBRARY_PATH?: undefined;
-        } | {
-            LD_LIBRARY_PATH: string;
-            DYLD_LIBRARY_PATH?: undefined;
-            PATH?: undefined;
-        };
-    };
-    validStillImageFormats: readonly ["png", "jpeg", "pdf", "webp"];
-    validVideoImageFormats: readonly ["png", "jpeg", "none"];
-    DEFAULT_STILL_IMAGE_FORMAT: "jpeg" | "png" | "webp" | "pdf";
-    DEFAULT_VIDEO_IMAGE_FORMAT: "jpeg" | "png" | "none";
 };

package/dist/index.js

@@ -26,24 +26,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getActualConcurrency = exports.getCompositions = exports.getCanExtractFramesFast = exports.ErrorWithStackFrame = void 0;
+exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.getCanExtractFramesFast = exports.ErrorWithStackFrame = exports.ensureFfprobe = exports.ensureFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
 const download_file_1 = require("./assets/download-file");
 const download_map_1 = require("./assets/download-map");
 const audio_codec_1 = require("./audio-codec");
 const browser_1 = require("./browser");
 const TimeoutSettings_1 = require("./browser/TimeoutSettings");
-const call_ffmpeg_1 = require("./call-ffmpeg");
 const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
 const check_apple_silicon_1 = require("./check-apple-silicon");
 const codec_1 = require("./codec");
 const combine_videos_1 = require("./combine-videos");
-const get_executable_path_1 = require("./compositor/get-executable-path");
 const convert_to_positive_frame_index_1 = require("./convert-to-positive-frame-index");
 const delete_directory_1 = require("./delete-directory");
 const ensure_output_directory_1 = require("./ensure-output-directory");
 const symbolicate_error_1 = require("./error-handling/symbolicate-error");
 const symbolicateable_error_1 = require("./error-handling/symbolicateable-error");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const file_extensions_1 = require("./file-extensions");
 const find_closest_package_json_1 = require("./find-closest-package-json");
 const frame_range_1 = require("./frame-range");
@@ -57,32 +56,35 @@ const get_port_1 = require("./get-port");
 const image_format_1 = require("./image-format");
 const is_audio_codec_1 = require("./is-audio-codec");
 const is_serve_url_1 = require("./is-serve-url");
-const jpeg_quality_1 = require("./jpeg-quality");
 const log_level_1 = require("./log-level");
 const mime_types_1 = require("./mime-types");
 const open_browser_1 = require("./open-browser");
 const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
 const perf = __importStar(require("./perf"));
 const pixel_format_1 = require("./pixel-format");
+const quality_1 = require("./quality");
 const is_path_inside_1 = require("./serve-handler/is-path-inside");
 const serve_static_1 = require("./serve-static");
 const tmp_dir_1 = require("./tmp-dir");
 const validate_concurrency_1 = require("./validate-concurrency");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
+const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 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 ensure_ffmpeg_1 = require("./ensure-ffmpeg");
+Object.defineProperty(exports, "ensureFfmpeg", { enumerable: true, get: function () { return ensure_ffmpeg_1.ensureFfmpeg; } });
+Object.defineProperty(exports, "ensureFfprobe", { enumerable: true, get: function () { return ensure_ffmpeg_1.ensureFfprobe; } });
 var handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
 Object.defineProperty(exports, "ErrorWithStackFrame", { enumerable: true, get: function () { return handle_javascript_exception_1.ErrorWithStackFrame; } });
 var get_can_extract_frames_fast_1 = require("./get-can-extract-frames-fast");
 Object.defineProperty(exports, "getCanExtractFramesFast", { enumerable: true, get: function () { return get_can_extract_frames_fast_1.getCanExtractFramesFast; } });
 var get_compositions_1 = require("./get-compositions");
 Object.defineProperty(exports, "getCompositions", { enumerable: true, get: function () { return get_compositions_1.getCompositions; } });
-var get_concurrency_2 = require("./get-concurrency");
-Object.defineProperty(exports, "getActualConcurrency", { enumerable: true, get: function () { return get_concurrency_2.getActualConcurrency; } });
 var image_format_2 = require("./image-format");
 Object.defineProperty(exports, "validateSelectedPixelFormatAndImageFormatCombination", { enumerable: true, get: function () { return image_format_2.validateSelectedPixelFormatAndImageFormatCombination; } });
+Object.defineProperty(exports, "validImageFormats", { enumerable: true, get: function () { return image_format_2.validImageFormats; } });
 var make_cancel_signal_1 = require("./make-cancel-signal");
 Object.defineProperty(exports, "makeCancelSignal", { enumerable: true, get: function () { return make_cancel_signal_1.makeCancelSignal; } });
 var open_browser_2 = require("./open-browser");
@@ -99,7 +101,9 @@ var validate_output_filename_1 = require("./validate-output-filename");
 Object.defineProperty(exports, "validateOutputFilename", { enumerable: true, get: function () { return validate_output_filename_1.validateOutputFilename; } });
 exports.RenderInternals = {
     ensureLocalBrowser: get_local_browser_executable_1.ensureLocalBrowser,
+    ffmpegHasFeature: ffmpeg_flags_1.ffmpegHasFeature,
     getActualConcurrency: get_concurrency_1.getActualConcurrency,
+    validateFfmpeg: validate_ffmpeg_1.validateFfmpeg,
     serveStatic: serve_static_1.serveStatic,
     validateEvenDimensionsWithCodec: validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec,
     getFileExtensionFromCodec: get_extension_from_codec_1.getFileExtensionFromCodec,
@@ -130,9 +134,10 @@ exports.RenderInternals = {
     validateFrameRange: frame_range_1.validateFrameRange,
     DEFAULT_OPENGL_RENDERER: validate_opengl_renderer_1.DEFAULT_OPENGL_RENDERER,
     validateOpenGlRenderer: validate_opengl_renderer_1.validateOpenGlRenderer,
+    validImageFormats: image_format_1.validImageFormats,
     validCodecs: codec_1.validCodecs,
     DEFAULT_PIXEL_FORMAT: pixel_format_1.DEFAULT_PIXEL_FORMAT,
-    validateJpegQuality: jpeg_quality_1.validateJpegQuality,
+    validateQuality: quality_1.validateQuality,
     DEFAULT_TIMEOUT: TimeoutSettings_1.DEFAULT_TIMEOUT,
     DEFAULT_CODEC: codec_1.DEFAULT_CODEC,
     isAudioCodec: is_audio_codec_1.isAudioCodec,
@@ -144,23 +149,16 @@ exports.RenderInternals = {
     cleanDownloadMap: download_map_1.cleanDownloadMap,
     convertToPositiveFrameIndex: convert_to_positive_frame_index_1.convertToPositiveFrameIndex,
     findRemotionRoot: find_closest_package_json_1.findRemotionRoot,
+    getExecutableBinary: ffmpeg_flags_1.getExecutableBinary,
     validateBitrate: validate_videobitrate_1.validateBitrate,
+    getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
     combineVideos: combine_videos_1.combineVideos,
-    getMinConcurrency: validate_concurrency_1.getMinConcurrency,
-    getMaxConcurrency: validate_concurrency_1.getMaxConcurrency,
     getDefaultAudioCodec: audio_codec_1.getDefaultAudioCodec,
     validAudioCodecs: audio_codec_1.validAudioCodecs,
     defaultFileExtensionMap: file_extensions_1.defaultFileExtensionMap,
-    supportedAudioCodecs: audio_codec_1.supportedAudioCodecs,
+    supportedAudioCodecs: file_extensions_1.supportedAudioCodecs,
     makeFileExtensionMap: get_extension_from_codec_1.makeFileExtensionMap,
     defaultCodecsForFileExtension: get_extension_from_codec_1.defaultCodecsForFileExtension,
-    getExecutablePath: get_executable_path_1.getExecutablePath,
-    callFf: call_ffmpeg_1.callFf,
-    callFfExtraOptions: call_ffmpeg_1.callFfExtraOptions,
-    validStillImageFormats: image_format_1.validStillImageFormats,
-    validVideoImageFormats: image_format_1.validVideoImageFormats,
-    DEFAULT_STILL_IMAGE_FORMAT: image_format_1.DEFAULT_STILL_IMAGE_FORMAT,
-    DEFAULT_VIDEO_IMAGE_FORMAT: image_format_1.DEFAULT_VIDEO_IMAGE_FORMAT,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
 (0, check_apple_silicon_1.checkNodeVersionAndWarnAboutRosetta)();

package/dist/last-frame-from-video-cache.d.ts

@@ -1,13 +1,17 @@
 /// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 export declare type LastFrameOptions = {
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     offset: number;
     src: string;
     specialVCodecForTransparency: SpecialVCodecForTransparency;
     imageFormat: OffthreadVideoImageFormat;
     needsResize: [number, number] | null;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 };
 export declare const setLastFrameInCache: (options: LastFrameOptions, data: Buffer) => void;
 export declare const getLastFrameFromCache: (options: LastFrameOptions) => Buffer | null;

package/dist/last-frame-from-video-cache.js

@@ -6,6 +6,7 @@ const MAX_CACHE_SIZE = 50 * 1024 * 1024; // 50MB
 let bufferSize = 0;
 const makeLastFrameCacheKey = (options) => {
     return [
+        options.ffmpegExecutable,
         options.offset,
         options.src,
         options.imageFormat,

package/dist/merge-audio-track.d.ts

@@ -1,6 +1,8 @@
 import type { DownloadMap } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 import type { PreprocessedAudioTrack } from './preprocess-audio-track';
 declare type Options = {
+    ffmpegExecutable: FfmpegExecutable;
     files: PreprocessedAudioTrack[];
     outName: string;
     numberOfSeconds: number;

package/dist/merge-audio-track.js

@@ -4,21 +4,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeAudioTrack = void 0;
+const execa_1 = __importDefault(require("execa"));
 const path_1 = __importDefault(require("path"));
-const call_ffmpeg_1 = require("./call-ffmpeg");
 const chunk_1 = require("./chunk");
 const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
 const create_ffmpeg_merge_filter_1 = require("./create-ffmpeg-merge-filter");
 const create_silent_audio_1 = require("./create-silent-audio");
 const delete_directory_1 = require("./delete-directory");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const p_limit_1 = require("./p-limit");
 const tmp_dir_1 = require("./tmp-dir");
 const truthy_1 = require("./truthy");
-const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downloadMap, remotionRoot, }) => {
+const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, downloadMap, remotionRoot, }) => {
     if (files.length === 0) {
         await (0, create_silent_audio_1.createSilentAudio)({
             outName,
+            ffmpegExecutable,
             numberOfSeconds,
+            remotionRoot,
         });
         return;
     }
@@ -31,6 +34,7 @@ const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downl
             const chunkNames = await Promise.all(chunked.map(async (chunkFiles, i) => {
                 const chunkOutname = path_1.default.join(tempPath, `chunk-${i}.wav`);
                 await (0, exports.mergeAudioTrack)({
+                    ffmpegExecutable,
                     files: chunkFiles,
                     numberOfSeconds,
                     outName: chunkOutname,
@@ -40,6 +44,7 @@ const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downl
                 return chunkOutname;
             }));
             await (0, exports.mergeAudioTrack)({
+                ffmpegExecutable,
                 files: chunkNames.map((c) => ({
                     filter: {
                         pad_end: null,
@@ -61,6 +66,8 @@ const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downl
     const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)({
         filters: files,
         downloadMap,
+        ffmpegExecutable,
+        remotionRoot,
     });
     const args = [
         ...files.map((f) => ['-i', f.outName]),
@@ -71,7 +78,7 @@ const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downl
     ]
         .filter(truthy_1.truthy)
         .flat(2);
-    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', args);
+    const task = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), args);
     await task;
     cleanup();
 };

package/dist/offthread-video-server.d.ts

@@ -2,12 +2,15 @@ import type { RequestListener } from 'http';
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 export declare const extractUrlAndSourceFromUrl: (url: string) => {
     src: string;
     time: number;
     imageFormat: OffthreadVideoImageFormat;
 };
-export declare const startOffthreadVideoServer: ({ onDownload, onError, downloadMap, remotionRoot, }: {
+export declare const startOffthreadVideoServer: ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, remotionRoot, }: {
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
     downloadMap: DownloadMap;

package/dist/offthread-video-server.js

@@ -32,7 +32,7 @@ const extractUrlAndSourceFromUrl = (url) => {
     };
 };
 exports.extractUrlAndSourceFromUrl = extractUrlAndSourceFromUrl;
-const startOffthreadVideoServer = ({ onDownload, onError, downloadMap, remotionRoot, }) => {
+const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, remotionRoot, }) => {
     return (req, res) => {
         if (!req.url) {
             throw new Error('Request came in without URL');
@@ -61,6 +61,8 @@ const startOffthreadVideoServer = ({ onDownload, onError, downloadMap, remotionR
             return (0, extract_frame_from_video_1.extractFrameFromVideo)({
                 time,
                 src: to,
+                ffmpegExecutable,
+                ffprobeExecutable,
                 imageFormat,
                 downloadMap,
                 remotionRoot,

package/dist/open-browser.d.ts

@@ -21,6 +21,5 @@ export declare const openBrowser: (browser: Browser, options?: {
     chromiumOptions?: ChromiumOptions;
     forceDeviceScaleFactor?: number;
     viewport?: Viewport;
-    indentationString?: string;
 }) => Promise<PuppeteerBrowser>;
 export {};

package/dist/open-browser.js

@@ -32,7 +32,7 @@ exports.killAllBrowsers = killAllBrowsers;
  * @see [Documentation](https://www.remotion.dev/docs/renderer/open-browser)
  */
 const openBrowser = async (browser, options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     if (browser === 'firefox') {
         throw new TypeError('Firefox supported is not yet turned on. Stay tuned for the future.');
     }
@@ -43,7 +43,6 @@ const openBrowser = async (browser, options) => {
         executablePath,
         product: browser,
         dumpio: (_e = options === null || options === void 0 ? void 0 : options.shouldDumpIo) !== null && _e !== void 0 ? _e : false,
-        indentationString: (_f = options === null || options === void 0 ? void 0 : options.indentationString) !== null && _f !== void 0 ? _f : '',
         args: [
             'about:blank',
             '--allow-pre-commit-input',
@@ -76,7 +75,7 @@ const openBrowser = async (browser, options) => {
             '--enable-blink-features=IdleDetection',
             '--export-tagged-pdf',
             '--intensive-wake-up-throttling-policy=0',
-            ((_h = (_g = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _g === void 0 ? void 0 : _g.headless) !== null && _h !== void 0 ? _h : true) ? '--headless' : null,
+            ((_g = (_f = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _f === void 0 ? void 0 : _f.headless) !== null && _g !== void 0 ? _g : true) ? '--headless' : null,
             '--no-sandbox',
             '--disable-setuid-sandbox',
             ...customGlRenderer,
@@ -97,17 +96,17 @@ const openBrowser = async (browser, options) => {
             (options === null || options === void 0 ? void 0 : options.forceDeviceScaleFactor)
                 ? `--force-device-scale-factor=${options.forceDeviceScaleFactor}`
                 : null,
-            ((_j = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _j === void 0 ? void 0 : _j.ignoreCertificateErrors)
+            ((_h = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _h === void 0 ? void 0 : _h.ignoreCertificateErrors)
                 ? '--ignore-certificate-errors'
                 : null,
-            ...(((_k = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _k === void 0 ? void 0 : _k.disableWebSecurity)
+            ...(((_j = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _j === void 0 ? void 0 : _j.disableWebSecurity)
                 ? ['--disable-web-security']
                 : []),
-            ((_l = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _l === void 0 ? void 0 : _l.userAgent)
+            ((_k = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _k === void 0 ? void 0 : _k.userAgent)
                 ? `--user-agent="${options.chromiumOptions.userAgent}"`
                 : null,
         ].filter(Boolean),
-        defaultViewport: (_m = options === null || options === void 0 ? void 0 : options.viewport) !== null && _m !== void 0 ? _m : {
+        defaultViewport: (_l = options === null || options === void 0 ? void 0 : options.viewport) !== null && _l !== void 0 ? _l : {
             height: 720,
             width: 1280,
             deviceScaleFactor: 1,

package/dist/perf.d.ts

@@ -1,5 +1,5 @@
 declare type PerfId = 'activate-target' | 'capture' | 'save' | 'extract-frame' | 'piping';
 export declare const startPerfMeasure: (marker: PerfId) => number;
 export declare const stopPerfMeasure: (id: number) => void;
-export declare const getPerf: () => string[];
+export declare const logPerf: () => void;
 export {};

package/dist/perf.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPerf = exports.stopPerfMeasure = exports.startPerfMeasure = void 0;
+exports.logPerf = exports.stopPerfMeasure = exports.startPerfMeasure = void 0;
 const perf = {
     'activate-target': [],
     capture: [],
@@ -26,12 +26,10 @@ const stopPerfMeasure = (id) => {
     delete map[id];
 };
 exports.stopPerfMeasure = stopPerfMeasure;
-const getPerf = () => {
-    return [
-        'Render performance:',
-        ...Object.keys(perf).map((p) => {
-            return `  ${p} => ${perf[p].reduce((a, b) => a + b, 0) / perf[p].length} (n = ${perf[p].length})`;
-        }),
-    ];
+const logPerf = () => {
+    console.log('Render performance:');
+    Object.keys(perf).forEach((p) => {
+        console.log(`  ${p} => ${perf[p].reduce((a, b) => a + b, 0) / perf[p].length} (n = ${perf[p].length})`);
+    });
 };
-exports.getPerf = getPerf;
+exports.logPerf = logPerf;

package/dist/prepare-server.d.ts

@@ -1,9 +1,12 @@
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';
-export declare const prepareServer: ({ onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, remotionRoot, }: {
+import type { FfmpegExecutable } from './ffmpeg-executable';
+export declare const prepareServer: ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, remotionRoot, }: {
     webpackConfigOrServeUrl: string;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     port: number | null;
     downloadMap: DownloadMap;
     remotionRoot: string;

package/dist/prepare-server.js

@@ -9,11 +9,13 @@ const path_1 = __importDefault(require("path"));
 const is_serve_url_1 = require("./is-serve-url");
 const serve_static_1 = require("./serve-static");
 const wait_for_symbolication_error_to_be_done_1 = require("./wait-for-symbolication-error-to-be-done");
-const prepareServer = async ({ onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, remotionRoot, }) => {
+const prepareServer = async ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, remotionRoot, }) => {
     if ((0, is_serve_url_1.isServeUrl)(webpackConfigOrServeUrl)) {
         const { port: offthreadPort, close: closeProxy } = await (0, serve_static_1.serveStatic)(null, {
             onDownload,
             onError,
+            ffmpegExecutable,
+            ffprobeExecutable,
             port,
             downloadMap,
             remotionRoot,
@@ -35,6 +37,8 @@ const prepareServer = async ({ onDownload, onError, webpackConfigOrServeUrl, por
     const { port: serverPort, close } = await (0, serve_static_1.serveStatic)(webpackConfigOrServeUrl, {
         onDownload,
         onError,
+        ffmpegExecutable,
+        ffprobeExecutable,
         port,
         downloadMap,
         remotionRoot,

package/dist/preprocess-audio-track.d.ts

@@ -1,12 +1,16 @@
 import type { DownloadMap } from './assets/download-map';
 import type { MediaAsset } from './assets/types';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 import type { ProcessedTrack } from './stringify-ffmpeg-filter';
 declare type Options = {
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     outName: string;
     asset: MediaAsset;
     expectedFrames: number;
     fps: number;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 };
 export declare type PreprocessedAudioTrack = {
     outName: string;

package/dist/preprocess-audio-track.js

@@ -1,15 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preprocessAudioTrack = void 0;
+const execa_1 = __importDefault(require("execa"));
 const get_audio_channels_1 = require("./assets/get-audio-channels");
 const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
-const call_ffmpeg_1 = require("./call-ffmpeg");
 const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const p_limit_1 = require("./p-limit");
 const resolve_asset_src_1 = require("./resolve-asset-src");
 const sample_rate_1 = require("./sample-rate");
-const preprocessAudioTrackUnlimited = async ({ outName, asset, expectedFrames, fps, downloadMap, }) => {
-    const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)(downloadMap, (0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
+const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutable, outName, asset, expectedFrames, fps, downloadMap, remotionRoot, }) => {
+    const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)(downloadMap, (0, resolve_asset_src_1.resolveAssetSrc)(asset.src), ffprobeExecutable, remotionRoot);
     const filter = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilter)({
         asset,
         durationInFrames: expectedFrames,
@@ -29,7 +33,7 @@ const preprocessAudioTrackUnlimited = async ({ outName, asset, expectedFrames, f
         ['-ar', String(sample_rate_1.DEFAULT_SAMPLE_RATE)],
         ['-y', outName],
     ].flat(2);
-    await (0, call_ffmpeg_1.callFf)('ffmpeg', args);
+    await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), args);
     cleanup();
     return { outName, filter };
 };