@remotion/renderer 4.0.0-alpha4 → 4.0.0-alpha6

package/dist/serve-handler/index.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveHandler = void 0;
-const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
-const url_1 = __importDefault(require("url"));
+const node_fs_1 = require("node:fs");
+const node_path_1 = __importDefault(require("node:path"));
+const node_url_1 = __importDefault(require("node:url"));
 const mime_types_1 = require("../mime-types");
 // Packages
 const is_path_inside_1 = require("./is-path-inside");
 const range_parser_1 = require("./range-parser");
 const getHeaders = (absolutePath, stats) => {
-    const { base } = path_1.default.parse(absolutePath);
+    const { base } = node_path_1.default.parse(absolutePath);
     let defaultHeaders = {};
     if (stats) {
         defaultHeaders = {
@@ -28,19 +28,19 @@ const getHeaders = (absolutePath, stats) => {
     return defaultHeaders;
 };
 const getPossiblePaths = (relativePath, extension) => [
-    path_1.default.join(relativePath, `index${extension}`),
+    node_path_1.default.join(relativePath, `index${extension}`),
     relativePath.endsWith('/')
         ? relativePath.replace(/\/$/g, extension)
         : relativePath + extension,
-].filter((item) => path_1.default.basename(item) !== extension);
+].filter((item) => node_path_1.default.basename(item) !== extension);
 const findRelated = async (current, relativePath) => {
     const possible = getPossiblePaths(relativePath, '.html');
     let stats = null;
     for (let index = 0; index < possible.length; index++) {
         const related = possible[index];
-        const absolutePath = path_1.default.join(current, related);
+        const absolutePath = node_path_1.default.join(current, related);
         try {
-            stats = await fs_1.promises.lstat(absolutePath);
+            stats = await node_fs_1.promises.lstat(absolutePath);
         }
         catch (err) {
             if (err.code !== 'ENOENT' &&
@@ -59,10 +59,11 @@ const findRelated = async (current, relativePath) => {
 };
 const sendError = (absolutePath, response, spec) => {
     const { message, statusCode } = spec;
-    response.statusCode = statusCode;
     const headers = getHeaders(absolutePath, null);
-    response.writeHead(statusCode, headers);
-    response.setHeader('content-type', 'application/json');
+    response.writeHead(statusCode, {
+        ...headers,
+        'Content-Type': 'application/json',
+    });
     response.end(JSON.stringify({ statusCode, message }));
 };
 const internalError = (absolutePath, response) => {
@@ -74,10 +75,10 @@ const internalError = (absolutePath, response) => {
 };
 const serveHandler = async (request, response, config) => {
     const cwd = process.cwd();
-    const current = path_1.default.resolve(cwd, config.public);
+    const current = node_path_1.default.resolve(cwd, config.public);
     let relativePath = null;
     try {
-        relativePath = decodeURIComponent(url_1.default.parse(request.url).pathname);
+        relativePath = decodeURIComponent(node_url_1.default.parse(request.url).pathname);
     }
     catch (err) {
         return sendError('/', response, {
@@ -86,7 +87,7 @@ const serveHandler = async (request, response, config) => {
             message: 'Bad Request',
         });
     }
-    let absolutePath = path_1.default.join(current, relativePath);
+    let absolutePath = node_path_1.default.join(current, relativePath);
     // Prevent path traversal vulnerabilities. We could do this
     // by ourselves, but using the package covers all the edge cases.
     if (!(0, is_path_inside_1.isPathInside)(absolutePath, current)) {
@@ -108,9 +109,9 @@ const serveHandler = async (request, response, config) => {
     // directory exists requires loading all the file paths and then checking if
     // one of them includes the path of the directory. As that's a very
     // performance-expensive thing to do, we need to ensure it's not happening if not really necessary.
-    if (path_1.default.extname(relativePath) !== '') {
+    if (node_path_1.default.extname(relativePath) !== '') {
         try {
-            stats = await fs_1.promises.lstat(absolutePath);
+            stats = await node_fs_1.promises.lstat(absolutePath);
         }
         catch (err) {
             if (err.code !== 'ENOENT' &&
@@ -123,7 +124,8 @@ const serveHandler = async (request, response, config) => {
         try {
             const related = await findRelated(current, relativePath);
             if (related) {
-                ({ stats, absolutePath } = related);
+                stats = related.stats;
+                absolutePath = related.absolutePath;
             }
         }
         catch (err) {
@@ -133,7 +135,7 @@ const serveHandler = async (request, response, config) => {
             }
         }
         try {
-            stats = await fs_1.promises.lstat(absolutePath);
+            stats = await node_fs_1.promises.lstat(absolutePath);
         }
         catch (err) {
             if (err.code !== 'ENOENT' &&
@@ -188,7 +190,7 @@ const serveHandler = async (request, response, config) => {
     }
     let stream = null;
     try {
-        stream = (0, fs_1.createReadStream)(absolutePath, streamOpts !== null && streamOpts !== void 0 ? streamOpts : {});
+        stream = (0, node_fs_1.createReadStream)(absolutePath, streamOpts !== null && streamOpts !== void 0 ? streamOpts : {});
     }
     catch (err) {
         return internalError(absolutePath, response);

package/dist/serve-handler/is-path-inside.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isPathInside = void 0;
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
 const isPathInside = function (thePath, potentialParent) {
     // For inside-directory checking, we want to allow trailing slashes, so normalize.
     thePath = stripTrailingSep(thePath);
@@ -15,12 +15,12 @@ const isPathInside = function (thePath, potentialParent) {
         potentialParent = potentialParent.toLowerCase();
     }
     return (thePath.lastIndexOf(potentialParent, 0) === 0 &&
-        (thePath[potentialParent.length] === path_1.default.sep ||
+        (thePath[potentialParent.length] === node_path_1.default.sep ||
             thePath[potentialParent.length] === undefined));
 };
 exports.isPathInside = isPathInside;
 function stripTrailingSep(thePath) {
-    if (thePath[thePath.length - 1] === path_1.default.sep) {
+    if (thePath[thePath.length - 1] === node_path_1.default.sep) {
         return thePath.slice(0, -1);
     }
     return thePath;

package/dist/serve-static.d.ts

@@ -1,14 +1,13 @@
 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 serveStatic: (path: string | null, options: {
     port: number | null;
-    ffmpegExecutable: FfmpegExecutable;
-    ffprobeExecutable: FfmpegExecutable;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
     downloadMap: DownloadMap;
     remotionRoot: string;
+    concurrency: number;
+    verbose: boolean;
 }) => Promise<{
     port: number;
     close: () => Promise<void>;

package/dist/serve-static.js

@@ -4,21 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveStatic = void 0;
-const http_1 = __importDefault(require("http"));
+const node_http_1 = __importDefault(require("node:http"));
 const get_port_1 = require("./get-port");
 const offthread_video_server_1 = require("./offthread-video-server");
 const serve_handler_1 = require("./serve-handler");
 const serveStatic = async (path, options) => {
-    const offthreadRequest = (0, offthread_video_server_1.startOffthreadVideoServer)({
-        ffmpegExecutable: options.ffmpegExecutable,
-        ffprobeExecutable: options.ffprobeExecutable,
+    const { listener: offthreadRequest, close: closeCompositor } = (0, offthread_video_server_1.startOffthreadVideoServer)({
         onDownload: options.onDownload,
         onError: options.onError,
         downloadMap: options.downloadMap,
-        remotionRoot: options.remotionRoot,
+        concurrency: options.concurrency,
+        verbose: options.verbose,
     });
     const connections = {};
-    const server = http_1.default.createServer((request, response) => {
+    const server = node_http_1.default.createServer((request, response) => {
         var _a;
         if ((_a = request.url) === null || _a === void 0 ? void 0 : _a.startsWith('/proxy')) {
             return offthreadRequest(request, response);
@@ -31,7 +30,9 @@ const serveStatic = async (path, options) => {
         (0, serve_handler_1.serveHandler)(request, response, {
             public: path,
         }).catch(() => {
-            response.statusCode = 500;
+            if (!response.headersSent) {
+                response.writeHead(500);
+            }
             response.end('Error serving file');
         });
     });
@@ -65,22 +66,25 @@ const serveStatic = async (path, options) => {
                 for (const key in connections)
                     connections[key].destroy();
             };
-            const close = () => {
-                return new Promise((resolve, reject) => {
-                    destroyConnections();
-                    server.close((err) => {
-                        if (err) {
-                            if (err.code ===
-                                'ERR_SERVER_NOT_RUNNING') {
-                                return resolve();
+            const close = async () => {
+                await Promise.all([
+                    closeCompositor(),
+                    new Promise((resolve, reject) => {
+                        destroyConnections();
+                        server.close((err) => {
+                            if (err) {
+                                if (err.code ===
+                                    'ERR_SERVER_NOT_RUNNING') {
+                                    return resolve();
+                                }
+                                reject(err);
                             }
-                            reject(err);
-                        }
-                        else {
-                            resolve();
-                        }
-                    });
-                });
+                            else {
+                                resolve();
+                            }
+                        });
+                    }),
+                ]);
             };
             return { port: selectedPort, close };
         }

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

@@ -1,11 +1,9 @@
-/// <reference types="node" />
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { RenderAssetInfo } from './assets/download-map';
 import type { AudioCodec } from './audio-codec';
 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';
@@ -27,27 +25,19 @@ export declare type StitcherOptions = {
     onDownload?: RenderMediaOnDownload;
     proResProfile?: ProResProfile;
     verbose?: boolean;
-    ffmpegExecutable?: FfmpegExecutable;
-    ffprobeExecutable?: FfmpegExecutable;
     dir?: string;
     cancelSignal?: CancelSignal;
     internalOptions?: {
         preEncodedFileLocation: string | null;
-        imageFormat: ImageFormat;
+        imageFormat: VideoImageFormat;
         preferLossless: boolean;
     };
     muted?: boolean;
     enforceAudioTrack?: boolean;
     ffmpegOverride?: FfmpegOverrideFn;
 };
-declare type ReturnType = {
-    task: Promise<Buffer | null>;
-    getLogs: () => string;
-};
-export declare const spawnFfmpeg: (options: StitcherOptions, remotionRoot: string) => Promise<ReturnType>;
 /**
  * @description Takes a series of images and audio information generated by renderFrames() and encodes it to a video.
  * @see [Documentation](https://www.remotion.dev/docs/renderer/stitch-frames-to-video)
  */
 export declare const stitchFramesToVideo: (options: StitcherOptions) => Promise<Buffer | null>;
-export {};

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

@@ -26,22 +26,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
-const execa_1 = __importDefault(require("execa"));
-const fs_1 = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
+exports.stitchFramesToVideo = void 0;
+const node_fs_1 = __importStar(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const remotion_1 = require("remotion");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
 const convert_assets_to_file_urls_1 = require("./assets/convert-assets-to-file-urls");
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
 const audio_codec_1 = require("./audio-codec");
+const call_ffmpeg_1 = require("./call-ffmpeg");
 const codec_1 = require("./codec");
 const codec_supports_media_1 = require("./codec-supports-media");
+const get_executable_path_1 = require("./compositor/get-executable-path");
 const convert_number_of_gif_loops_to_ffmpeg_1 = require("./convert-number-of-gif-loops-to-ffmpeg");
 const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
 const does_have_m2_bug_1 = require("./does-have-m2-bug");
-const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_codec_name_1 = require("./get-codec-name");
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
@@ -54,13 +54,12 @@ const preprocess_audio_track_1 = require("./preprocess-audio-track");
 const prores_profile_1 = require("./prores-profile");
 const truthy_1 = require("./truthy");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
-const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const validate_videobitrate_1 = require("./validate-videobitrate");
-const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
-const packageJson = fs_1.default.existsSync(packageJsonPath)
-    ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
+const packageJsonPath = node_path_1.default.join(__dirname, '..', 'package.json');
+const packageJson = node_fs_1.default.existsSync(packageJsonPath)
+    ? JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
-const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, remotionRoot, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, onProgress, downloadMap, remotionRoot, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
@@ -76,24 +75,20 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
         onProgress(preprocessProgress.reduce((a, b) => a + b, 0) / assetPositions.length);
     };
     const preprocessed = (await Promise.all(assetPositions.map(async (asset, index) => {
-        const filterFile = path_1.default.join(downloadMap.audioMixing, `${index}.wav`);
+        const filterFile = node_path_1.default.join(downloadMap.audioMixing, `${index}.wav`);
         const result = await (0, preprocess_audio_track_1.preprocessAudioTrack)({
-            ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
-            ffprobeExecutable: ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : null,
             outName: filterFile,
             asset,
             expectedFrames,
             fps,
             downloadMap,
-            remotionRoot,
         });
         preprocessProgress[index] = 1;
         updateProgress();
         return result;
     }))).filter(truthy_1.truthy);
-    const outName = path_1.default.join(downloadMap.audioPreprocessing, `audio.wav`);
+    const outName = node_path_1.default.join(downloadMap.audioPreprocessing, `audio.wav`);
     await (0, merge_audio_track_1.mergeAudioTrack)({
-        ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
         files: preprocessed,
         outName,
         numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
@@ -108,7 +103,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     return outName;
 };
 const spawnFfmpeg = async (options, remotionRoot) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     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;
@@ -126,7 +121,6 @@ const spawnFfmpeg = async (options, remotionRoot) => {
     (0, validate_videobitrate_1.validateBitrate)(options.videoBitrate, 'videoBitrate');
     remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', false);
     const pixelFormat = (_b = options.pixelFormat) !== null && _b !== void 0 ? _b : pixel_format_1.DEFAULT_PIXEL_FORMAT;
-    await (0, validate_ffmpeg_1.validateFfmpeg)((_c = options.ffmpegExecutable) !== null && _c !== void 0 ? _c : null, remotionRoot, 'ffmpeg');
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
     const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
@@ -139,14 +133,14 @@ const spawnFfmpeg = async (options, remotionRoot) => {
         throw new Error('The output format has neither audio nor video. This can happen if you are rendering an audio codec and the output file has no audio or the muted flag was passed.');
     }
     // Explanation: https://github.com/remotion-dev/remotion/issues/1647
-    const resolvedAudioCodec = ((_d = options.internalOptions) === null || _d === void 0 ? void 0 : _d.preferLossless)
+    const resolvedAudioCodec = ((_c = options.internalOptions) === null || _c === void 0 ? void 0 : _c.preferLossless)
         ? (0, audio_codec_1.getDefaultAudioCodec)({ codec, preferLossless: true })
-        : (_e = options.audioCodec) !== null && _e !== void 0 ? _e : (0, audio_codec_1.getDefaultAudioCodec)({ codec, preferLossless: false });
+        : (_d = options.audioCodec) !== null && _d !== void 0 ? _d : (0, audio_codec_1.getDefaultAudioCodec)({ codec, preferLossless: false });
     const tempFile = options.outputLocation
         ? null
-        : path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, resolvedAudioCodec)}`);
+        : node_path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, resolvedAudioCodec)}`);
     if (options.verbose) {
-        console.log('[verbose] ffmpeg', (_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg in PATH');
+        console.log('[verbose] ffmpeg', (0, get_executable_path_1.getExecutablePath)('ffmpeg'));
         console.log('[verbose] encoder', encoderName);
         console.log('[verbose] audioCodec', resolvedAudioCodec);
         console.log('[verbose] pixelFormat', pixelFormat);
@@ -176,9 +170,7 @@ const spawnFfmpeg = async (options, remotionRoot) => {
             onDownload: options.onDownload,
             fps: options.fps,
             expectedFrames,
-            verbose: (_g = options.verbose) !== null && _g !== void 0 ? _g : false,
-            ffmpegExecutable: (_h = options.ffmpegExecutable) !== null && _h !== void 0 ? _h : null,
-            ffprobeExecutable: (_j = options.ffprobeExecutable) !== null && _j !== void 0 ? _j : null,
+            verbose: (_e = options.verbose) !== null && _e !== void 0 ? _e : false,
             onProgress: (prog) => updateProgress(prog, 0),
             downloadMap: options.assetsInfo.downloadMap,
             remotionRoot,
@@ -188,28 +180,28 @@ const spawnFfmpeg = async (options, remotionRoot) => {
         if (!resolvedAudioCodec) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
-        const ffmpegTask = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_k = options.ffmpegExecutable) !== null && _k !== void 0 ? _k : null, remotionRoot, 'ffmpeg'), [
+        const ffmpegTask = (0, call_ffmpeg_1.callFf)('ffmpeg', [
             '-i',
             audio,
             '-c:a',
             (0, audio_codec_1.mapAudioCodecToFfmpegAudioCodecName)(resolvedAudioCodec),
             // Set bitrate up to 320k, for aac it might effectively be lower
             '-b:a',
-            (_l = options.audioBitrate) !== null && _l !== void 0 ? _l : '320k',
+            (_f = options.audioBitrate) !== null && _f !== void 0 ? _f : '320k',
             options.force ? '-y' : null,
-            (_m = options.outputLocation) !== null && _m !== void 0 ? _m : tempFile,
+            (_g = options.outputLocation) !== null && _g !== void 0 ? _g : tempFile,
         ].filter(remotion_1.Internals.truthy));
-        (_o = options.cancelSignal) === null || _o === void 0 ? void 0 : _o.call(options, () => {
+        (_h = options.cancelSignal) === null || _h === void 0 ? void 0 : _h.call(options, () => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_p = options.onProgress) === null || _p === void 0 ? void 0 : _p.call(options, expectedFrames);
+        (_j = options.onProgress) === null || _j === void 0 ? void 0 : _j.call(options, expectedFrames);
         if (audio) {
-            (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(audio));
+            (0, delete_directory_1.deleteDirectory)(node_path_1.default.dirname(audio));
         }
         const file = await new Promise((resolve, reject) => {
             if (tempFile) {
-                fs_1.promises
+                node_fs_1.promises
                     .readFile(tempFile)
                     .then((f) => {
                     return resolve(f);
@@ -227,26 +219,26 @@ const spawnFfmpeg = async (options, remotionRoot) => {
         };
     }
     const ffmpegArgs = [
-        ['-r', String(options.fps)],
-        ...(((_q = options.internalOptions) === null || _q === void 0 ? void 0 : _q.preEncodedFileLocation)
-            ? [['-i', (_r = options.internalOptions) === null || _r === void 0 ? void 0 : _r.preEncodedFileLocation]]
+        ...(((_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.preEncodedFileLocation)
+            ? [['-i', (_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation]]
             : [
+                ['-r', String(options.fps)],
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
                 ['-start_number', String(options.assetsInfo.firstFrameIndex)],
                 ['-i', options.assetsInfo.imageSequenceName],
             ]),
         audio ? ['-i', audio] : null,
-        ((_s = options.numberOfGifLoops) !== null && _s !== void 0 ? _s : null) === null
+        ((_m = options.numberOfGifLoops) !== null && _m !== void 0 ? _m : null) === null
             ? null
             : [
                 '-loop',
-                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_t = options.numberOfGifLoops) !== null && _t !== void 0 ? _t : null),
+                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_o = options.numberOfGifLoops) !== null && _o !== void 0 ? _o : null),
             ],
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_u = options.internalOptions) === null || _u === void 0 ? void 0 : _u.preEncodedFileLocation)
+        ...(((_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -274,7 +266,7 @@ const spawnFfmpeg = async (options, remotionRoot) => {
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
         options.force ? '-y' : null,
-        (_v = options.outputLocation) !== null && _v !== void 0 ? _v : tempFile,
+        (_q = options.outputLocation) !== null && _q !== void 0 ? _q : tempFile,
     ];
     if (options.verbose) {
         console.log('Generated FFMPEG command:');
@@ -288,15 +280,15 @@ const spawnFfmpeg = async (options, remotionRoot) => {
         console.log('Generated final FFMPEG command:');
         console.log(finalFfmpegString);
     }
-    const task = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_w = options.ffmpegExecutable) !== null && _w !== void 0 ? _w : null, remotionRoot, 'ffmpeg'), finalFfmpegString, {
+    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', finalFfmpegString, {
         cwd: options.dir,
     });
-    (_x = options.cancelSignal) === null || _x === void 0 ? void 0 : _x.call(options, () => {
+    (_r = options.cancelSignal) === null || _r === void 0 ? void 0 : _r.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_y = task.stderr) === null || _y === void 0 ? void 0 : _y.on('data', (data) => {
+    (_s = task.stderr) === null || _s === void 0 ? void 0 : _s.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -325,12 +317,12 @@ const spawnFfmpeg = async (options, remotionRoot) => {
                 (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
                 return null;
             }
-            return fs_1.promises
+            return node_fs_1.promises
                 .readFile(tempFile)
                 .then((file) => {
                 return Promise.all([
                     file,
-                    (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(tempFile)),
+                    (0, delete_directory_1.deleteDirectory)(node_path_1.default.dirname(tempFile)),
                     (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames),
                 ]);
             })
@@ -339,7 +331,6 @@ const spawnFfmpeg = async (options, remotionRoot) => {
         getLogs: () => ffmpegOutput,
     };
 };
-exports.spawnFfmpeg = spawnFfmpeg;
 /**
  * @description Takes a series of images and audio information generated by renderFrames() and encodes it to a video.
  * @see [Documentation](https://www.remotion.dev/docs/renderer/stitch-frames-to-video)
@@ -347,7 +338,7 @@ exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
     var _a, _b;
     const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
-    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options, remotionRoot);
+    const { task, getLogs } = await spawnFfmpeg(options, remotionRoot);
     const happyPath = task.catch(() => {
         throw new Error(getLogs());
     });

package/dist/take-frame-and-compose.d.ts

@@ -1,12 +1,11 @@
-/// <reference types="node" />
 import type { TAsset } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { Page } from './browser/BrowserPage';
-import type { ImageFormat } from './image-format';
-export declare const takeFrameAndCompose: ({ freePage, imageFormat, quality, frame, width, height, output, scale, downloadMap, wantsBuffer, }: {
+import type { StillImageFormat, VideoImageFormat } from './image-format';
+export declare const takeFrameAndCompose: ({ freePage, imageFormat, jpegQuality, frame, width, height, output, scale, downloadMap, wantsBuffer, }: {
     freePage: Page;
-    imageFormat: ImageFormat;
-    quality: number | undefined;
+    imageFormat: VideoImageFormat | StillImageFormat;
+    jpegQuality: number | undefined;
     frame: number;
     height: number;
     width: number;

package/dist/take-frame-and-compose.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeFrameAndCompose = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const compose_1 = require("./compositor/compose");
 const provide_screenshot_1 = require("./provide-screenshot");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const truthy_1 = require("./truthy");
-const takeFrameAndCompose = async ({ freePage, imageFormat, quality, frame, width, height, output, scale, downloadMap, wantsBuffer, }) => {
+const takeFrameAndCompose = async ({ freePage, imageFormat, jpegQuality, frame, width, height, output, scale, downloadMap, wantsBuffer, }) => {
     var _a;
     const [clipRegion, collectedAssets] = await Promise.all([
         (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
@@ -39,8 +39,8 @@ const takeFrameAndCompose = async ({ freePage, imageFormat, quality, frame, widt
     const needsComposing = clipRegion === null
         ? null
         : {
-            tmpFile: path_1.default.join(downloadMap.compositingDir, `${frame}.${imageFormat}`),
-            finalOutfie: output !== null && output !== void 0 ? output : path_1.default.join(downloadMap.compositingDir, `${frame}-final.${imageFormat}`),
+            tmpFile: node_path_1.default.join(downloadMap.compositingDir, `${frame}.${imageFormat}`),
+            finalOutFile: output !== null && output !== void 0 ? output : node_path_1.default.join(downloadMap.compositingDir, `${frame}-final.${imageFormat}`),
             clipRegion: clipRegion,
         };
     if (clipRegion !== 'hide') {
@@ -48,7 +48,7 @@ const takeFrameAndCompose = async ({ freePage, imageFormat, quality, frame, widt
         const buf = await (0, provide_screenshot_1.provideScreenshot)({
             page: freePage,
             imageFormat,
-            quality,
+            jpegQuality,
             options: {
                 frame,
                 output: shouldMakeBuffer ? null : (_a = needsComposing === null || needsComposing === void 0 ? void 0 : needsComposing.tmpFile) !== null && _a !== void 0 ? _a : output,
@@ -62,6 +62,12 @@ const takeFrameAndCompose = async ({ freePage, imageFormat, quality, frame, widt
         }
     }
     if (needsComposing) {
+        if (imageFormat === 'pdf') {
+            throw new Error("You cannot use compositor APIs (like <Clipper>) if `imageFormat` is 'pdf'.");
+        }
+        if (imageFormat === 'webp') {
+            throw new Error("You cannot use compositor APIs (like <Clipper>) if `imageFormat` is 'webp'.");
+        }
         await (0, compose_1.compose)({
             height: height * scale,
             width: width * scale,
@@ -81,13 +87,13 @@ const takeFrameAndCompose = async ({ freePage, imageFormat, quality, frame, widt
                         },
                     },
             ].filter(truthy_1.truthy),
-            output: needsComposing.finalOutfie,
+            output: needsComposing.finalOutFile,
             downloadMap,
             imageFormat: imageFormat === 'jpeg' ? 'Jpeg' : 'Png',
         });
         if (wantsBuffer) {
-            const buffer = await fs_1.default.promises.readFile(needsComposing.finalOutfie);
-            await fs_1.default.promises.unlink(needsComposing.finalOutfie);
+            const buffer = await node_fs_1.default.promises.readFile(needsComposing.finalOutFile);
+            await node_fs_1.default.promises.unlink(needsComposing.finalOutFile);
             return { buffer, collectedAssets };
         }
     }

package/dist/tmp-dir.js

@@ -27,9 +27,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tmpDir = void 0;
-const fs_1 = __importStar(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const node_fs_1 = __importStar(require("node:fs"));
+const node_os_1 = __importDefault(require("node:os"));
+const node_path_1 = __importDefault(require("node:path"));
 const alphabet = 'abcdefghijklmnopqrstuvwxyz0123456789';
 const randomHash = () => {
     return new Array(10)
@@ -40,15 +40,14 @@ const randomHash = () => {
         .join('');
 };
 const tmpDir = (str) => {
-    var _a;
-    const newDir = path_1.default.join(os_1.default.tmpdir(), str + randomHash());
-    if (fs_1.default.existsSync(newDir)) {
-        ((_a = fs_1.default.rmSync) !== null && _a !== void 0 ? _a : fs_1.default.rmdirSync)(newDir, {
+    const newDir = node_path_1.default.join(node_os_1.default.tmpdir(), str + randomHash());
+    if (node_fs_1.default.existsSync(newDir)) {
+        node_fs_1.default.rmSync(newDir, {
             recursive: true,
             force: true,
         });
     }
-    (0, fs_1.mkdirSync)(newDir);
+    (0, node_fs_1.mkdirSync)(newDir);
     return newDir;
 };
 exports.tmpDir = tmpDir;