@remotion/renderer 4.0.0-alpha4 → 4.0.0-alpha5

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

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

package/dist/offthread-video-server.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startOffthreadVideoServer = exports.extractUrlAndSourceFromUrl = void 0;
-const remotion_1 = require("remotion");
 const url_1 = require("url");
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
-const extract_frame_from_video_1 = require("./extract-frame-from-video");
+const compositor_1 = require("./compositor/compositor");
 const extractUrlAndSourceFromUrl = (url) => {
     const parsed = new URL(url, 'http://localhost');
     const query = parsed.search;
@@ -20,68 +19,76 @@ const extractUrlAndSourceFromUrl = (url) => {
     if (!time) {
         throw new Error('Did not get `time` parameter');
     }
-    const imageFormat = params.get('imageFormat');
-    if (!imageFormat) {
-        throw new TypeError('Did not get `imageFormat` parameter');
-    }
-    remotion_1.Internals.validateOffthreadVideoImageFormat(imageFormat);
+    const transparent = params.get('transparent');
     return {
         src,
         time: parseFloat(time),
-        imageFormat: imageFormat,
+        transparent: transparent === 'true',
     };
 };
 exports.extractUrlAndSourceFromUrl = extractUrlAndSourceFromUrl;
-const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, onDownload, onError, downloadMap, remotionRoot, }) => {
-    return (req, res) => {
-        if (!req.url) {
-            throw new Error('Request came in without URL');
-        }
-        if (!req.url.startsWith('/proxy')) {
-            res.writeHead(404);
-            res.end();
-            return;
-        }
-        const { src, time, imageFormat } = (0, exports.extractUrlAndSourceFromUrl)(req.url);
-        res.setHeader('access-control-allow-origin', '*');
-        res.setHeader('content-type', `image/${imageFormat === 'jpeg' ? 'jpg' : 'png'}`);
-        // Handling this case on Lambda:
-        // https://support.google.com/chrome/a/answer/7679408?hl=en
-        // Chrome sends Private Network Access preflights for subresources
-        if (req.method === 'OPTIONS') {
-            res.statusCode = 200;
-            if (req.headers['access-control-request-private-network']) {
-                res.setHeader('Access-Control-Allow-Private-Network', 'true');
+const startOffthreadVideoServer = ({ onDownload, onError, downloadMap, concurrency, verbose, }) => {
+    const compositor = (0, compositor_1.startCompositor)('StartLongRunningProcess', {
+        concurrency,
+        maximum_frame_cache_items: (0, compositor_1.getIdealMaximumFrameCacheItems)(),
+        verbose,
+    });
+    return {
+        close: () => {
+            compositor.finishCommands();
+            return compositor.waitForDone();
+        },
+        listener: (req, res) => {
+            if (!req.url) {
+                throw new Error('Request came in without URL');
             }
-            res.end();
-            return;
-        }
-        (0, download_and_map_assets_to_file_1.downloadAsset)({ src, onDownload, downloadMap })
-            .then((to) => {
-            return (0, extract_frame_from_video_1.extractFrameFromVideo)({
-                time,
-                src: to,
-                ffmpegExecutable,
-                ffprobeExecutable,
-                imageFormat,
-                downloadMap,
-                remotionRoot,
-            });
-        })
-            .then((readable) => {
-            if (!readable) {
-                throw new Error('no readable from ffmpeg');
+            if (!req.url.startsWith('/proxy')) {
+                res.writeHead(404);
+                res.end();
+                return;
+            }
+            const { src, time, transparent } = (0, exports.extractUrlAndSourceFromUrl)(req.url);
+            res.setHeader('access-control-allow-origin', '*');
+            if (transparent) {
+                res.setHeader('content-type', `image/png`);
             }
-            res.writeHead(200);
-            res.write(readable);
-            res.end();
-        })
-            .catch((err) => {
-            res.writeHead(500);
-            res.end();
-            onError(err);
-            console.log('Error occurred', err);
-        });
+            else {
+                res.setHeader('content-type', `image/bmp`);
+            }
+            // Handling this case on Lambda:
+            // https://support.google.com/chrome/a/answer/7679408?hl=en
+            // Chrome sends Private Network Access preflights for subresources
+            if (req.method === 'OPTIONS') {
+                res.statusCode = 200;
+                if (req.headers['access-control-request-private-network']) {
+                    res.setHeader('Access-Control-Allow-Private-Network', 'true');
+                }
+                res.end();
+                return;
+            }
+            (0, download_and_map_assets_to_file_1.downloadAsset)({ src, onDownload, downloadMap })
+                .then((to) => {
+                return compositor.executeCommand('ExtractFrame', {
+                    input: to,
+                    time,
+                    transparent,
+                });
+            })
+                .then((readable) => {
+                if (!readable) {
+                    throw new Error('no readable from ffmpeg');
+                }
+                res.writeHead(200);
+                res.write(readable);
+                res.end();
+            })
+                .catch((err) => {
+                res.writeHead(500);
+                res.end();
+                onError(err);
+                console.log('Error occurred', err);
+            });
+        },
     };
 };
 exports.startOffthreadVideoServer = startOffthreadVideoServer;

package/dist/open-browser.d.ts

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

package/dist/open-browser.js

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

package/dist/options/audio-bitrate.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const audioBitrateOption: RemotionOption;

package/dist/options/audio-bitrate.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.audioBitrateOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.audioBitrateOption = {
+    name: 'Audio Bitrate',
+    cliFlag: '--audio-bitrate',
+    description: ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Specify the target bitrate for the generated video. The syntax for FFMPEGs", (0, jsx_runtime_1.jsx)("code", { children: "-b:a" }), " parameter should be used. FFMPEG may encode the video in a way that will not result in the exact audio bitrate specified. Example values: ", (0, jsx_runtime_1.jsx)("code", { children: "512K" }), " for 512 kbps, ", (0, jsx_runtime_1.jsx)("code", { children: "1M" }), " for 1 Mbps. Default: ", (0, jsx_runtime_1.jsx)("code", { children: "320k" })] })),
+    ssrName: 'audioBitrate',
+    docLink: 'https://www.remotion.dev/docs/renderer/render-media#audiobitrate-',
+};

package/dist/options/crf.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const crfOption: RemotionOption;

package/dist/options/crf.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.crfOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.crfOption = {
+    name: 'CRF',
+    cliFlag: '--crf',
+    description: ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "No matter which codec you end up using, there's always a tradeoff between file size and video quality. You can control it by setting the so called CRF (Constant Rate Factor). The lower the number, the better the quality, the higher the number, the smaller the file is \u2013 of course at the cost of quality." })),
+    ssrName: 'crf',
+    docLink: 'https://www.remotion.dev/docs/encoding/#controlling-quality-using-the-crf-setting',
+};

package/dist/options/enforce-audio.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const enforceAudioOption: RemotionOption;

package/dist/options/enforce-audio.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enforceAudioOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.enforceAudioOption = {
+    name: 'Enforce Audio Track',
+    cliFlag: '--enforce-audio-track',
+    description: ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "Render a silent audio track if there would be none otherwise." })),
+    ssrName: 'enforceAudioTrack',
+    docLink: 'https://www.remotion.dev/docs/config#setenforceaudiotrack-',
+};

