@remotion/renderer 3.0.14 → 3.0.17

package/dist/prespawn-ffmpeg.js

@@ -73,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/render-frames.d.ts

@@ -4,6 +4,7 @@ import { BrowserExecutable, FfmpegExecutable, FrameRange, ImageFormat, SmallTCom
 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 = {
@@ -34,7 +35,9 @@ declare type RenderFramesOptions = {
     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, downloadDir, proxyPort, }) => {
+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,
@@ -77,6 +82,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, inputProps
             initialFrame,
             timeoutInMilliseconds,
             proxyPort,
+            retriesRemaining: 2,
         });
         await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
             pageFunction: (id) => {
@@ -92,23 +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 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(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 {
@@ -175,18 +190,28 @@ 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) => {
+const renderFrames = (options) => {
     var _a, _b, _c, _d;
     const composition = getComposition(options);
     if (!composition) {
@@ -202,34 +227,44 @@ 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 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 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 { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserInstance, actualParallelism);
     const openedPages = [];
     return new Promise((resolve, reject) => {
-        var _a, _b;
-        let cleanup = null;
+        var _a, _b, _c;
+        const cleanup = [];
         const onError = (err) => reject(err);
-        (0, prepare_server_1.prepareServer)({
-            webpackConfigOrServeUrl: selectedServeUrl,
-            downloadDir,
-            onDownload,
-            onError,
-            ffmpegExecutable: (_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : null,
-            port: (_b = options.port) !== null && _b !== void 0 ? _b : null,
-        })
-            .then(({ serveUrl, closeServer, offthreadPort }) => {
-            cleanup = closeServer;
-            return innerRenderFrames({
+        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: browserInstance,
+                puppeteerInstance,
                 onError,
                 pagesArray: openedPages,
                 serveUrl,
@@ -239,6 +274,7 @@ const renderFrames = async (options) => {
                 downloadDir,
                 proxyPort: offthreadPort,
             });
+            return renderFramesProm;
         })
             .then((res) => resolve(res))
             .catch((err) => reject(err))
@@ -252,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();
-            cleanup === null || cleanup === void 0 ? void 0 : cleanup();
+            cleanup.forEach((c) => {
+                c();
+            });
         });
     });
 };

package/dist/render-media.d.ts

@@ -3,6 +3,7 @@ import { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, Pr
 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;
@@ -38,6 +40,7 @@ export declare type RenderMediaOptions = {
     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, browserExecutable, port, ...options }: RenderMediaOptions) => Promise<void>;
+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>;

package/dist/render-media.js

@@ -16,6 +16,7 @@ const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_extension_of_filename_1 = require("./get-extension-of-filename");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
+const make_cancel_signal_1 = require("./make-cancel-signal");
 const prespawn_ffmpeg_1 = require("./prespawn-ffmpeg");
 const render_frames_1 = require("./render-frames");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
@@ -23,8 +24,7 @@ const tmp_dir_1 = require("./tmp-dir");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
-const renderMedia = async ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, ...options }) => {
-    var _a;
+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 }) => {
     remotion_1.Internals.validateQuality(quality);
     if (typeof crf !== 'undefined' && crf !== null) {
         remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
@@ -39,6 +39,7 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
     let renderedFrames = 0;
     let renderedDoneIn = null;
     let encodedDoneIn = null;
+    let cancelled = false;
     const renderStart = Date.now();
     const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
     const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
@@ -48,23 +49,31 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
         : null;
     const outputDir = parallelEncoding
         ? null
-        : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
+        : fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
     (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
         codec,
         height: composition.height,
         scale: scale !== null && scale !== void 0 ? scale : 1,
         width: composition.width,
     });
-    try {
-        const callUpdate = () => {
-            onProgress === null || onProgress === void 0 ? void 0 : onProgress({
-                encodedDoneIn,
-                encodedFrames,
-                renderedDoneIn,
-                renderedFrames,
-                stitchStage,
-            });
-        };
+    const callUpdate = () => {
+        onProgress === null || onProgress === void 0 ? void 0 : onProgress({
+            encodedDoneIn,
+            encodedFrames,
+            renderedDoneIn,
+            renderedFrames,
+            stitchStage,
+        });
+    };
+    const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
+    const cancelRenderFrames = (0, make_cancel_signal_1.makeCancelSignal)();
+    const cancelPrestitcher = (0, make_cancel_signal_1.makeCancelSignal)();
+    const cancelStitcher = (0, make_cancel_signal_1.makeCancelSignal)();
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+        cancelRenderFrames.cancel();
+    });
+    const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish } = (0, ensure_frames_in_order_1.ensureFramesInOrder)(realFrameRange);
+    const createPrestitcherIfNecessary = async () => {
         if (preEncodedFileLocation) {
             preStitcher = await (0, prespawn_ffmpeg_1.prespawnFfmpeg)({
                 width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
@@ -82,12 +91,27 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
                 verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
                 ffmpegExecutable,
                 imageFormat: actualImageFormat,
+                signal: cancelPrestitcher.cancelSignal,
             });
             stitcherFfmpeg = preStitcher.task;
         }
-        const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange !== null && frameRange !== void 0 ? frameRange : null);
-        const { waitForRightTimeOfFrameToBeInserted, setFrameToStitch, waitForFinish, } = (0, ensure_frames_in_order_1.ensureFramesInOrder)(realFrameRange);
-        const { assetsInfo } = await (0, render_frames_1.renderFrames)({
+    };
+    const waitForPrestitcherIfNecessary = async () => {
+        var _a;
+        if (stitcherFfmpeg) {
+            await waitForFinish();
+            (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
+            try {
+                await stitcherFfmpeg;
+            }
+            catch (err) {
+                throw new Error(preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.getLogs());
+            }
+        }
+    };
+    const happyPath = createPrestitcherIfNecessary()
+        .then(() => {
+        const renderFramesProc = (0, render_frames_1.renderFrames)({
             config: composition,
             onFrameUpdate: (frame) => {
                 renderedFrames = frame;
@@ -110,7 +134,12 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
                 ? async (buffer, frame) => {
                     var _a;
                     await waitForRightTimeOfFrameToBeInserted(frame);
+                    if (cancelled) {
+                        return;
+                    }
+                    const id = remotion_1.Internals.perf.startPerfMeasure('piping');
                     (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
+                    remotion_1.Internals.perf.stopPerfMeasure(id);
                     setFrameToStitch(frame + 1);
                 }
                 : undefined,
@@ -122,57 +151,66 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
             chromiumOptions,
             scale,
             ffmpegExecutable,
+            ffprobeExecutable,
             browserExecutable,
             port,
+            cancelSignal: cancelRenderFrames.cancelSignal,
         });
-        if (stitcherFfmpeg) {
-            await waitForFinish();
-            (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.end();
-            try {
-                await stitcherFfmpeg;
-            }
-            catch (err) {
-                throw new Error(preStitcher === null || preStitcher === void 0 ? void 0 : preStitcher.getLogs());
-            }
-        }
+        return renderFramesProc;
+    })
+        .then((renderFramesReturn) => {
+        return Promise.all([renderFramesReturn, waitForPrestitcherIfNecessary()]);
+    })
+        .then(([{ assetsInfo }]) => {
         renderedDoneIn = Date.now() - renderStart;
         callUpdate();
         (0, ensure_output_directory_1.ensureOutputDirectory)(outputLocation);
         const stitchStart = Date.now();
-        await (0, stitch_frames_to_video_1.stitchFramesToVideo)({
-            width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
-            height: composition.height * (scale !== null && scale !== void 0 ? scale : 1),
-            fps: composition.fps,
-            outputLocation,
-            internalOptions: {
-                preEncodedFileLocation,
-                imageFormat: actualImageFormat,
-            },
-            force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
-            pixelFormat,
-            codec,
-            proResProfile,
-            crf,
-            assetsInfo,
-            ffmpegExecutable,
-            onProgress: (frame) => {
-                stitchStage = 'muxing';
-                encodedFrames = frame;
-                callUpdate();
-            },
-            onDownload,
-            verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
-            dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
-        });
+        return Promise.all([
+            (0, stitch_frames_to_video_1.stitchFramesToVideo)({
+                width: composition.width * (scale !== null && scale !== void 0 ? scale : 1),
+                height: composition.height * (scale !== null && scale !== void 0 ? scale : 1),
+                fps: composition.fps,
+                outputLocation,
+                internalOptions: {
+                    preEncodedFileLocation,
+                    imageFormat: actualImageFormat,
+                },
+                force: overwrite !== null && overwrite !== void 0 ? overwrite : remotion_1.Internals.DEFAULT_OVERWRITE,
+                pixelFormat,
+                codec,
+                proResProfile,
+                crf,
+                assetsInfo,
+                ffmpegExecutable,
+                ffprobeExecutable,
+                onProgress: (frame) => {
+                    stitchStage = 'muxing';
+                    encodedFrames = frame;
+                    callUpdate();
+                },
+                onDownload,
+                verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
+                dir: outputDir !== null && outputDir !== void 0 ? outputDir : undefined,
+                cancelSignal: cancelStitcher.cancelSignal,
+            }),
+            stitchStart,
+        ]);
+    })
+        .then(([, stitchStart]) => {
         encodedFrames = (0, get_duration_from_frame_range_1.getDurationFromFrameRange)(frameRange !== null && frameRange !== void 0 ? frameRange : null, composition.durationInFrames);
         encodedDoneIn = Date.now() - stitchStart;
         callUpdate();
-    }
-    catch (err) {
+    })
+        .catch((err) => {
         /**
          * When an error is thrown in renderFrames(...) (e.g., when delayRender() is used incorrectly), fs.unlinkSync(...) throws an error that the file is locked because ffmpeg is still running, and renderMedia returns it.
          * Therefore we first kill the FFMPEG process before deleting the file
          */
+        cancelled = true;
+        cancelRenderFrames.cancel();
+        cancelStitcher.cancel();
+        cancelPrestitcher.cancel();
         if (stitcherFfmpeg !== undefined && stitcherFfmpeg.exitCode === null) {
             const promise = new Promise((resolve) => {
                 setTimeout(() => {
@@ -181,15 +219,25 @@ const renderMedia = async ({ parallelism, proResProfile, crf, composition, image
                 stitcherFfmpeg.on('close', resolve);
             });
             stitcherFfmpeg.kill();
-            await promise;
+            return promise.then(() => {
+                throw err;
+            });
         }
         throw err;
-    }
-    finally {
+    })
+        .finally(() => {
         if (preEncodedFileLocation !== null &&
             fs_1.default.existsSync(preEncodedFileLocation)) {
             fs_1.default.unlinkSync(preEncodedFileLocation);
         }
-    }
+    });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+                reject(new Error('renderMedia() got cancelled'));
+            });
+        }),
+    ]);
 };
 exports.renderMedia = renderMedia;

package/dist/render-still.d.ts

@@ -1,10 +1,11 @@
 import { Browser as PuppeteerBrowser } from 'puppeteer-core';
-import { BrowserExecutable, FfmpegExecutable, StillImageFormat, TCompMetadata } from 'remotion';
+import { BrowserExecutable, FfmpegExecutable, SmallTCompMetadata, StillImageFormat } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
+import { CancelSignal } from './make-cancel-signal';
 import { ChromiumOptions } from './open-browser';
 declare type InnerStillOptions = {
-    composition: TCompMetadata;
+    composition: SmallTCompMetadata;
     output: string;
     frame?: number;
     inputProps?: unknown;
@@ -19,7 +20,9 @@ declare type InnerStillOptions = {
     chromiumOptions?: ChromiumOptions;
     scale?: number;
     onDownload?: RenderMediaOnDownload;
+    cancelSignal?: CancelSignal;
     ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
 };
 declare type RenderStillOptions = InnerStillOptions & ServeUrlOrWebpackBundle & {
     port?: number | null;

package/dist/render-still.js

@@ -42,7 +42,7 @@ const seek_to_frame_1 = require("./seek-to-frame");
 const set_props_and_env_1 = require("./set-props-and-env");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_scale_1 = require("./validate-scale");
-const innerRenderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, timeoutInMilliseconds, chromiumOptions, scale, proxyPort, }) => {
+const innerRenderStill = async ({ composition, quality, imageFormat = 'png', serveUrl, puppeteerInstance, dumpBrowserLogs = false, onError, inputProps, envVariables, output, frame = 0, overwrite = true, browserExecutable, timeoutInMilliseconds, chromiumOptions, scale, proxyPort, cancelSignal, }) => {
     remotion_1.Internals.validateDimension(composition.height, 'height', 'in the `config` object passed to `renderStill()`');
     remotion_1.Internals.validateDimension(composition.width, 'width', 'in the `config` object passed to `renderStill()`');
     remotion_1.Internals.validateFps(composition.fps, 'in the `config` object of `renderStill()`');
@@ -76,11 +76,20 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
         forceDeviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
     }));
     const page = await browserInstance.newPage();
