@remotion/renderer 4.0.0-webhook.26 → 4.1.0-alpha1

package/dist/index.js

@@ -26,23 +26,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.ErrorWithStackFrame = exports.combineVideos = void 0;
+exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.selectComposition = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.ErrorWithStackFrame = void 0;
 const execa_1 = __importDefault(require("execa"));
 const download_file_1 = require("./assets/download-file");
-const download_map_1 = require("./assets/download-map");
+const audio_codec_1 = require("./audio-codec");
 const browser_1 = require("./browser");
+const Browser_1 = require("./browser/Browser");
 const TimeoutSettings_1 = require("./browser/TimeoutSettings");
+const call_ffmpeg_1 = require("./call-ffmpeg");
 const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
+const chalk_1 = require("./chalk");
+const is_color_supported_1 = require("./chalk/is-color-supported");
 const check_apple_silicon_1 = require("./check-apple-silicon");
 const codec_1 = require("./codec");
+const combine_videos_1 = require("./combine-videos");
+const get_executable_path_1 = require("./compositor/get-executable-path");
 const convert_to_positive_frame_index_1 = require("./convert-to-positive-frame-index");
-const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
 const ensure_output_directory_1 = require("./ensure-output-directory");
 const symbolicate_error_1 = require("./error-handling/symbolicate-error");
 const symbolicateable_error_1 = require("./error-handling/symbolicateable-error");
-const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const file_extensions_1 = require("./file-extensions");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const frame_range_1 = require("./frame-range");
+const get_compositions_1 = require("./get-compositions");
 const get_concurrency_1 = require("./get-concurrency");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
@@ -53,63 +60,55 @@ const get_port_1 = require("./get-port");
 const image_format_1 = require("./image-format");
 const is_audio_codec_1 = require("./is-audio-codec");
 const is_serve_url_1 = require("./is-serve-url");
+const jpeg_quality_1 = require("./jpeg-quality");
 const log_level_1 = require("./log-level");
+const logger_1 = require("./logger");
 const mime_types_1 = require("./mime-types");
-const normalize_serve_url_1 = require("./normalize-serve-url");
 const open_browser_1 = require("./open-browser");
 const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
 const perf = __importStar(require("./perf"));
 const pixel_format_1 = require("./pixel-format");
-const prores_profile_1 = require("./prores-profile");
-const quality_1 = require("./quality");
+const prepare_server_1 = require("./prepare-server");
+const render_frames_1 = require("./render-frames");
+const render_media_1 = require("./render-media");
+const render_still_1 = require("./render-still");
+const select_composition_1 = require("./select-composition");
 const is_path_inside_1 = require("./serve-handler/is-path-inside");
 const serve_static_1 = require("./serve-static");
-const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
 const tmp_dir_1 = require("./tmp-dir");
 const validate_concurrency_1 = require("./validate-concurrency");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
-const validate_every_nth_frame_1 = require("./validate-every-nth-frame");
-const validate_ffmpeg_1 = require("./validate-ffmpeg");
-const validate_frame_1 = require("./validate-frame");
 const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
-const validate_scale_1 = require("./validate-scale");
+const validate_videobitrate_1 = require("./validate-videobitrate");
 const wait_for_symbolication_error_to_be_done_1 = require("./wait-for-symbolication-error-to-be-done");
-var combine_videos_1 = require("./combine-videos");
-Object.defineProperty(exports, "combineVideos", { enumerable: true, get: function () { return combine_videos_1.combineVideos; } });
 var handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
 Object.defineProperty(exports, "ErrorWithStackFrame", { enumerable: true, get: function () { return handle_javascript_exception_1.ErrorWithStackFrame; } });
-var get_compositions_1 = require("./get-compositions");
-Object.defineProperty(exports, "getCompositions", { enumerable: true, get: function () { return get_compositions_1.getCompositions; } });
+var get_compositions_2 = require("./get-compositions");
+Object.defineProperty(exports, "getCompositions", { enumerable: true, get: function () { return get_compositions_2.getCompositions; } });
 var image_format_2 = require("./image-format");
 Object.defineProperty(exports, "validateSelectedPixelFormatAndImageFormatCombination", { enumerable: true, get: function () { return image_format_2.validateSelectedPixelFormatAndImageFormatCombination; } });