package/dist/options/jpeg-quality.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const jpegQualityOption: RemotionOption;

package/dist/options/jpeg-quality.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jpegQualityOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.jpegQualityOption = {
+    name: 'JPEG Quality',
+    cliFlag: '--jpeg-quality',
+    description: ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "Sets the quality of the generated JPEG images. Must be an integer between 0 and 100. Default is to leave it up to the browser, current default is 80." })),
+    ssrName: 'jpegQuality',
+    docLink: 'https://www.remotion.dev/docs/renderer/render-media#jpeg-quality',
+};

package/dist/options/mute.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const muteOption: RemotionOption;

package/dist/options/mute.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.muteOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.muteOption = {
+    name: 'Muted',
+    cliFlag: '--muted',
+    description: (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "The Audio of the video will be omitted." }),
+    ssrName: 'muted',
+    docLink: 'https://www.remotion.dev/docs/using-audio/#muted-property',
+};

package/dist/options/option.d.ts

@@ -0,0 +1,8 @@
+import type React from 'react';
+export declare type RemotionOption = {
+    name: string;
+    cliFlag: string;
+    ssrName: string;
+    description: React.ReactNode;
+    docLink: string;
+};

package/dist/options/option.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/options/scale.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const scaleOption: RemotionOption;

package/dist/options/scale.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scaleOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.scaleOption = {
+    name: 'Scale',
+    cliFlag: '--scale',
+    description: ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Scales the output by a factor. For example, a 1280x720px frame will become a 1920x1080px frame with a scale factor of ", (0, jsx_runtime_1.jsx)("code", { children: "1.5" }), ". Vector elements like fonts and HTML markups will be rendered with extra details."] })),
+    ssrName: 'scale',
+    docLink: 'https://www.remotion.dev/docs/scaling',
+};

