@remotion/renderer 3.2.44 → 3.3.1

package/dist/get-compositions.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCompositions = void 0;
 const download_map_1 = require("./assets/download-map");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_browser_instance_1 = require("./get-browser-instance");
 const prepare_server_1 = require("./prepare-server");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
+const seek_to_frame_1 = require("./seek-to-frame");
 const set_props_and_env_1 = require("./set-props-and-env");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
@@ -43,7 +45,7 @@ const innerGetCompositions = async (serveUrl, page, config, proxyPort) => {
         frame: null,
         args: [],
     });
-    await page.waitForFunction(page.browser, 'window.ready === true');
+    await (0, seek_to_frame_1.waitForReady)(page);
     const result = await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: () => {
             return window.getStaticCompositions();
@@ -55,13 +57,14 @@ const innerGetCompositions = async (serveUrl, page, config, proxyPort) => {
     return result;
 };
 const getCompositions = async (serveUrlOrWebpackUrl, config) => {
-    var _a, _b, _c, _d;
-    await (0, validate_ffmpeg_1.validateFfmpeg)((_a = config === null || config === void 0 ? void 0 : config.ffmpegExecutable) !== null && _a !== void 0 ? _a : null);
-    const downloadMap = (_b = config === null || config === void 0 ? void 0 : config.downloadMap) !== null && _b !== void 0 ? _b : (0, download_map_1.makeDownloadMap)();
+    var _a, _b, _c, _d, _e;
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_a = config === null || config === void 0 ? void 0 : config.ffmpegExecutable) !== null && _a !== void 0 ? _a : null, (0, find_closest_package_json_1.findRemotionRoot)(), 'ffmpeg');
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_b = config === null || config === void 0 ? void 0 : config.ffprobeExecutable) !== null && _b !== void 0 ? _b : null, (0, find_closest_package_json_1.findRemotionRoot)(), 'ffprobe');
+    const downloadMap = (_c = config === null || config === void 0 ? void 0 : config.downloadMap) !== null && _c !== void 0 ? _c : (0, download_map_1.makeDownloadMap)();
     const { page, cleanup } = await (0, get_browser_instance_1.getPageAndCleanupFn)({
         passedInInstance: config === null || config === void 0 ? void 0 : config.puppeteerInstance,
-        browserExecutable: (_c = config === null || config === void 0 ? void 0 : config.browserExecutable) !== null && _c !== void 0 ? _c : null,
-        chromiumOptions: (_d = config === null || config === void 0 ? void 0 : config.chromiumOptions) !== null && _d !== void 0 ? _d : {},
+        browserExecutable: (_d = config === null || config === void 0 ? void 0 : config.browserExecutable) !== null && _d !== void 0 ? _d : null,
+        chromiumOptions: (_e = config === null || config === void 0 ? void 0 : config.chromiumOptions) !== null && _e !== void 0 ? _e : {},
     });
     return new Promise((resolve, reject) => {
         var _a, _b, _c;
@@ -80,6 +83,7 @@ const getCompositions = async (serveUrlOrWebpackUrl, config) => {
             ffprobeExecutable: (_b = config === null || config === void 0 ? void 0 : config.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
             port: (_c = config === null || config === void 0 ? void 0 : config.port) !== null && _c !== void 0 ? _c : null,
             downloadMap,
+            remotionRoot: (0, find_closest_package_json_1.findRemotionRoot)(),
         })
             .then(({ serveUrl, closeServer, offthreadPort }) => {
             close = closeServer;

package/dist/get-extension-from-codec.d.ts

@@ -1,2 +1,2 @@
 import type { Codec } from './codec';
-export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";
+export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";

package/dist/get-video-info.d.ts

@@ -1,3 +1,3 @@
 import type { DownloadMap, Vp9Result } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';
-export declare const getVideoInfo: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<Vp9Result>;
+export declare const getVideoInfo: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<Vp9Result>;

package/dist/get-video-info.js

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVideoInfo = void 0;
 const execa_1 = __importDefault(require("execa"));
 const calculate_sar_dar_pixels_1 = require("./calculate-sar-dar-pixels");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const p_limit_1 = require("./p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-async function getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable) {
+async function getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
     var _a;
     if (typeof downloadMap.isVp9VideoCache[src] !== 'undefined') {
         return downloadMap.isVp9VideoCache[src];
     }
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', [src]);
+    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), [src]);
     const isVp9 = task.stderr.includes('Video: vp9');
     const isVp8 = task.stderr.includes('Video: vp8');
     const dimensions = (_a = task.stderr
@@ -43,7 +44,7 @@ async function getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable) {
     downloadMap.isVp9VideoCache[src] = result;
     return downloadMap.isVp9VideoCache[src];
 }
-const getVideoInfo = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable));
+const getVideoInfo = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
+    return limit(() => getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
 };
 exports.getVideoInfo = getVideoInfo;

package/dist/guess-extension-for-media.d.ts

@@ -1 +1,5 @@
-export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "webm" | "mp4">;
+export declare const guessExtensionForVideo: ({ src, remotionRoot, ffprobeBinary, }: {
+    src: string;
+    remotionRoot: string;
+    ffprobeBinary: string | null;
+}) => Promise<"mp3" | "wav" | "webm" | "mp4">;

package/dist/guess-extension-for-media.js

@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.guessExtensionForVideo = void 0;
 const execa_1 = __importDefault(require("execa"));
-const guessExtensionForVideo = async (src) => {
-    const { stderr } = await (0, execa_1.default)('ffprobe', [src]);
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const guessExtensionForVideo = async ({ src, remotionRoot, ffprobeBinary, }) => {
+    const { stderr } = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeBinary, remotionRoot, 'ffprobe'), [src]);
     if (stderr.includes('mp3,')) {
         return 'mp3';
     }

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -11,6 +10,7 @@ export { BrowserLog } from './browser-log';
 export { Codec, CodecOrUndefined } from './codec';
 export { combineVideos } from './combine-videos';
 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';
@@ -34,12 +34,13 @@ 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, }: {
+    ffmpegHasFeature: ({ ffmpegExecutable, feature, remotionRoot, }: {
         ffmpegExecutable: string | null;
         feature: "enable-gpl" | "enable-libx265" | "enable-libvpx";
+        remotionRoot: string;
     }) => Promise<boolean>;
     getActualConcurrency: (userPreference: number | null) => number;
-    validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
+    validateFfmpeg: (customFfmpegBinary: string | null, remotionRoot: string, binary: "ffmpeg" | "ffprobe") => Promise<void>;
     serveStatic: (path: string | null, options: {
         port: number | null;
         ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable;
@@ -47,6 +48,7 @@ export declare const RenderInternals: {
         onDownload: import("./assets/download-and-map-assets-to-file").RenderMediaOnDownload;
         onError: (err: Error) => void;
         downloadMap: import("./assets/download-map").DownloadMap;
+        remotionRoot: string;
     }) => Promise<{
         port: number;
         close: () => Promise<void>;
@@ -131,8 +133,11 @@ export declare const RenderInternals: {
         frame: number;
         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>;
 };

package/dist/index.js

@@ -26,7 +26,7 @@ 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.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.ErrorWithStackFrame = exports.combineVideos = 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.ErrorWithStackFrame = exports.ensureFfprobe = exports.ensureFfmpeg = exports.combineVideos = void 0;
 const execa_1 = __importDefault(require("execa"));
 const download_file_1 = require("./assets/download-file");
 const download_map_1 = require("./assets/download-map");
@@ -41,6 +41,7 @@ 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 find_closest_package_json_1 = require("./find-closest-package-json");
 const frame_range_1 = require("./frame-range");
 const get_concurrency_1 = require("./get-concurrency");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
@@ -72,6 +73,9 @@ 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; } });
+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_compositions_1 = require("./get-compositions");
@@ -143,6 +147,8 @@ exports.RenderInternals = {
     makeDownloadMap: download_map_1.makeDownloadMap,
     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,
 };

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