-    page.setViewport({
+    await page.setViewport({
         width: composition.width,
         height: composition.height,
         deviceScaleFactor: scale !== null && scale !== void 0 ? scale : 1,
     });
+    const errorCallback = (err) => {
+        onError(err);
+        cleanup();
+    };
+    const cleanUpJSException = (0, handle_javascript_exception_1.handleJavascriptException)({
+        page,
+        onError: errorCallback,
+        frame: null,
+    });
     const cleanup = async () => {
         cleanUpJSException();
         if (puppeteerInstance) {
@@ -92,14 +101,8 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
             });
         }
     };
-    const errorCallback = (err) => {
-        onError(err);
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         cleanup();
-    };
-    const cleanUpJSException = (0, handle_javascript_exception_1.handleJavascriptException)({
-        page,
-        onError: errorCallback,
-        frame: null,
     });
     await (0, set_props_and_env_1.setPropsAndEnv)({
         inputProps,
@@ -109,6 +112,7 @@ const innerRenderStill = async ({ composition, quality, imageFormat = 'png', ser
         initialFrame: frame,
         timeoutInMilliseconds,
         proxyPort,
+        retriesRemaining: 2,
     });
     await (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
         pageFunction: (id) => {
@@ -141,8 +145,8 @@ const renderStill = (options) => {
     const selectedServeUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
     const downloadDir = (0, make_assets_download_dir_1.makeAssetsDownloadTmpDir)();
     const onDownload = (_a = options.onDownload) !== null && _a !== void 0 ? _a : (() => () => undefined);
-    return new Promise((resolve, reject) => {
-        var _a, _b;
+    const happyPath = new Promise((resolve, reject) => {
+        var _a, _b, _c;
         const onError = (err) => reject(err);
         let close = null;
         (0, prepare_server_1.prepareServer)({
@@ -151,7 +155,8 @@ const renderStill = (options) => {
             onDownload,
             onError,
             ffmpegExecutable: (_a = options.ffmpegExecutable) !== null && _a !== void 0 ? _a : null,
-            port: (_b = options.port) !== null && _b !== void 0 ? _b : null,
+            ffprobeExecutable: (_b = options.ffprobeExecutable) !== null && _b !== void 0 ? _b : null,
+            port: (_c = options.port) !== null && _c !== void 0 ? _c : null,
         })
             .then(({ serveUrl, closeServer, offthreadPort }) => {
             close = closeServer;
@@ -166,5 +171,14 @@ const renderStill = (options) => {
             .catch((err) => reject(err))
             .finally(() => close === null || close === void 0 ? void 0 : close());
     });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            var _a;
+            (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+                reject(new Error('renderStill() got cancelled'));
+            });
+        }),
+    ]);
 };
 exports.renderStill = renderStill;

package/dist/serve-static.d.ts

@@ -3,6 +3,7 @@ import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file'
 export declare const serveStatic: (path: string | null, options: {
     port: number | null;
     ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     downloadDir: string;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;