package/dist/options/video-bitrate.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const videoBitrate: RemotionOption;

package/dist/options/video-bitrate.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.videoBitrate = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.videoBitrate = {
+    name: 'Video Bitrate',
+    cliFlag: '--video-bitrate',
+    description: ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Specify the target bitrate for the generated video. The syntax for FFMPEGs", (0, jsx_runtime_1.jsx)("code", { children: "-b:v" }), " parameter should be used. FFMPEG may encode the video in a way that will not result in the exact video bitrate specified. Example values: ", (0, jsx_runtime_1.jsx)("code", { children: "512K" }), " for 512 kbps, ", (0, jsx_runtime_1.jsx)("code", { children: "1M" }), " for 1 Mbps."] })),
+    ssrName: 'videoBitrate',
+    docLink: 'https://www.remotion.dev/docs/renderer/render-media#videobitrate-',
+};

package/dist/options/video-codec.d.ts

@@ -0,0 +1,2 @@
+import type { RemotionOption } from './option';
+export declare const videoCodecOption: RemotionOption;

package/dist/options/video-codec.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.videoCodecOption = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+exports.videoCodecOption = {
+    name: 'Codec',
+    cliFlag: '--codec',
+    description: ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "Remotion supports 5 video codecs: h264 (default), h265, vp8, vp9 and prores. While H264 will work well in most cases, sometimes it's worth going for a different codec. Follow the link below for an overview." })),
+    ssrName: 'codec',
+    docLink: 'https://www.remotion.dev/docs/encoding/#choosing-a-codec',
+};

package/dist/perf.d.ts

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

package/dist/perf.js

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

package/dist/prepare-server.d.ts

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

package/dist/prepare-server.js