@@ -11,6 +11,7 @@ export declare type LastFrameOptions = {
     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/merge-audio-track.d.ts

@@ -6,6 +6,7 @@ declare type Options = {
     outName: string;
     numberOfSeconds: number;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 };
 export declare const mergeAudioTrack: (options: Options) => Promise<void>;
 export {};

package/dist/merge-audio-track.js

@@ -11,15 +11,17 @@ const convert_to_pcm_1 = require("./convert-to-pcm");
 const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-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 ({ ffmpegExecutable, outName, files, numberOfSeconds, downloadMap, }) => {
+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;
     }
@@ -28,6 +30,7 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             outName,
             ffmpegExecutable,
             input: files[0],
+            remotionRoot,
         });
         return;
     }
@@ -43,6 +46,7 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
                 numberOfSeconds,
                 outName: chunkOutname,
                 downloadMap,
+                remotionRoot,
             });
             return chunkOutname;
         }));
@@ -52,6 +56,7 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             numberOfSeconds,
             outName,
             downloadMap,
+            remotionRoot,
         });
         await (0, delete_directory_1.deleteDirectory)(tempPath);
         return;
@@ -66,7 +71,7 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
     ]
         .filter(truthy_1.truthy)
         .flat(2);
-    const task = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : '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

@@ -8,10 +8,11 @@ export declare const extractUrlAndSourceFromUrl: (url: string) => {
     time: number;
     imageFormat: OffthreadVideoImageFormat;
 };