-Object.defineProperty(exports, "validImageFormats", { enumerable: true, get: function () { return image_format_2.validImageFormats; } });
 var make_cancel_signal_1 = require("./make-cancel-signal");
 Object.defineProperty(exports, "makeCancelSignal", { enumerable: true, get: function () { return make_cancel_signal_1.makeCancelSignal; } });
 var open_browser_2 = require("./open-browser");
 Object.defineProperty(exports, "openBrowser", { enumerable: true, get: function () { return open_browser_2.openBrowser; } });
-var render_frames_1 = require("./render-frames");
-Object.defineProperty(exports, "renderFrames", { enumerable: true, get: function () { return render_frames_1.renderFrames; } });
-var render_media_1 = require("./render-media");
-Object.defineProperty(exports, "renderMedia", { enumerable: true, get: function () { return render_media_1.renderMedia; } });
-var render_still_1 = require("./render-still");
-Object.defineProperty(exports, "renderStill", { enumerable: true, get: function () { return render_still_1.renderStill; } });
-var stitch_frames_to_video_2 = require("./stitch-frames-to-video");
-Object.defineProperty(exports, "stitchFramesToVideo", { enumerable: true, get: function () { return stitch_frames_to_video_2.stitchFramesToVideo; } });
+var render_frames_2 = require("./render-frames");
+Object.defineProperty(exports, "renderFrames", { enumerable: true, get: function () { return render_frames_2.renderFrames; } });
+var render_media_2 = require("./render-media");
+Object.defineProperty(exports, "renderMedia", { enumerable: true, get: function () { return render_media_2.renderMedia; } });
+var render_still_2 = require("./render-still");
+Object.defineProperty(exports, "renderStill", { enumerable: true, get: function () { return render_still_2.renderStill; } });
+var select_composition_2 = require("./select-composition");
+Object.defineProperty(exports, "selectComposition", { enumerable: true, get: function () { return select_composition_2.selectComposition; } });
+var stitch_frames_to_video_1 = require("./stitch-frames-to-video");
+Object.defineProperty(exports, "stitchFramesToVideo", { enumerable: true, get: function () { return stitch_frames_to_video_1.stitchFramesToVideo; } });
 var validate_output_filename_1 = require("./validate-output-filename");
 Object.defineProperty(exports, "validateOutputFilename", { enumerable: true, get: function () { return validate_output_filename_1.validateOutputFilename; } });
 exports.RenderInternals = {
     ensureLocalBrowser: get_local_browser_executable_1.ensureLocalBrowser,
-    ffmpegHasFeature: ffmpeg_flags_1.ffmpegHasFeature,
     getActualConcurrency: get_concurrency_1.getActualConcurrency,
-    getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
-    validateFfmpeg: validate_ffmpeg_1.validateFfmpeg,
-    binaryExists: validate_ffmpeg_1.binaryExists,
-    getFfmpegBuildInfo: ffmpeg_flags_1.getFfmpegBuildInfo,
     serveStatic: serve_static_1.serveStatic,
     validateEvenDimensionsWithCodec: validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec,
-    normalizeServeUrl: normalize_serve_url_1.normalizeServeUrl,
-    spawnFfmpeg: stitch_frames_to_video_1.spawnFfmpeg,
     getFileExtensionFromCodec: get_extension_from_codec_1.getFileExtensionFromCodec,
     tmpDir: tmp_dir_1.tmpDir,
     deleteDirectory: delete_directory_1.deleteDirectory,
@@ -118,7 +117,6 @@ exports.RenderInternals = {
     getRealFrameRange: get_frame_to_render_1.getRealFrameRange,
     validatePuppeteerTimeout: validate_puppeteer_timeout_1.validatePuppeteerTimeout,
     downloadFile: download_file_1.downloadFile,
-    validateScale: validate_scale_1.validateScale,
     killAllBrowsers: open_browser_1.killAllBrowsers,
     parseStack: parse_browser_error_stack_1.parseStack,
     symbolicateError: symbolicate_error_1.symbolicateError,
@@ -139,28 +137,52 @@ exports.RenderInternals = {
     validateFrameRange: frame_range_1.validateFrameRange,
     DEFAULT_OPENGL_RENDERER: validate_opengl_renderer_1.DEFAULT_OPENGL_RENDERER,
     validateOpenGlRenderer: validate_opengl_renderer_1.validateOpenGlRenderer,
-    getDefaultCrfForCodec: crf_1.getDefaultCrfForCodec,
-    validateSelectedCrfAndCodecCombination: crf_1.validateSelectedCrfAndCodecCombination,
-    validImageFormats: image_format_1.validImageFormats,
     validCodecs: codec_1.validCodecs,
     DEFAULT_PIXEL_FORMAT: pixel_format_1.DEFAULT_PIXEL_FORMAT,
-    validateQuality: quality_1.validateQuality,
-    validateFrame: validate_frame_1.validateFrame,
+    validateJpegQuality: jpeg_quality_1.validateJpegQuality,
     DEFAULT_TIMEOUT: TimeoutSettings_1.DEFAULT_TIMEOUT,
-    getValidCrfRanges: crf_1.getValidCrfRanges,
-    validateSelectedPixelFormatAndCodecCombination: pixel_format_1.validateSelectedPixelFormatAndCodecCombination,
-    validateSelectedCodecAndProResCombination: prores_profile_1.validateSelectedCodecAndProResCombination,
-    validateSelectedPixelFormatAndImageFormatCombination: image_format_1.validateSelectedPixelFormatAndImageFormatCombination,
     DEFAULT_CODEC: codec_1.DEFAULT_CODEC,
     isAudioCodec: is_audio_codec_1.isAudioCodec,
     logLevels: log_level_1.logLevels,
     isEqualOrBelowLogLevel: log_level_1.isEqualOrBelowLogLevel,
     isValidLogLevel: log_level_1.isValidLogLevel,
-    validateEveryNthFrame: validate_every_nth_frame_1.validateEveryNthFrame,
     perf,
-    makeDownloadMap: download_map_1.makeDownloadMap,
-    cleanDownloadMap: download_map_1.cleanDownloadMap,
     convertToPositiveFrameIndex: convert_to_positive_frame_index_1.convertToPositiveFrameIndex,
+    findRemotionRoot: find_closest_package_json_1.findRemotionRoot,
+    validateBitrate: validate_videobitrate_1.validateBitrate,
+    combineVideos: combine_videos_1.combineVideos,
+    getMinConcurrency: validate_concurrency_1.getMinConcurrency,
+    getMaxConcurrency: validate_concurrency_1.getMaxConcurrency,
+    getDefaultAudioCodec: audio_codec_1.getDefaultAudioCodec,
+    validAudioCodecs: audio_codec_1.validAudioCodecs,
+    defaultFileExtensionMap: file_extensions_1.defaultFileExtensionMap,
+    supportedAudioCodecs: audio_codec_1.supportedAudioCodecs,
+    makeFileExtensionMap: get_extension_from_codec_1.makeFileExtensionMap,
+    defaultCodecsForFileExtension: get_extension_from_codec_1.defaultCodecsForFileExtension,
+    getExecutablePath: get_executable_path_1.getExecutablePath,
+    callFf: call_ffmpeg_1.callFf,
+    dynamicLibraryPathOptions: call_ffmpeg_1.dynamicLibraryPathOptions,
+    validStillImageFormats: image_format_1.validStillImageFormats,
+    validVideoImageFormats: image_format_1.validVideoImageFormats,
+    DEFAULT_STILL_IMAGE_FORMAT: image_format_1.DEFAULT_STILL_IMAGE_FORMAT,
+    DEFAULT_VIDEO_IMAGE_FORMAT: image_format_1.DEFAULT_VIDEO_IMAGE_FORMAT,
+    DEFAULT_JPEG_QUALITY: jpeg_quality_1.DEFAULT_JPEG_QUALITY,
+    chalk: chalk_1.chalk,
+    Log: logger_1.Log,
+    getLogLevel: logger_1.getLogLevel,
+    setLogLevel: logger_1.setLogLevel,
+    INDENT_TOKEN: logger_1.INDENT_TOKEN,
+    isColorSupported: is_color_supported_1.isColorSupported,
+    HeadlessBrowser: Browser_1.HeadlessBrowser,
+    prepareServer: prepare_server_1.prepareServer,
+    makeOrReuseServer: prepare_server_1.makeOrReuseServer,
+    internalRenderStill: render_still_1.internalRenderStill,
+    internalOpenBrowser: open_browser_1.internalOpenBrowser,
+    internalSelectComposition: select_composition_1.internalSelectComposition,
+    internalGetCompositions: get_compositions_1.internalGetCompositions,
+    internalRenderFrames: render_frames_1.internalRenderFrames,
+    internalRenderMedia: render_media_1.internalRenderMedia,
+    validOpenGlRenderers: validate_opengl_renderer_1.validOpenGlRenderers,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
-(0, check_apple_silicon_1.warnIfAppleSiliconIsNotUsingArm64Architecture)();
+(0, check_apple_silicon_1.checkNodeVersionAndWarnAboutRosetta)();

package/dist/jpeg-quality.d.ts

@@ -0,0 +1,2 @@
+export declare const DEFAULT_JPEG_QUALITY = 80;
+export declare const validateJpegQuality: (q: number | undefined) => void;

package/dist/jpeg-quality.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateJpegQuality = exports.DEFAULT_JPEG_QUALITY = void 0;
+exports.DEFAULT_JPEG_QUALITY = 80;
+const validateJpegQuality = (q) => {
+    if (typeof q !== 'undefined' && typeof q !== 'number') {
+        throw new Error(`JPEG Quality option must be a number or undefined. Got ${typeof q} (${JSON.stringify(q)})`);
+    }
+    if (typeof q === 'undefined') {
+        return;
+    }
+    if (!Number.isFinite(q)) {
+        throw new RangeError(`JPEG Quality must be a finite number, but is ${q}`);
+    }
+    if (Number.isNaN(q)) {
+        throw new RangeError(`JPEG Quality is NaN, but must be a real number`);
+    }
+    if (q > 100 || q < 0) {
+        throw new RangeError('JPEG Quality option must be between 0 and 100.');
+    }
+};
+exports.validateJpegQuality = validateJpegQuality;

package/dist/locks.d.ts

@@ -0,0 +1,7 @@
+export declare const createLock: ({ timeout }: {
+    timeout: number | null;
+}) => {
+    lock: () => number;
+    unlock: (id: number) => void;
+    waitForAllToBeDone: () => Promise<unknown>;
+};

package/dist/locks.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLock = void 0;
+const createLock = ({ timeout }) => {
+    let locks = [];
+    const waiters = [];
+    const lock = () => {
+        const id = Math.random();
+        locks.push(id);
+        return id;
+    };
+    const unlock = (id) => {
+        locks = locks.filter((l) => l !== id);
+        resolveWaiters();
+    };
+    const resolveWaiters = () => {
+        if (locks.length === 0) {
+            waiters.forEach((w) => w());
+        }
+    };
+    const waitForAllToBeDone = () => {
+        const success = new Promise((resolve) => {
+            waiters.push(() => {
+                resolve();
+            });
+        });
+        resolveWaiters();
+        if (timeout === null) {
+            return success;
+        }
+        const timeoutFn = new Promise((resolve) => {
+            setTimeout(() => {
+                return resolve();
+            }, timeout);
+        });
+        return Promise.race([success, timeoutFn]);
+    };
+    return {
+        lock,
+        unlock,
+        waitForAllToBeDone,
+    };
+};
+exports.createLock = createLock;

package/dist/log-level.d.ts

@@ -1,4 +1,4 @@
 export declare const logLevels: readonly ["verbose", "info", "warn", "error"];
-export declare type LogLevel = typeof logLevels[number];
+export type LogLevel = typeof logLevels[number];
 export declare const isValidLogLevel: (level: string) => boolean;
 export declare const isEqualOrBelowLogLevel: (currentLevel: LogLevel, level: LogLevel) => boolean;

package/dist/logger.d.ts

@@ -0,0 +1,24 @@
+import type { LogLevel } from './log-level';
+export declare const INDENT_TOKEN: string;
+type LogOptions = {
+    indent: boolean;
+    logLevel: LogLevel;
+};
+type VerboseLogOptions = LogOptions & {
+    tag?: string;
+    secondTag?: string;
+};
+export declare const verboseTag: (str: string) => string;
+export declare const secondverboseTag: (str: string) => string;
+export declare const Log: {
+    verbose: (message?: any, ...optionalParams: any[]) => void;
+    verboseAdvanced: (options: VerboseLogOptions, message?: any, ...optionalParams: any[]) => void;
+    info: (message?: any, ...optionalParams: any[]) => void;
+    infoAdvanced: (options: LogOptions, message?: any, ...optionalParams: any[]) => void;
+    warn: (message?: any, ...optionalParams: any[]) => void;
+    warnAdvanced: (options: LogOptions, message?: any, ...optionalParams: any[]) => void;
+    error: (message?: any, ...optionalParams: any[]) => void;
+};
+export declare const getLogLevel: () => "error" | "verbose" | "info" | "warn";
+export declare const setLogLevel: (newLogLevel: LogLevel) => void;
+export {};

package/dist/logger.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setLogLevel = exports.getLogLevel = exports.Log = exports.secondverboseTag = exports.verboseTag = exports.INDENT_TOKEN = void 0;
+const chalk_1 = require("./chalk");
+const is_color_supported_1 = require("./chalk/is-color-supported");
+const log_level_1 = require("./log-level");
+const truthy_1 = require("./truthy");
+exports.INDENT_TOKEN = chalk_1.chalk.gray('│');
+const verboseTag = (str) => {
+    return is_color_supported_1.isColorSupported ? chalk_1.chalk.bgBlack(` ${str} `) : `[${str}]`;
+};
+exports.verboseTag = verboseTag;
+const secondverboseTag = (str) => {
+    return is_color_supported_1.isColorSupported ? chalk_1.chalk.bgWhite(` ${str} `) : `[${str}]`;
+};
+exports.secondverboseTag = secondverboseTag;
+exports.Log = {
+    verbose: (...args) => {
+        exports.Log.verboseAdvanced({ indent: false, logLevel: (0, exports.getLogLevel)() }, ...args);
+    },
+    verboseAdvanced: (options, ...args) => {
+        if ((0, log_level_1.isEqualOrBelowLogLevel)(options.logLevel, 'verbose')) {
+            return console.log(...[
+                options.indent ? exports.INDENT_TOKEN : null,
+                [
+                    options.tag ? (0, exports.verboseTag)(options.tag) : null,
+                    options.secondTag ? (0, exports.secondverboseTag)(options.secondTag) : null,
+                ]
+                    .filter(truthy_1.truthy)
+                    .join(''),
+                ...args.map((a) => chalk_1.chalk.gray(a)),
+            ].filter(truthy_1.truthy));
+        }
+    },
+    info: (...args) => {
+        exports.Log.infoAdvanced({ indent: false, logLevel: (0, exports.getLogLevel)() }, ...args);
+    },
+    infoAdvanced: (options, ...args) => {
+        if ((0, log_level_1.isEqualOrBelowLogLevel)(options.logLevel, 'info')) {
+            return console.log(...[options.indent ? exports.INDENT_TOKEN : null, ...args].filter(truthy_1.truthy));
+        }
+    },
+    warn: (...args) => {
+        exports.Log.warnAdvanced({ indent: false, logLevel: (0, exports.getLogLevel)() }, ...args);
+    },
+    warnAdvanced: (options, ...args) => {
+        if ((0, log_level_1.isEqualOrBelowLogLevel)(options.logLevel, 'warn')) {
+            return console.warn(...[
+                options.indent ? chalk_1.chalk.yellow(exports.INDENT_TOKEN) : null,
+                ...args.map((a) => chalk_1.chalk.yellow(a)),
+            ].filter(truthy_1.truthy));
+        }
+    },
+    error: (...args) => {
+        if ((0, log_level_1.isEqualOrBelowLogLevel)((0, exports.getLogLevel)(), 'error')) {
+            return console.error(...args.map((a) => chalk_1.chalk.red(a)));
+        }
+    },
+};
+let logLevel = 'info';
+const getLogLevel = () => {
+    return logLevel;
+};
+exports.getLogLevel = getLogLevel;
+const setLogLevel = (newLogLevel) => {
+    logLevel = newLogLevel;
+};
+exports.setLogLevel = setLogLevel;

package/dist/make-cancel-signal.d.ts

@@ -1,7 +1,18 @@
-declare type Callback = () => void;
-export declare type CancelSignal = (callback: Callback) => void;
+type Callback = () => void;
+export type CancelSignal = (callback: Callback) => void;
+/**
+ * @description Returns a signal and a cancel function that allows to you cancel a render triggered using renderMedia(), renderStill(), renderFrames() or stitchFramesToVideo().
+ * @see [Documentation](https://www.remotion.dev/docs/renderer/make-cancel-signal)
+ */
 export declare const makeCancelSignal: () => {
     cancelSignal: CancelSignal;
     cancel: () => void;
 };
+export declare const cancelErrorMessages: {
+    renderMedia: string;
+    renderFrames: string;
+    renderStill: string;
+    stitchFramesToVideo: string;
+};
+export declare const isUserCancelledRender: (err: unknown) => boolean;
 export {};

package/dist/make-cancel-signal.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCancelSignal = void 0;
+exports.isUserCancelledRender = exports.cancelErrorMessages = exports.makeCancelSignal = void 0;
+/**
+ * @description Returns a signal and a cancel function that allows to you cancel a render triggered using renderMedia(), renderStill(), renderFrames() or stitchFramesToVideo().
+ * @see [Documentation](https://www.remotion.dev/docs/renderer/make-cancel-signal)
+ */
 const makeCancelSignal = () => {
     const callbacks = [];
     let cancelled = false;
@@ -23,3 +27,22 @@ const makeCancelSignal = () => {
     };
 };
 exports.makeCancelSignal = makeCancelSignal;
+exports.cancelErrorMessages = {
+    renderMedia: 'renderMedia() got cancelled',
+    renderFrames: 'renderFrames() got cancelled',
+    renderStill: 'renderStill() got cancelled',
+    stitchFramesToVideo: 'stitchFramesToVideo() got cancelled',
+};
+const isUserCancelledRender = (err) => {
+    if (typeof err === 'object' &&
+        err !== null &&
+        'message' in err &&
+        typeof err.message === 'string') {
+        return (err.message.includes(exports.cancelErrorMessages.renderMedia) ||
+            err.message.includes(exports.cancelErrorMessages.renderFrames) ||
+            err.message.includes(exports.cancelErrorMessages.renderStill) ||
+            err.message.includes(exports.cancelErrorMessages.stitchFramesToVideo));
+    }
+    return false;
+};
+exports.isUserCancelledRender = isUserCancelledRender;

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

@@ -1,11 +1,11 @@
 import type { DownloadMap } from './assets/download-map';
-import type { FfmpegExecutable } from './ffmpeg-executable';
-declare type Options = {
-    ffmpegExecutable: FfmpegExecutable;
-    files: string[];
+import type { PreprocessedAudioTrack } from './preprocess-audio-track';
+type Options = {
+    files: PreprocessedAudioTrack[];
     outName: string;
     numberOfSeconds: number;
     downloadMap: DownloadMap;
+    remotionRoot: string;
 };
 export declare const mergeAudioTrack: (options: Options) => Promise<void>;
 export {};

package/dist/merge-audio-track.js

@@ -4,69 +4,74 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeAudioTrack = void 0;
-const execa_1 = __importDefault(require("execa"));
-const path_1 = __importDefault(require("path"));
+const node_path_1 = __importDefault(require("node:path"));
+const call_ffmpeg_1 = require("./call-ffmpeg");
 const chunk_1 = require("./chunk");
-const convert_to_pcm_1 = require("./convert-to-pcm");
 const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
+const create_ffmpeg_merge_filter_1 = require("./create-ffmpeg-merge-filter");
 const create_silent_audio_1 = require("./create-silent-audio");
 const delete_directory_1 = require("./delete-directory");
 const p_limit_1 = require("./p-limit");
 const tmp_dir_1 = require("./tmp-dir");
 const truthy_1 = require("./truthy");
-const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, downloadMap, }) => {
+const mergeAudioTrackUnlimited = async ({ outName, files, numberOfSeconds, downloadMap, remotionRoot, }) => {
     if (files.length === 0) {
         await (0, create_silent_audio_1.createSilentAudio)({
             outName,
-            ffmpegExecutable,
             numberOfSeconds,
         });
         return;
     }
-    if (files.length === 1) {
-        await (0, convert_to_pcm_1.convertToPcm)({
-            outName,
-            ffmpegExecutable,
-            input: files[0],
-        });
-        return;
-    }
+    // Previously a bug: We cannot optimize for files.length === 1 because we need to pad the audio
     // In FFMPEG, the total number of left and right tracks that can be merged at one time is limited to 64
     if (files.length >= 32) {
         const chunked = (0, chunk_1.chunk)(files, 10);
         const tempPath = (0, tmp_dir_1.tmpDir)('remotion-large-audio-mixing');
-        const chunkNames = await Promise.all(chunked.map(async (chunkFiles, i) => {
-            const chunkOutname = path_1.default.join(tempPath, `chunk-${i}.wav`);
+        try {
+            const chunkNames = await Promise.all(chunked.map(async (chunkFiles, i) => {
+                const chunkOutname = node_path_1.default.join(tempPath, `chunk-${i}.wav`);
+                await (0, exports.mergeAudioTrack)({
+                    files: chunkFiles,
+                    numberOfSeconds,
+                    outName: chunkOutname,
+                    downloadMap,
+                    remotionRoot,
+                });
+                return chunkOutname;
+            }));
             await (0, exports.mergeAudioTrack)({
-                ffmpegExecutable,
-                files: chunkFiles,
+                files: chunkNames.map((c) => ({
+                    filter: {
+                        pad_end: null,
+                        pad_start: null,
+                    },
+                    outName: c,
+                })),
                 numberOfSeconds,
-                outName: chunkOutname,
+                outName,
                 downloadMap,
+                remotionRoot,
             });
-            return chunkOutname;
-        }));
-        await (0, exports.mergeAudioTrack)({
-            ffmpegExecutable,
-            files: chunkNames,
-            numberOfSeconds,
-            outName,
-            downloadMap,
-        });
-        await (0, delete_directory_1.deleteDirectory)(tempPath);
-        return;
+            return;
+        }
+        finally {
+            (0, delete_directory_1.deleteDirectory)(tempPath);
+        }
     }
-    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length, downloadMap);
+    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)({
+        filters: files,
+        downloadMap,
+    });
     const args = [
-        ...files.map((f) => ['-i', f]),
+        ...files.map((f) => ['-i', f.outName]),
         mergeFilter,
         ['-c:a', 'pcm_s16le'],
-        ['-map', '[a]'],
+        ['-map', `[${create_ffmpeg_merge_filter_1.OUTPUT_FILTER_NAME}]`],
         ['-y', outName],
     ]
         .filter(truthy_1.truthy)
         .flat(2);
-    const task = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', args);
+    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', args);
     await task;
     cleanup();
 };

package/dist/mime-types.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mimeContentType = exports.mimeLookup = exports.getExt = void 0;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const mime_db_1 = require("./mime-db");
 const extensions = {};
 const types = {};
@@ -17,7 +17,7 @@ function mimeLookup(path) {
         return false;
     }
     // get the extension ("ext" or ".ext" or full path)
-    const ext = (0, path_1.extname)('.' + path)
+    const ext = (0, node_path_1.extname)('.' + path)
         .toLowerCase()
         .substr(1);
     if (!ext) {
@@ -36,7 +36,7 @@ function populateMaps(exts, _types) {
     Object.keys(mime_db_1.mimeDb).forEach((type) => {
         const mime = mime_db_1.mimeDb[type];
         const _exts = mime.extensions;
-        if (!_exts || !_exts.length) {
+        if (!(_exts === null || _exts === void 0 ? void 0 : _exts.length)) {
             return;
         }
         // mime -> extensions