@@ -9,16 +9,16 @@ 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, remotionRoot, }) => {
+const prepareServer = async ({ onDownload, onError, webpackConfigOrServeUrl, port, downloadMap, remotionRoot, concurrency, verbose, }) => {
     if ((0, is_serve_url_1.isServeUrl)(webpackConfigOrServeUrl)) {
         const { port: offthreadPort, close: closeProxy } = await (0, serve_static_1.serveStatic)(null, {
             onDownload,
             onError,
-            ffmpegExecutable,
-            ffprobeExecutable,
             port,
             downloadMap,
             remotionRoot,
+            concurrency,
+            verbose,
         });
         return Promise.resolve({
             serveUrl: webpackConfigOrServeUrl,
@@ -37,11 +37,11 @@ const prepareServer = async ({ ffmpegExecutable, ffprobeExecutable, onDownload,
     const { port: serverPort, close } = await (0, serve_static_1.serveStatic)(webpackConfigOrServeUrl, {
         onDownload,
         onError,
-        ffmpegExecutable,
-        ffprobeExecutable,
         port,
         downloadMap,
         remotionRoot,
+        concurrency,
+        verbose,
     });
     return Promise.resolve({
         closeServer: async (force) => {

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

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

package/dist/preprocess-audio-track.js

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

package/dist/prespawn-ffmpeg.d.ts

@@ -1,12 +1,10 @@
-import execa from 'execa';
 import type { Codec } from './codec';
-import type { FfmpegExecutable } from './ffmpeg-executable';
 import type { FfmpegOverrideFn } from './ffmpeg-override';
-import type { ImageFormat } from './image-format';
+import type { VideoImageFormat } from './image-format';
 import type { CancelSignal } from './make-cancel-signal';
 import type { PixelFormat } from './pixel-format';
 import type { ProResProfile } from './prores-profile';
-declare type PreSticherOptions = {
+declare type PreStitcherOptions = {
     fps: number;
     width: number;
     height: number;
@@ -17,14 +15,13 @@ declare type PreSticherOptions = {
     onProgress: (progress: number) => void;
     proResProfile: ProResProfile | undefined;
     verbose: boolean;
-    ffmpegExecutable: FfmpegExecutable | undefined;
-    imageFormat: ImageFormat;
+    imageFormat: VideoImageFormat;
     ffmpegOverride: FfmpegOverrideFn;
     signal: CancelSignal;
     videoBitrate: string | null;
 };
-export declare const prespawnFfmpeg: (options: PreSticherOptions, remotionRoot: string) => Promise<{
-    task: execa.ExecaChildProcess<string>;
+export declare const prespawnFfmpeg: (options: PreStitcherOptions) => {
+    task: import("execa").ExecaChildProcess<string>;
     getLogs: () => string;
-}>;
+};
 export {};

package/dist/prespawn-ffmpeg.js

@@ -1,22 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prespawnFfmpeg = void 0;
-const execa_1 = __importDefault(require("execa"));
 const remotion_1 = require("remotion");
+const call_ffmpeg_1 = require("./call-ffmpeg");
 const codec_1 = require("./codec");
+const get_executable_path_1 = require("./compositor/get-executable-path");
 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, remotionRoot) => {
-    var _a, _b, _c, _d, _e, _f;
+const prespawnFfmpeg = (options) => {
+    var _a, _b, _c;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : codec_1.DEFAULT_CODEC;
@@ -28,7 +24,6 @@ const prespawnFfmpeg = async (options, remotionRoot) => {
         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, 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) {
@@ -36,7 +31,7 @@ const prespawnFfmpeg = async (options, remotionRoot) => {
     }
     const supportsCrf = codec !== 'prores';
     if (options.verbose) {
-        console.log('[verbose] ffmpeg', (_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : 'ffmpeg in PATH');
+        console.log('[verbose] ffmpeg', (0, get_executable_path_1.getExecutablePath)('ffmpeg'));
         console.log('[verbose] encoder', encoderName);
         console.log('[verbose] pixelFormat', pixelFormat);
         if (supportsCrf) {
@@ -80,12 +75,12 @@ const prespawnFfmpeg = async (options, remotionRoot) => {
     const finalFfmpegString = options.ffmpegOverride
         ? options.ffmpegOverride({ type: 'pre-stitcher', args: ffmpegString })
         : ffmpegString;
-    const task = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : null, remotionRoot, 'ffmpeg'), finalFfmpegString);
+    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', finalFfmpegString);
     options.signal(() => {
         task.kill();
     });
     let ffmpegOutput = '';
-    (_f = task.stderr) === null || _f === void 0 ? void 0 : _f.on('data', (data) => {
+    (_c = task.stderr) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
         const str = data.toString();
         ffmpegOutput += str;
         if (options.onProgress) {

package/dist/prestitcher-memory-usage.d.ts

@@ -1,7 +1,3 @@
-export declare const estimateMemoryUsageForPrestitcher: ({ width, height, }: {
-    width: number;
-    height: number;
-}) => number;
 export declare const shouldUseParallelEncoding: ({ width, height, }: {
     width: number;
     height: number;