@remotion/renderer 3.2.44 → 3.3.1

package/dist/render-media.js

@@ -15,6 +15,7 @@ const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
 const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
 const ensure_output_directory_1 = require("./ensure-output-directory");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_extension_of_filename_1 = require("./get-extension-of-filename");
@@ -56,7 +57,8 @@ const getConcurrency = (others) => {
  */
 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, validate_ffmpeg_1.validateFfmpeg)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null);
+    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    (0, validate_ffmpeg_1.validateFfmpeg)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null, remotionRoot, 'ffmpeg');
     (0, quality_1.validateQuality)(options.quality);
     (0, crf_1.validateQualitySettings)({ crf, codec, videoBitrate });
     (0, validate_videobitrate_1.validateBitrate)(audioBitrate, 'audioBitrate');
@@ -168,7 +170,7 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
                 signal: cancelPrestitcher.cancelSignal,
                 ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : (({ args }) => args),
                 videoBitrate: videoBitrate !== null && videoBitrate !== void 0 ? videoBitrate : null,
-            });
+            }, remotionRoot);
             stitcherFfmpeg = preStitcher.task;
         }
     };

package/dist/render-still.js

@@ -35,6 +35,7 @@ const browser_1 = require("./browser");
 const convert_to_positive_frame_index_1 = require("./convert-to-positive-frame-index");
 const ensure_output_directory_1 = require("./ensure-output-directory");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const image_format_1 = require("./image-format");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
 const open_browser_1 = require("./open-browser");
