@remotion/renderer 4.0.0-fastlambda.8 → 4.0.0-lambda.3

package/dist/open-browser.js

@@ -10,11 +10,17 @@ const path_1 = __importDefault(require("path"));
 const puppeteer_core_1 = __importDefault(require("puppeteer-core"));
 const remotion_1 = require("remotion");
 const get_local_browser_executable_1 = require("./get-local-browser-executable");
-const validRenderers = ['angle', 'egl', 'swiftshader'];
+const validRenderers = ['swangle', 'angle', 'egl', 'swiftshader'];
 const getOpenGlRenderer = (option) => {
     const renderer = option !== null && option !== void 0 ? option : remotion_1.Internals.DEFAULT_OPENGL_RENDERER;
     remotion_1.Internals.validateOpenGlRenderer(renderer);
-    return renderer;
+    if (renderer === 'swangle') {
+        return [`--use-gl=angle`, `--use-angle=swiftshader`];
+    }
+    if (renderer === null) {
+        return [];
+    }
+    return [`--use-gl=${renderer}`];
 };
 const browserInstances = [];
 const killAllBrowsers = async () => {
@@ -27,7 +33,7 @@ const killAllBrowsers = async () => {
 };
 exports.killAllBrowsers = killAllBrowsers;
 const openBrowser = async (browser, options) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     if (browser === 'firefox' && !remotion_1.Internals.FEATURE_FLAG_FIREFOX_SUPPORT) {
         throw new TypeError('Firefox supported is not yet turned on. Stay tuned for the future.');
     }
@@ -38,13 +44,9 @@ 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,
-        headless: false,
         ignoreDefaultArgs: true,
-        defaultViewport: {
-            width: 1920,
-            height: 1080,
-        },
         args: [
+            'about:blank',
             '--allow-pre-commit-input',
             '--disable-background-networking',
             '--enable-features=NetworkService,NetworkServiceInProcess',
@@ -56,9 +58,11 @@ const openBrowser = async (browser, options) => {
             '--disable-default-apps',
             '--disable-dev-shm-usage',
             '--disable-extensions',
+            '--no-proxy-server',
+            "--proxy-server='direct://'",
+            '--proxy-bypass-list=*',
             // TODO: remove AvoidUnnecessaryBeforeUnloadCheckSync below
             // once crbug.com/1324138 is fixed and released.
-            '--disable-features=Translate,BackForwardCache,AvoidUnnecessaryBeforeUnloadCheckSync',
             '--disable-hang-monitor',
             '--disable-ipc-flooding-protection',
             '--disable-popup-blocking',
@@ -72,36 +76,36 @@ const openBrowser = async (browser, options) => {
             '--enable-automation',
             '--password-store=basic',
             '--use-mock-keychain',
-            (options === null || options === void 0 ? void 0 : options.forceDeviceScaleFactor)
-                ? `--force-device-scale-factor=${options.forceDeviceScaleFactor}`
-                : null,
             // TODO(sadym): remove '--enable-blink-features=IdleDetection'
             // once IdleDetection is turned on by default.
             '--enable-blink-features=IdleDetection',
             '--export-tagged-pdf',
             '--intensive-wake-up-throttling-policy=0',
-            '--headless',
+            ((_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',
-            '--disable-dev-shm-usage',
-            customGlRenderer ? `--use-gl=${customGlRenderer}` : null,
+            ...customGlRenderer,
             '--disable-background-media-suspend',
             process.platform === 'linux' ? '--single-process' : null,
             '--allow-running-insecure-content',
             '--disable-component-update',
             '--disable-domain-reliability',
-            '--disable-features=AudioServiceOutOfProcess,IsolateOrigins,site-per-process',
+            '--disable-features=AudioServiceOutOfProcess,IsolateOrigins,site-per-process,Translate,BackForwardCache,AvoidUnnecessaryBeforeUnloadCheckSync,IntensiveWakeUpThrottling',
             '--disable-print-preview',
             '--disable-site-isolation-trials',
-            '--disk-cache-size=33554432',
+            '--disk-cache-size=268435456',
             '--hide-scrollbars',
             '--no-default-browser-check',
             '--no-pings',
+            '--font-render-hinting=none',
             '--no-zygote',
-            ((_f = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _f === void 0 ? void 0 : _f.ignoreCertificateErrors)
+            (options === null || options === void 0 ? void 0 : options.forceDeviceScaleFactor)
+                ? `--force-device-scale-factor=${options.forceDeviceScaleFactor}`
+                : null,
+            ((_h = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _h === void 0 ? void 0 : _h.ignoreCertificateErrors)
                 ? '--ignore-certificate-errors'
                 : null,
-            ...(((_g = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _g === void 0 ? void 0 : _g.disableWebSecurity)
+            ...(((_j = options === null || options === void 0 ? void 0 : options.chromiumOptions) === null || _j === void 0 ? void 0 : _j.disableWebSecurity)
                 ? [
                     '--disable-web-security',
                     '--user-data-dir=' +
@@ -111,7 +115,7 @@ const openBrowser = async (browser, options) => {
         ].filter(Boolean),
     });
     const pages = await browserInstance.pages();
-    pages.forEach((p) => p.close());
+    await pages[0].close();
     browserInstances.push(browserInstance);
     return browserInstance;
 };

package/dist/prepare-server.d.ts

@@ -1,4 +1,15 @@
-export declare const prepareServer: (webpackConfigOrServeUrl: string) => Promise<{
+import { FfmpegExecutable } from 'remotion';
+import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+export declare const prepareServer: ({ downloadDir, ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, }: {
+    webpackConfigOrServeUrl: string;
+    downloadDir: string;
+    onDownload: RenderMediaOnDownload;
+    onError: (err: Error) => void;
+    ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
+    port: number | null;
+}) => Promise<{
     serveUrl: string;
-    closeServer: () => Promise<void>;
+    closeServer: () => Promise<unknown>;
+    offthreadPort: number;
 }>;

package/dist/prepare-server.js

@@ -1,19 +1,49 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareServer = void 0;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
 const is_serve_url_1 = require("./is-serve-url");
 const serve_static_1 = require("./serve-static");
-const prepareServer = async (webpackConfigOrServeUrl) => {
+const prepareServer = async ({ downloadDir, ffmpegExecutable, ffprobeExecutable, onDownload, onError, webpackConfigOrServeUrl, port, }) => {
     if ((0, is_serve_url_1.isServeUrl)(webpackConfigOrServeUrl)) {
+        const { port: offthreadPort, close: closeProxy } = await (0, serve_static_1.serveStatic)(null, {
+            downloadDir,
+            onDownload,
+            onError,
+            ffmpegExecutable,
+            ffprobeExecutable,
+            port,
+        });
         return Promise.resolve({
             serveUrl: webpackConfigOrServeUrl,
-            closeServer: () => Promise.resolve(undefined),
+            closeServer: () => closeProxy(),
+            offthreadPort,
         });
     }
-    const { port, close } = await (0, serve_static_1.serveStatic)(webpackConfigOrServeUrl);
+    // Check if the path has a `index.html` file
+    const indexFile = path_1.default.join(webpackConfigOrServeUrl, 'index.html');
+    const exists = (0, fs_1.existsSync)(indexFile);
+    if (!exists) {
+        throw new Error(`Tried to serve the Webpack bundle on a HTTP server, but the file ${indexFile} does not exist. Is this a valid path to a Webpack bundle?`);
+    }
+    const { port: serverPort, close } = await (0, serve_static_1.serveStatic)(webpackConfigOrServeUrl, {
+        downloadDir,
+        onDownload,
+        onError,
+        ffmpegExecutable,
+        ffprobeExecutable,
+        port,
+    });
     return Promise.resolve({
-        closeServer: () => close(),
-        serveUrl: `http://localhost:${port}`,
+        closeServer: () => {
+            return close();
+        },
+        serveUrl: `http://localhost:${serverPort}`,
+        offthreadPort: serverPort,
     });
 };
 exports.prepareServer = prepareServer;

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

@@ -2,6 +2,7 @@ import { FfmpegExecutable } from 'remotion';
 import { MediaAsset } from './assets/types';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     outName: string;
     asset: MediaAsset;
     expectedFrames: number;

package/dist/preprocess-audio-track.js

@@ -10,8 +10,8 @@ const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
 const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
 const p_limit_1 = require("./p-limit");
 const resolve_asset_src_1 = require("./resolve-asset-src");
-const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, outName, asset, expectedFrames, fps, }) => {
-    const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)((0, resolve_asset_src_1.resolveAssetSrc)(asset.src));
+const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutable, outName, asset, expectedFrames, fps, }) => {
+    const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)((0, resolve_asset_src_1.resolveAssetSrc)(asset.src), ffprobeExecutable);
     const filter = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilter)({
         asset,
         durationInFrames: expectedFrames,

package/dist/prespawn-ffmpeg.d.ts

@@ -1,5 +1,6 @@
 import execa from 'execa';
 import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile } from 'remotion';
+import { CancelSignal } from './make-cancel-signal';
 declare type PreSticherOptions = {
     fps: number;
     width: number;
@@ -13,6 +14,7 @@ declare type PreSticherOptions = {
     verbose: boolean;
     ffmpegExecutable: FfmpegExecutable | undefined;
     imageFormat: ImageFormat;
+    signal: CancelSignal;
 };
 export declare const prespawnFfmpeg: (options: PreSticherOptions) => Promise<{
     task: execa.ExecaChildProcess<string>;

package/dist/prespawn-ffmpeg.js

@@ -57,15 +57,13 @@ const prespawnFfmpeg = async (options) => {
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...[
-            proResProfileName ? ['-profile:v', proResProfileName] : null,
-            supportsCrf ? ['-crf', String(crf)] : null,
-            ['-pix_fmt', pixelFormat],
-            // Without explicitly disabling auto-alt-ref,
-            // transparent WebM generation doesn't work
-            pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
-            ['-b:v', '1M'],
-        ],
+        proResProfileName ? ['-profile:v', proResProfileName] : null,
+        supportsCrf ? ['-crf', String(crf)] : null,
+        ['-pix_fmt', pixelFormat],
+        // Without explicitly disabling auto-alt-ref,
+        // transparent WebM generation doesn't work
+        pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
+        ['-b:v', '1M'],
         '-y',
         options.outputLocation,
     ];
@@ -75,6 +73,9 @@ const prespawnFfmpeg = async (options) => {
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
     const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', ffmpegString);
+    options.signal(() => {
+        task.kill();
+    });
     let ffmpegOutput = '';
     (_g = task.stderr) === null || _g === void 0 ? void 0 : _g.on('data', (data) => {
         const str = data.toString();

package/dist/provide-screenshot.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.provideScreenshot = void 0;
 const screenshot_dom_element_1 = require("./screenshot-dom-element");
-const provideScreenshot = async ({ page, imageFormat, options, quality, }) => {
+const provideScreenshot = ({ page, imageFormat, options, quality, }) => {
     return (0, screenshot_dom_element_1.screenshotDOMElement)({
         page,
         opts: {

package/dist/puppeteer-screenshot.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/render-frames.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 import { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { BrowserExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
+import { BrowserExecutable, FfmpegExecutable, FrameRange, ImageFormat, SmallTCompMetadata } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import { BrowserLog } from './browser-log';
 import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import { CancelSignal } from './make-cancel-signal';
 import { ChromiumOptions } from './open-browser';
 import { OnStartData, RenderFramesOutput } from './types';
 declare type ConfigOrComposition = {
@@ -33,6 +34,10 @@ declare type RenderFramesOptions = {
     timeoutInMilliseconds?: number;
     chromiumOptions?: ChromiumOptions;
     scale?: number;
+    ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
+    port?: number | null;
+    cancelSignal?: CancelSignal;
 } & ConfigOrComposition & ServeUrlOrWebpackBundle;
 export declare const renderFrames: (options: RenderFramesOptions) => Promise<RenderFramesOutput>;
 export {};

package/dist/render-frames.js

@@ -33,9 +33,14 @@ const getComposition = (others) => {
     }
     return undefined;
 };
-const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps, quality, imageFormat = image_format_1.DEFAULT_IMAGE_FORMAT, frameRange, puppeteerInstance, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualParallelism, }) => {
+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, actualParallelism, downloadDir, proxyPort, cancelSignal, }) => {
     if (!puppeteerInstance) {
-        throw new Error('weird');
+        throw new Error('no puppeteer instance passed to innerRenderFrames - internal error');
     }
     if (outputDir) {
         if (!fs_1.default.existsSync(outputDir)) {
@@ -49,7 +54,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
     const pages = new Array(actualParallelism).fill(true).map(async () => {
         const page = await puppeteerInstance.newPage();
         pagesArray.push(page);
-        page.setViewport({
+        await page.setViewport({
             width: composition.width,
             height: composition.height,
             deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
@@ -76,6 +81,8 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             serveUrl,
             initialFrame,
             timeoutInMilliseconds,
+            proxyPort,
+            retriesRemaining: 2,
         });
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             pageFunction: (id) => {
@@ -91,24 +98,30 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         page.off('console', logCallback);
         return page;
     });
-    const puppeteerPages = await Promise.all(pages);
-    const pool = new pool_1.Pool(puppeteerPages);
     const [firstFrameIndex, lastFrameIndex] = realFrameRange;
     // Substract one because 100 frames will be 00-99
     // --> 2 digits
     const filePadLength = String(lastFrameIndex).length;
     let framesRendered = 0;
+    const poolPromise = getPool(pages);
     onStart({
         frameCount,
     });
-    const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
     const assets = new Array(frameCount).fill(undefined);
-    await Promise.all(new Array(frameCount)
+    let stopped = false;
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+        stopped = true;
+    });
+    const progress = Promise.all(new Array(frameCount)
         .fill(Boolean)
-        .map((x, i) => i)
+        .map((_x, i) => i)
         .map(async (index) => {
         const frame = realFrameRange[0] + index;
+        const pool = await poolPromise;
         const freePage = await pool.acquire();
+        if (stopped) {
+            throw new Error('Render was stopped');
+        }
         const paddedIndex = String(frame).padStart(filePadLength, '0');
         const errorCallbackOnFrame = (err) => {
             onError(err);
@@ -122,6 +135,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
         if (imageFormat !== 'none') {
             if (onFrameBuffer) {
+                const id = remotion_1.Internals.perf.startPerfMeasure('save');
                 const buffer = await (0, provide_screenshot_1.provideScreenshot)({
                     page: freePage,
                     imageFormat,
@@ -131,6 +145,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
                         output: undefined,
                     },
                 });
+                remotion_1.Internals.perf.stopPerfMeasure(id);
                 onFrameBuffer(buffer, frame);
             }
             else {
@@ -163,7 +178,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
                 asset,
                 downloadDir,
-                onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
+                onDownload,
             }).catch((err) => {
                 onError(new Error(`Error while downloading asset: ${err.stack}`));
             });
@@ -175,19 +190,29 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
         freePage.off('error', errorCallbackOnFrame);
         return compressedAssets;
     }));
-    const returnValue = {
-        assetsInfo: {
-            assets,
-            downloadDir,
-            firstFrameIndex,
-            imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
-        },
-        frameCount,
-    };
-    return returnValue;
+    const happyPath = progress.then(() => {
+        const returnValue = {
+            assetsInfo: {
+                assets,
+                downloadDir,
+                firstFrameIndex,
+                imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
+            },
+            frameCount,
+        };
+        return returnValue;
+    });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+                reject(new Error('renderFrames() got cancelled'));
+            });
+        }),
+    ]);
 };
-const renderFrames = async (options) => {
-    var _a, _b, _c;
+const renderFrames = (options) => {
+    var _a, _b, _c, _d;
     const composition = getComposition(options);
     if (!composition) {
         throw new Error('No `composition` option has been specified for renderFrames()');
@@ -202,25 +227,54 @@ const renderFrames = async (options) => {
     const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
     remotion_1.Internals.validateQuality(options.quality);
     (0, validate_scale_1.validateScale)(options.scale);
-    const { closeServer, serveUrl } = await (0, prepare_server_1.prepareServer)(selectedServeUrl);
-    const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (await (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
+    const browserInstance = (_a = options.puppeteerInstance) !== null && _a !== void 0 ? _a : (0, open_browser_1.openBrowser)(remotion_1.Internals.DEFAULT_BROWSER, {
         shouldDumpIo: options.dumpBrowserLogs,
         browserExecutable: options.browserExecutable,
         chromiumOptions: options.chromiumOptions,
         forceDeviceScaleFactor: (_b = options.scale) !== null && _b !== void 0 ? _b : 1,
-    }));
-    const actualParallelism = (0, get_concurrency_1.getActualConcurrency)((_c = options.parallelism) !== null && _c !== void 0 ? _c : null);
-    const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance, actualParallelism);
+    });
+    const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
+    const onDownload = (_c = options.onDownload) !== null && _c !== void 0 ? _c : (() => () => undefined);
+    const actualParallelism = (0, get_concurrency_1.getActualConcurrency)((_d = options.parallelism) !== null && _d !== void 0 ? _d : null);
     const openedPages = [];
     return new Promise((resolve, reject) => {
-        innerRenderFrames({
-            ...options,
-            puppeteerInstance: browserInstance,
-            onError: (err) => reject(err),
-            pagesArray: openedPages,
-            serveUrl,
-            composition,
-            actualParallelism,
+        var _a, _b, _c;
+        const cleanup = [];
+        const onError = (err) => reject(err);
+        Promise.all([
+            (0, prepare_server_1.prepareServer)({
+                webpackConfigOrServeUrl: selectedServeUrl,
+                downloadDir,
+                onDownload,
+                onError,
+                ffmpegExecutable: (_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : null,
+                ffprobeExecutable: (_b = options.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
+                port: (_c = options.port) !== null && _c !== void 0 ? _c : null,
+            }),
+            browserInstance,
+        ])
+            .then(([{ serveUrl, closeServer, offthreadPort }, puppeteerInstance]) => {
+            var _a;
+            const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(puppeteerInstance, actualParallelism);
+            cleanup.push(stopCycling);
+            (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+                stopCycling();
+                closeServer();
+            });
+            cleanup.push(closeServer);
+            const renderFramesProm = innerRenderFrames({
+                ...options,
+                puppeteerInstance,
+                onError,
+                pagesArray: openedPages,
+                serveUrl,
+                composition,
+                actualParallelism,
+                onDownload,
+                downloadDir,
+                proxyPort: offthreadPort,
+            });
+            return renderFramesProm;
         })
             .then((res) => resolve(res))
             .catch((err) => reject(err))
@@ -234,12 +288,17 @@ const renderFrames = async (options) => {
                 });
             }
             else {
-                browserInstance.close().catch((err) => {
+                Promise.resolve(browserInstance)
+                    .then((puppeteerInstance) => {
+                    return puppeteerInstance.close();
+                })
+                    .catch((err) => {
                     console.log('Unable to close browser', err);
                 });
             }
-            stopCycling();
-            closeServer();
+            cleanup.forEach((c) => {
+                c();
+            });
         });
     });
 };

package/dist/render-media.d.ts

@@ -1,8 +1,9 @@
 import type { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
+import { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import { BrowserLog } from './browser-log';
 import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import { CancelSignal } from './make-cancel-signal';
 import { ChromiumOptions } from './open-browser';
 import { OnStartData } from './types';
 export declare type StitchingState = 'encoding' | 'muxing';
@@ -22,6 +23,7 @@ export declare type RenderMediaOptions = {
     crf?: number | null;
     imageFormat?: 'png' | 'jpeg' | 'none';
     ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
     pixelFormat?: PixelFormat;
     envVariables?: Record<string, string>;
     quality?: number;
@@ -37,5 +39,13 @@ export declare type RenderMediaOptions = {
     timeoutInMilliseconds?: number;
     chromiumOptions?: ChromiumOptions;
     scale?: number;
+    port?: number | null;
+    cancelSignal?: CancelSignal;
+    browserExecutable?: BrowserExecutable;
 } & ServeUrlOrWebpackBundle;
-export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, ...options }: RenderMediaOptions) => Promise<void>;
+/**
+ *
+ * @description Render a video from a composition
+ * @link https://www.remotion.dev/docs/renderer/render-media
+ */
+export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }: RenderMediaOptions) => Promise<void>;