-export declare const startOffthreadVideoServer: ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, }: {
+export declare const startOffthreadVideoServer: ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, remotionRoot, }: {
     ffmpegExecutable: FfmpegExecutable;
     ffprobeExecutable: FfmpegExecutable;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 }) => RequestListener;

package/dist/offthread-video-server.js

@@ -32,7 +32,7 @@ const extractUrlAndSourceFromUrl = (url) => {
     };
 };
 exports.extractUrlAndSourceFromUrl = extractUrlAndSourceFromUrl;
-const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, }) => {
+const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, remotionRoot, }) => {
     return (req, res) => {
         if (!req.url) {
             throw new Error('Request came in without URL');
@@ -65,6 +65,7 @@ const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, onDown
                 ffprobeExecutable,
                 imageFormat,
                 downloadMap,
+                remotionRoot,
             });
         })
             .then((readable) => {

package/dist/open-browser.js

@@ -21,7 +21,7 @@ const browserInstances = [];
 const killAllBrowsers = async () => {
     for (const browser of browserInstances) {
         try {
-            await browser.close();
+            await browser.close(true);
         }
         catch (err) { }
     }

package/dist/prepare-server.d.ts

@@ -1,7 +1,7 @@
 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 prepareServer: ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, }: {
+export declare const prepareServer: ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, remotionRoot, }: {
     webpackConfigOrServeUrl: string;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
@@ -9,6 +9,7 @@ export declare const prepareServer: ({ ffmpegExecutable, ffprobeExecutable, onDo
     ffprobeExecutable: FfmpegExecutable;
     port: number | null;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 }) => Promise<{
     serveUrl: string;
     closeServer: () => Promise<unknown>;

package/dist/prepare-server.js

@@ -9,7 +9,7 @@ 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 ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, }) => {
+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,
@@ -18,6 +18,7 @@ const prepareServer = async ({ ffmpegExecutable, ffprobeExecutable, onDownload,
             ffprobeExecutable,
             port,
             downloadMap,
+            remotionRoot,
         });
         return Promise.resolve({
             serveUrl: webpackConfigOrServeUrl,
@@ -40,6 +41,7 @@ const prepareServer = async ({ ffmpegExecutable, ffprobeExecutable, onDownload,
         ffprobeExecutable,
         port,
         downloadMap,
+        remotionRoot,
     });
     return Promise.resolve({
         closeServer: () => {

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

@@ -9,6 +9,7 @@ declare type Options = {
     expectedFrames: number;
     fps: number;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 };
 export declare const preprocessAudioTrack: (options: Options) => Promise<string | null>;
 export {};

package/dist/preprocess-audio-track.js

@@ -8,10 +8,11 @@ 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 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 preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutable, outName, asset, expectedFrames, fps, downloadMap, }) => {
-    const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)(downloadMap, (0, resolve_asset_src_1.resolveAssetSrc)(asset.src), ffprobeExecutable);
+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,
@@ -30,7 +31,7 @@ const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutab
         ['-c:a', 'pcm_s16le'],
         ['-y', outName],
     ].flat(2);
-    await (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', args);
+    await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), args);
     cleanup();
     return outName;
 };

package/dist/prespawn-ffmpeg.d.ts

@@ -23,7 +23,7 @@ declare type PreSticherOptions = {
     signal: CancelSignal;
     videoBitrate: string | null;
 };
-export declare const prespawnFfmpeg: (options: PreSticherOptions) => Promise<{
+export declare const prespawnFfmpeg: (options: PreSticherOptions, remotionRoot: string) => Promise<{
     task: execa.ExecaChildProcess<string>;
     getLogs: () => string;
 }>;

package/dist/prespawn-ffmpeg.js

@@ -8,13 +8,14 @@ const execa_1 = __importDefault(require("execa"));
 const remotion_1 = require("remotion");
 const codec_1 = require("./codec");
 const crf_1 = require("./crf");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const get_codec_name_1 = require("./get-codec-name");
 const get_prores_profile_name_1 = require("./get-prores-profile-name");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 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) => {
+const prespawnFfmpeg = async (options, remotionRoot) => {
     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()`');
@@ -27,7 +28,7 @@ const prespawnFfmpeg = async (options) => {
         scale: 1,
     });
     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 proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
     if (encoderName === null) {
@@ -79,7 +80,7 @@ const prespawnFfmpeg = async (options) => {
     const finalFfmpegString = options.ffmpegOverride
         ? options.ffmpegOverride({ type: 'pre-stitcher', args: ffmpegString })
         : ffmpegString;
-    const task = (0, execa_1.default)((_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg', finalFfmpegString);
+    const task = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : null, remotionRoot, 'ffmpeg'), finalFfmpegString);
     options.signal(() => {
         task.kill();
     });

package/dist/puppeteer-screenshot.js

@@ -70,6 +70,6 @@ const screenshot = (page, options) => {
         assert.ok(options.clip.width !== 0, 'Expected options.clip.width not to be 0.');
         assert.ok(options.clip.height !== 0, 'Expected options.clip.height not to be 0.');
     }
-    return page.screenshotTaskQueue.postTask(() => (0, screenshot_task_1._screenshotTask)(page, screenshotType, options));
+    return page.screenshotTaskQueue.postTask(() => (0, screenshot_task_1.screenshotTask)(page, screenshotType, options));
 };
 exports.screenshot = screenshot;

package/dist/render-frames.js

@@ -14,6 +14,7 @@ const browser_1 = require("./browser");
 const compress_assets_1 = require("./compress-assets");
 const cycle_browser_tabs_1 = require("./cycle-browser-tabs");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_concurrency_1 = require("./get-concurrency");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
 const get_frame_padded_index_1 = require("./get-frame-padded-index");
@@ -27,6 +28,7 @@ const prepare_server_1 = require("./prepare-server");
 const provide_screenshot_1 = require("./provide-screenshot");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const quality_1 = require("./quality");
+const replace_browser_1 = require("./replace-browser");
 const seek_to_frame_1 = require("./seek-to-frame");
 const set_props_and_env_1 = require("./set-props-and-env");
 const truthy_1 = require("./truthy");
@@ -50,15 +52,7 @@ const getConcurrency = (others) => {
     }
     return undefined;
 };
-const getPool = async (pages) => {
-    const puppeteerPages = await Promise.all(pages);
-    const pool = new pool_1.Pool(puppeteerPages);
-    return pool;
-};
-const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame = 1, proxyPort, cancelSignal, downloadMap, muted, }) => {
-    if (!puppeteerInstance) {
-        throw new Error('no puppeteer instance passed to innerRenderFrames - internal error');
-    }
+const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame = 1, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, }) => {
     if (outputDir) {
         if (!fs_1.default.existsSync(outputDir)) {
             fs_1.default.mkdirSync(outputDir, {
@@ -71,7 +65,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
     const framesToRender = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame);
     const lastFrame = framesToRender[framesToRender.length - 1];
     const makePage = async () => {
-        const page = await puppeteerInstance.newPage();
+        const page = await browserReplacer.getBrowser().newPage();
         pagesArray.push(page);
         await page.setViewport({
             width: composition.width,
@@ -128,7 +122,12 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         page.off('console', logCallback);
         return page;
     };
-    const pages = new Array(actualConcurrency).fill(true).map(makePage);
+    const getPool = async () => {
+        const pages = new Array(actualConcurrency).fill(true).map(() => makePage());
+        const puppeteerPages = await Promise.all(pages);
+        const pool = new pool_1.Pool(puppeteerPages);
+        return pool;
+    };
     // If rendering a GIF and skipping frames, we must ensure it starts from 0
     // and then is consecutive so FFMPEG recognizes the sequence
     const countType = everyNthFrame === 1 ? 'actual-frames' : 'from-zero';
@@ -138,7 +137,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         countType,
     });
     let framesRendered = 0;
-    const poolPromise = getPool(pages);
+    const poolPromise = getPool();
     onStart({
         frameCount: framesToRender.length,
     });
@@ -239,12 +238,13 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         });
     };
     const renderFrameAndRetryTargetClose = async (frame, index, retriesLeft, attempt) => {
-        var _a;
+        var _a, _b;
         try {
             await renderFrame(frame, index);
         }
         catch (err) {
-            if (!((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Target closed'))) {
+            if (!((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Target closed')) &&
+                !((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes('Session closed'))) {
                 throw err;
             }
             if (retriesLeft === 0) {
@@ -252,9 +252,16 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
                 throw err;
             }
             console.warn(`The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
-            const pool = await poolPromise;
-            const page = await makePage();
-            pool.release(page);
+            await browserReplacer.replaceBrowser(makeBrowser, async () => {
+                const pages = new Array(actualConcurrency)
+                    .fill(true)
+                    .map(() => makePage());
+                const puppeteerPages = await Promise.all(pages);
+                const pool = await poolPromise;
+                for (const newPage of puppeteerPages) {
+                    pool.release(newPage);
+                }
+            });
             await renderFrameAndRetryTargetClose(frame, index, retriesLeft - 1, attempt + 1);
         }
     };
@@ -279,7 +286,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         .then(() => happyPath);
 };
 const renderFrames = (options) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const composition = getComposition(options);
     const concurrency = getConcurrency(options);
     if (!composition) {
@@ -295,14 +302,18 @@ const renderFrames = (options) => {
     const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
     (0, quality_1.validateQuality)(options.quality);
     (0, validate_scale_1.validateScale)(options.scale);
-    const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (0, open_browser_1.openBrowser)(browser_1.DEFAULT_BROWSER, {
-        shouldDumpIo: options.dumpBrowserLogs,
-        browserExecutable: options.browserExecutable,
-        chromiumOptions: options.chromiumOptions,
-        forceDeviceScaleFactor: (_b = options.scale) !== null && _b !== void 0 ? _b : 1,
-    });
-    const downloadMap = (_c = options.downloadMap) !== null && _c !== void 0 ? _c : (0, download_map_1.makeDownloadMap)();
-    const onDownload = (_d = options.onDownload) !== null && _d !== void 0 ? _d : (() => () => undefined);
+    const makeBrowser = () => {
+        var _a;
+        return (0, open_browser_1.openBrowser)(browser_1.DEFAULT_BROWSER, {
+            shouldDumpIo: options.dumpBrowserLogs,
+            browserExecutable: options.browserExecutable,
+            chromiumOptions: options.chromiumOptions,
+            forceDeviceScaleFactor: (_a = options.scale) !== null && _a !== void 0 ? _a : 1,
+        });
+    };
+    const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : makeBrowser();
+    const downloadMap = (_b = options.downloadMap) !== null && _b !== void 0 ? _b : (0, download_map_1.makeDownloadMap)();
+    const onDownload = (_c = options.onDownload) !== null && _c !== void 0 ? _c : (() => () => undefined);
     const actualConcurrency = (0, get_concurrency_1.getActualConcurrency)(concurrency !== null && concurrency !== void 0 ? concurrency : null);
     const openedPages = [];
     return new Promise((resolve, reject) => {
@@ -327,10 +338,12 @@ const renderFrames = (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)(),
                 }),
                 browserInstance,
             ]).then(([{ serveUrl, closeServer, offthreadPort }, puppeteerInstance]) => {
-                const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(puppeteerInstance, actualConcurrency);
+                const browserReplacer = (0, replace_browser_1.handleBrowserCrash)(puppeteerInstance);
+                const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency);
                 cleanup.push(stopCycling);
                 cleanup.push(closeServer);
                 return innerRenderFrames({
@@ -344,6 +357,8 @@ const renderFrames = (options) => {
                     onDownload,
                     proxyPort: offthreadPort,
                     downloadMap,
+                    makeBrowser,
+                    browserReplacer,
                 });
             }),
         ])
@@ -363,7 +378,7 @@ const renderFrames = (options) => {
             else {
                 Promise.resolve(browserInstance)
                     .then((puppeteerInstance) => {
-                    return puppeteerInstance.close();
+                    return puppeteerInstance.close(true);
                 })
                     .catch((err) => {
                     console.log('Unable to close browser', err);

package/dist/render-media.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';