@@ -105,7 +106,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
             await page.close();
         }
         else {
-            browserInstance.close().catch((err) => {
+            browserInstance.close(true).catch((err) => {
                 console.log('Unable to close browser', err);
             });
         }
@@ -183,6 +184,7 @@ const renderStill = (options) => {
             ffprobeExecutable: (_b = options.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
             port: (_c = options.port) !== null && _c !== void 0 ? _c : null,
             downloadMap,
+            remotionRoot: (0, find_closest_package_json_1.findRemotionRoot)(),
         })
             .then(({ serveUrl, closeServer, offthreadPort }) => {
             close = closeServer;

package/dist/replace-browser.d.ts

@@ -1,6 +1,6 @@
 import type { Browser } from './browser/Browser';
 export declare type BrowserReplacer = {
     getBrowser: () => Browser;
-    replaceBrowser: (make: () => Promise<Browser>) => Promise<Browser>;
+    replaceBrowser: (make: () => Promise<Browser>, makeNewPages: () => Promise<void>) => Promise<Browser>;
 };
 export declare const handleBrowserCrash: (instance: Browser) => BrowserReplacer;

package/dist/replace-browser.js

@@ -7,7 +7,7 @@ const handleBrowserCrash = (instance) => {
     let replacing = false;
     return {
         getBrowser: () => _instance,
-        replaceBrowser: async (make) => {
+        replaceBrowser: async (make, makeNewPages) => {
             if (replacing) {
                 const waiter = new Promise((resolve, reject) => {
                     waiters.push({
@@ -19,7 +19,7 @@ const handleBrowserCrash = (instance) => {
             }
             try {
                 replacing = true;
-                await instance
+                await _instance
                     .close(true)
                     .then(() => {
                     console.log('Killed previous browser and making new one');
@@ -29,6 +29,7 @@ const handleBrowserCrash = (instance) => {
                 });
                 const browser = await make();
                 _instance = browser;
+                await makeNewPages();
                 waiters.forEach((w) => w.resolve(browser));
                 console.log('Made new browser');
                 return browser;

package/dist/screenshot-task.d.ts

@@ -2,4 +2,4 @@
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 import type { StillImageFormat } from './image-format';
-export declare const _screenshotTask: (page: Page, format: StillImageFormat, options: ScreenshotOptions) => Promise<Buffer | string>;
+export declare const screenshotTask: (page: Page, format: StillImageFormat, options: ScreenshotOptions) => Promise<Buffer | string>;

package/dist/screenshot-task.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._screenshotTask = void 0;
+exports.screenshotTask = void 0;
 const fs_1 = __importDefault(require("fs"));
 const perf_1 = require("./perf");
-const _screenshotTask = async (page, format, options) => {
+const screenshotTask = async (page, format, options) => {
     var _a;
     const client = page._client();
     const target = page.target();
@@ -51,4 +51,4 @@ const _screenshotTask = async (page, format, options) => {
         throw err;
     }
 };
-exports._screenshotTask = _screenshotTask;
+exports.screenshotTask = screenshotTask;

package/dist/seek-to-frame.d.ts

@@ -1,4 +1,5 @@
 import type { Page } from './browser/BrowserPage';
+export declare const waitForReady: (page: Page) => Promise<unknown>;
 export declare const seekToFrame: ({ frame, page, }: {
     frame: number;
     page: Page;

package/dist/seek-to-frame.js

@@ -1,9 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.seekToFrame = void 0;
+exports.seekToFrame = exports.waitForReady = void 0;
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
+const waitForReady = (page) => {
+    return Promise.race([
+        new Promise((_, reject) => {
+            page.on("disposed" /* PageEmittedEvents.Disposed */, () => {
+                reject(new Error('Target closed (page disposed)'));
+            });
+        }),
+        new Promise((_, reject) => {
+            page.browser.on("closed-silent" /* BrowserEmittedEvents.ClosedSilent */, () => {
+                reject(new Error('Target closed'));
+            });
+        }),
+        page
+            .mainFrame()
+            ._mainWorld.waitForFunction(page.browser, 'window.ready === true')
+            .catch((err) => {
+            throw err;
+        }),
+    ]);
+};
+exports.waitForReady = waitForReady;
 const seekToFrame = async ({ frame, page, }) => {
-    await page.waitForFunction(page.browser, 'window.ready === true');
+    await (0, exports.waitForReady)(page);
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: (f) => {
             window.remotion_setFrame(f);
@@ -12,7 +33,7 @@ const seekToFrame = async ({ frame, page, }) => {
         frame,
         page,
     });
-    await page.waitForFunction(page.browser, 'window.ready === true');
+    await (0, exports.waitForReady)(page);
     await page.evaluateHandle('document.fonts.ready');
 };
 exports.seekToFrame = seekToFrame;

package/dist/serve-static.d.ts

@@ -8,6 +8,7 @@ export declare const serveStatic: (path: string | null, options: {
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 }) => Promise<{
     port: number;
     close: () => Promise<void>;

package/dist/serve-static.js

@@ -17,6 +17,7 @@ const serveStatic = async (path, options) => {
         onDownload: options.onDownload,
         onError: options.onError,
         downloadMap: options.downloadMap,
+        remotionRoot: options.remotionRoot,
     });
     try {
         const connections = {};

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { RenderAssetInfo } from './assets/download-map';
 import type { Codec } from './codec';
@@ -36,4 +37,10 @@ export declare type StitcherOptions = {
     enforceAudioTrack?: boolean;
     ffmpegOverride?: FfmpegOverrideFn;
 };
+declare type ReturnType = {
+    task: Promise<Buffer | null>;
+    getLogs: () => string;
+};
+export declare const spawnFfmpeg: (options: StitcherOptions, remotionRoot: string) => Promise<ReturnType>;
 export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<Buffer | null>;
+export {};

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

@@ -1,12 +1,34 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stitchFramesToVideo = void 0;
+exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
-const fs_1 = __importDefault(require("fs"));
-const promises_1 = require("fs/promises");
+const fs_1 = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
@@ -17,6 +39,8 @@ const codec_supports_media_1 = require("./codec-supports-media");
 const convert_number_of_gif_loops_to_ffmpeg_1 = require("./convert-number-of-gif-loops-to-ffmpeg");
 const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_audio_codec_name_1 = require("./get-audio-codec-name");
 const get_codec_name_1 = require("./get-codec-name");
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
@@ -34,7 +58,7 @@ 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'))
     : null;
-const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, remotionRoot, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
@@ -59,6 +83,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
             expectedFrames,
             fps,
             downloadMap,
+            remotionRoot,
         });
         preprocessProgress[index] = 1;
         updateProgress();
@@ -71,6 +96,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
         outName,
         numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
         downloadMap,
+        remotionRoot,
     });
     (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     onProgress(1);
@@ -79,8 +105,8 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     });
     return outName;
 };
-const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+const spawnFfmpeg = async (options, remotionRoot) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     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;
@@ -98,7 +124,7 @@ const spawnFfmpeg = async (options) => {
     (0, validate_videobitrate_1.validateBitrate)(options.videoBitrate, 'videoBitrate');
     remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', false);
     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);
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_c = options.ffmpegExecutable) !== null && _c !== void 0 ? _c : null, remotionRoot, 'ffmpeg');
     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);
@@ -150,34 +176,36 @@ const spawnFfmpeg = async (options) => {
             ffprobeExecutable: (_g = options.ffprobeExecutable) !== null && _g !== void 0 ? _g : null,
             onProgress: (prog) => updateProgress(prog, 0),
             downloadMap: options.assetsInfo.downloadMap,
+            remotionRoot,
         })
         : null;
     if (mediaSupport.audio && !mediaSupport.video) {
         if (!audioCodecName) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
-        const ffmpegTask = (0, execa_1.default)('ffmpeg', [
+        const ffmpegTask = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_h = options.ffmpegExecutable) !== null && _h !== void 0 ? _h : null, remotionRoot, 'ffmpeg'), [
             '-i',
             audio,
             '-c:a',
             audioCodecName,
             // Set bitrate up to 320k, for aac it might effectively be lower
             '-b:a',
-            (_h = options.audioBitrate) !== null && _h !== void 0 ? _h : '320k',
+            (_j = options.audioBitrate) !== null && _j !== void 0 ? _j : '320k',
             options.force ? '-y' : null,
-            (_j = options.outputLocation) !== null && _j !== void 0 ? _j : tempFile,
+            (_k = options.outputLocation) !== null && _k !== void 0 ? _k : tempFile,
         ].filter(remotion_1.Internals.truthy));
-        (_k = options.cancelSignal) === null || _k === void 0 ? void 0 : _k.call(options, () => {
+        (_l = options.cancelSignal) === null || _l === void 0 ? void 0 : _l.call(options, () => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, expectedFrames);
+        (_m = options.onProgress) === null || _m === void 0 ? void 0 : _m.call(options, expectedFrames);
         if (audio) {
             await (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(audio));
         }
         const file = await new Promise((resolve, reject) => {
             if (tempFile) {
-                (0, promises_1.readFile)(tempFile)
+                fs_1.promises
+                    .readFile(tempFile)
                     .then((f) => {
                     return resolve(f);
                 })
@@ -195,8 +223,8 @@ const spawnFfmpeg = async (options) => {
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
-            ? [['-i', (_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation]]
+        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
+            ? [['-i', (_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
@@ -204,16 +232,16 @@ const spawnFfmpeg = async (options) => {
                 ['-i', options.assetsInfo.imageSequenceName],
             ]),
         audio ? ['-i', audio] : null,
-        ((_p = options.numberOfGifLoops) !== null && _p !== void 0 ? _p : null) === null
+        ((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null) === null
             ? null
             : [
                 '-loop',
-                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null),
+                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_r = options.numberOfGifLoops) !== null && _r !== void 0 ? _r : null),
             ],
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_r = options.internalOptions) === null || _r === void 0 ? void 0 : _r.preEncodedFileLocation)
+        ...(((_s = options.internalOptions) === null || _s === void 0 ? void 0 : _s.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -239,7 +267,7 @@ const spawnFfmpeg = async (options) => {
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
         options.force ? '-y' : null,
-        (_s = options.outputLocation) !== null && _s !== void 0 ? _s : tempFile,
+        (_t = options.outputLocation) !== null && _t !== void 0 ? _t : tempFile,
     ];
     if (options.verbose) {
         console.log('Generated FFMPEG command:');
@@ -253,15 +281,15 @@ const spawnFfmpeg = async (options) => {
         console.log('Generated final FFMPEG command:');
         console.log(finalFfmpegString);
     }
-    const task = (0, execa_1.default)((_t = options.ffmpegExecutable) !== null && _t !== void 0 ? _t : 'ffmpeg', finalFfmpegString, {
+    const task = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_u = options.ffmpegExecutable) !== null && _u !== void 0 ? _u : null, remotionRoot, 'ffmpeg'), finalFfmpegString, {
         cwd: options.dir,
     });
-    (_u = options.cancelSignal) === null || _u === void 0 ? void 0 : _u.call(options, () => {
+    (_v = options.cancelSignal) === null || _v === void 0 ? void 0 : _v.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_v = task.stderr) === null || _v === void 0 ? void 0 : _v.on('data', (data) => {
+    (_w = task.stderr) === null || _w === void 0 ? void 0 : _w.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -290,7 +318,8 @@ const spawnFfmpeg = async (options) => {
                 (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
                 return null;
             }
-            return (0, promises_1.readFile)(tempFile)
+            return fs_1.promises
+                .readFile(tempFile)
                 .then((file) => {
                 return Promise.all([
                     file,
@@ -303,8 +332,10 @@ const spawnFfmpeg = async (options) => {
         getLogs: () => ffmpegOutput,
     };
 };
+exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
-    const { task, getLogs } = await spawnFfmpeg(options);
+    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options, remotionRoot);
     const happyPath = task.catch(() => {
         throw new Error(getLogs());
     });

package/dist/validate-ffmpeg.d.ts

@@ -1,5 +1,7 @@
-export declare const binaryExists: (name: 'ffmpeg' | 'brew', localFFmpeg: string | null) => boolean;
+export declare const customExecutableExists: (localExecutable: string) => boolean;
+export declare const binaryExists: (name: 'ffmpeg' | 'ffprobe') => boolean;
 export declare const checkAndValidateFfmpegVersion: (options: {
     ffmpegExecutable: string | null;
+    remotionRoot: string;
 }) => Promise<void>;
-export declare const validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
+export declare const validateFfmpeg: (customFfmpegBinary: string | null, remotionRoot: string, binary: 'ffmpeg' | 'ffprobe') => Promise<void>;

package/dist/validate-ffmpeg.js

@@ -3,25 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFfmpeg = exports.checkAndValidateFfmpegVersion = exports.binaryExists = void 0;
+exports.validateFfmpeg = exports.checkAndValidateFfmpegVersion = exports.binaryExists = exports.customExecutableExists = void 0;
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const warn_about_ffmpeg_version_1 = require("./warn-about-ffmpeg-version");
 const existsMap = {};
-const binaryExists = (name, localFFmpeg) => {
-    if (typeof existsMap[name] !== 'undefined') {
-        return existsMap[name];
+const customExecutableExists = (localExecutable) => {
+    try {
+        (0, fs_1.statSync)(localExecutable);
+        existsMap[localExecutable] = true;
     }
-    if (name === 'ffmpeg' && localFFmpeg) {
-        try {
-            (0, fs_1.statSync)(localFFmpeg);
-            existsMap[name] = true;
-        }
-        catch (err) {
-            existsMap[name] = false;
-        }
+    catch (err) {
+        existsMap[localExecutable] = false;
+    }
+    return existsMap[localExecutable];
+};
+exports.customExecutableExists = customExecutableExists;
+const binaryExists = (name) => {
+    if (typeof existsMap[name] !== 'undefined') {
         return existsMap[name];
     }
     const isWin = os_1.default.platform() === 'win32';
@@ -37,52 +38,40 @@ const binaryExists = (name, localFFmpeg) => {
     }
 };
 exports.binaryExists = binaryExists;
-const isHomebrewInstalled = () => {
-    return (0, exports.binaryExists)('brew', null);
-};
 const checkAndValidateFfmpegVersion = async (options) => {
     const ffmpegVersion = await (0, ffmpeg_flags_1.getFfmpegVersion)({
         ffmpegExecutable: options.ffmpegExecutable,
+        remotionRoot: options.remotionRoot,
     });
     const buildConf = await (0, ffmpeg_flags_1.getFfmpegBuildInfo)({
         ffmpegExecutable: options.ffmpegExecutable,
+        remotionRoot: options.remotionRoot,
     });
     (0, warn_about_ffmpeg_version_1.warnAboutFfmpegVersion)({ ffmpegVersion, buildConf });
 };
 exports.checkAndValidateFfmpegVersion = checkAndValidateFfmpegVersion;
-const validateFfmpeg = async (customFfmpegBinary) => {
-    if (process.platform === 'linux' && (0, fs_1.existsSync)('/opt/bin/ffmpeg')) {
-        return Promise.resolve();
+const validateFfmpeg = async (customFfmpegBinary, remotionRoot, binary) => {
+    const ffmpegExists = (0, exports.binaryExists)(binary);
+    if (ffmpegExists) {
+        return;
     }
-    const ffmpegExists = (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
-    if (!ffmpegExists) {
-        if (customFfmpegBinary) {
-            console.error('FFmpeg executable not found:');
-            console.error(customFfmpegBinary);
-            throw new Error('FFmpeg not found');
-        }
-        console.error('It looks like FFMPEG is not installed');
-        if (os_1.default.platform() === 'darwin' && isHomebrewInstalled()) {
-            console.error('Run `brew install ffmpeg` to install ffmpeg');
-        }
-        else if (os_1.default.platform() === 'win32') {
-            console.error('1. Install FFMPEG for Windows here:');
-            console.error('https://github.com/adaptlearning/adapt_authoring/wiki/Installing-FFmpeg#installing-ffmpeg-in-windows');
-            console.error('2. Add FFMPEG to your PATH');
-            console.error('  a. Go to the settings app.');
-            console.error('  b. Click System.');
-            console.error('  c. Click About.');
-            console.error('  d. Click Advanced system settings.');
-            console.error('  e. Click Environment variables.');
-            console.error('  f. Search for PATH environemnt variable, click edit and the folder where you installed FFMPEG.');
-            console.error('  g. Important: Restart your terminal completely to apply the new PATH.');
-            console.error('3. Re-run this command.');
+    if (customFfmpegBinary) {
+        if (!(0, exports.customExecutableExists)(customFfmpegBinary)) {
+            throw new Error('Custom FFmpeg executable not found: ' + customFfmpegBinary);
         }
-        else {
-            console.error('See https://github.com/adaptlearning/adapt_authoring/wiki/Installing-FFmpeg on how to install FFMPEG.');
-        }
-        throw new Error('FFmpeg not found');
+        return;
+    }
+    if (process.platform === 'linux' && (0, fs_1.existsSync)(ffmpeg_flags_1.lambdaFfmpegPaths[binary])) {
+        return;
+    }
+    if ((0, ffmpeg_flags_1.ffmpegInNodeModules)(remotionRoot, binary)) {
+        return;
+    }
+    const binaryUrl = (0, ffmpeg_flags_1.getBinaryDownloadUrl)(binary);
+    if (binaryUrl) {
+        await (0, ffmpeg_flags_1.downloadBinary)(remotionRoot, binaryUrl.url, binary);
+        return (0, exports.validateFfmpeg)(customFfmpegBinary, remotionRoot, binary);
     }
-    await (0, exports.checkAndValidateFfmpegVersion)({ ffmpegExecutable: customFfmpegBinary });
+    throw new Error(`${binary} could not be installed automatically. Your architecture and OS combination (os = ${os_1.default.platform()}, arch = ${process.arch}) is not supported. Please install ${binary} manually and add "${binary}" to your PATH.`);
 };
 exports.validateFfmpeg = validateFfmpeg;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.44",
+	"version": "3.3.1",
 	"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.44",
+		"remotion": "3.3.1",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "443b4b387b78905e747ebe69b3b91ee85966796d"
+	"gitHead": "f56a29f8ab19e279e1a9950d3a3ccbb3c8ae42e0"
 }