@remotion/renderer 4.0.533 → 4.0.535

package/dist/client.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BrowserSafeApis = exports.defaultEditorIds = exports.customEditorTargetPathPlaceholder = exports.customEditorLineNumberPlaceholder = exports.customEditorColumnNumberPlaceholder = exports.defaultCodingAgentIds = void 0;
 const no_react_1 = require("remotion/no-react");
 const TimeoutSettings_1 = require("./browser/TimeoutSettings");
+const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
 const codec_1 = require("./codec");
 const codec_supports_media_1 = require("./codec-supports-media");
 const crf_1 = require("./crf");
@@ -31,6 +32,7 @@ Object.defineProperty(exports, "customEditorLineNumberPlaceholder", { enumerable
 Object.defineProperty(exports, "customEditorTargetPathPlaceholder", { enumerable: true, get: function () { return default_editor_1.customEditorTargetPathPlaceholder; } });
 Object.defineProperty(exports, "defaultEditorIds", { enumerable: true, get: function () { return default_editor_1.defaultEditorIds; } });
 exports.BrowserSafeApis = {
+    canUseParallelEncoding: can_use_parallel_encoding_1.canUseParallelEncoding,
     getExtensionOfFilename: get_extension_of_filename_1.getExtensionOfFilename,
     getFileExtensionFromCodec: get_extension_from_codec_1.getFileExtensionFromCodec,
     validCodecs: codec_1.validCodecs,

package/dist/combine-chunks.d.ts

@@ -32,8 +32,9 @@ type OptionalCombineChunksOptions = {
     sampleRate: number;
 };
 export type CombineChunksOptions = MandatoryCombineChunksOptions & Partial<OptionalCombineChunksOptions>;
-export declare const internalCombineChunks: ({ outputLocation: output, onProgress, codec, fps, numberOfGifLoops, audioBitrate, indent, logLevel, binariesDirectory, cancelSignal, metadata, audioFiles, videoFiles, framesPerChunk, audioCodec, preferLossless, everyNthFrame, frameRange, compositionDurationInFrames, sampleRate, }: MandatoryCombineChunksOptions & OptionalCombineChunksOptions & {
+export declare const internalCombineChunks: ({ outputLocation: output, onProgress, codec, fps, numberOfGifLoops, audioBitrate, indent, logLevel, binariesDirectory, cancelSignal, metadata, audioFiles, videoFiles, framesPerChunk, audioCodec, preferLossless, everyNthFrame, frameRange, compositionDurationInFrames, sampleRate, separateAudioTo, }: MandatoryCombineChunksOptions & OptionalCombineChunksOptions & {
     indent: boolean;
+    separateAudioTo: string | null;
 }) => Promise<void>;
 export declare const combineChunks: (options: CombineChunksOptions) => Promise<void>;
 export {};

package/dist/combine-chunks.js

@@ -10,7 +10,9 @@ const combine_video_streams_1 = require("./combine-video-streams");
 const combine_video_streams_seamlessly_1 = require("./combine-video-streams-seamlessly");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
+const get_extension_of_filename_1 = require("./get-extension-of-filename");
 const get_frame_to_render_1 = require("./get-frame-to-render");
+const get_mp4_brand_1 = require("./get-mp4-brand");
 const is_audio_codec_1 = require("./is-audio-codec");
 const logger_1 = require("./logger");
 const mux_video_and_audio_1 = require("./mux-video-and-audio");
@@ -19,23 +21,28 @@ const tmp_dir_1 = require("./tmp-dir");
 const truthy_1 = require("./truthy");
 const validate_number_of_gif_loops_1 = require("./validate-number-of-gif-loops");
 const REMOTION_FILELIST_TOKEN = 'remotion-filelist';
-const internalCombineChunks = async ({ outputLocation: output, onProgress, codec, fps, numberOfGifLoops, audioBitrate, indent, logLevel, binariesDirectory, cancelSignal, metadata, audioFiles, videoFiles, framesPerChunk, audioCodec, preferLossless, everyNthFrame, frameRange, compositionDurationInFrames, sampleRate, }) => {
+const internalCombineChunks = async ({ outputLocation: output, onProgress, codec, fps, numberOfGifLoops, audioBitrate, indent, logLevel, binariesDirectory, cancelSignal, metadata, audioFiles, videoFiles, framesPerChunk, audioCodec, preferLossless, everyNthFrame, frameRange, compositionDurationInFrames, sampleRate, separateAudioTo, }) => {
+    var _a;
+    var _b;
     (0, validate_number_of_gif_loops_1.validateNumberOfGifLoops)(numberOfGifLoops, codec);
-    const filelistDir = (0, tmp_dir_1.tmpDir)(REMOTION_FILELIST_TOKEN);
     const shouldCreateVideo = !(0, is_audio_codec_1.isAudioCodec)(codec);
     const resolvedAudioCodec = (0, audio_codec_1.resolveAudioCodec)({
         setting: audioCodec,
         codec,
         preferLossless,
-        separateAudioTo: null,
+        separateAudioTo,
     });
     const shouldCreateAudio = resolvedAudioCodec !== null && audioFiles.length > 0;
+    if (separateAudioTo !== null && (!shouldCreateAudio || !shouldCreateVideo)) {
+        throw new Error('Separate audio requires a video render with audio chunks.');
+    }
     const seamlessVideo = (0, can_concat_seamlessly_1.canConcatVideoSeamlessly)(codec);
     const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(compositionDurationInFrames, frameRange);
     const seamlessAudio = (0, can_concat_seamlessly_1.canConcatAudioSeamlessly)(resolvedAudioCodec, framesPerChunk);
     const numberOfFrames = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame).length;
+    const filelistDir = (0, tmp_dir_1.tmpDir)(REMOTION_FILELIST_TOKEN);
     const videoOutput = shouldCreateVideo
-        ? (0, node_path_1.join)(filelistDir, `video.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, resolvedAudioCodec)}`)
+        ? (0, node_path_1.join)(filelistDir, `video.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, separateAudioTo === null ? resolvedAudioCodec : null)}`)
         : null;
     const audioOutput = shouldCreateAudio
         ? (0, node_path_1.join)(filelistDir, `audio.${(0, audio_codec_1.getExtensionFromAudioCodec)(resolvedAudioCodec)}`)
@@ -63,52 +70,52 @@ const internalCombineChunks = async ({ outputLocation: output, onProgress, codec
         : seamlessVideo
             ? 'seamlessly'
             : 'normally'}`);
-    await Promise.all([
-        shouldCreateAudio && audioOutput
-            ? (0, combine_audio_1.createCombinedAudio)({
-                audioBitrate,
-                filelistDir,
-                files: audioFiles,
-                indent,
-                logLevel,
-                output: audioOutput,
-                resolvedAudioCodec,
-                seamless: seamlessAudio,
-                chunkDurationInSeconds,
-                addRemotionMetadata: !shouldCreateVideo,
-                binariesDirectory,
-                fps,
-                cancelSignal,
-                onProgress: (frames) => {
-                    concatenatedAudio = frames;
-                    updateProgress();
-                },
-                sampleRate,
-            })
-            : null,
-        shouldCreateVideo && !seamlessVideo && videoOutput
-            ? (0, combine_video_streams_1.combineVideoStreams)({
-                codec,
-                filelistDir,
-                fps,
-                indent,
-                logLevel,
-                numberOfGifLoops,
-                output: videoOutput,
-                files: videoFiles,
-                addRemotionMetadata: !shouldCreateAudio,
-                binariesDirectory,
-                cancelSignal,
-                onProgress: (frames) => {
-                    concatenatedVideo = frames;
-                    updateProgress();
-                },
-            })
-            : null,
-    ].filter(truthy_1.truthy));
     try {
+        await Promise.all([
+            shouldCreateAudio && audioOutput
+                ? (0, combine_audio_1.createCombinedAudio)({
+                    audioBitrate,
+                    filelistDir,
+                    files: audioFiles,
+                    indent,
+                    logLevel,
+                    output: audioOutput,
+                    resolvedAudioCodec,
+                    seamless: seamlessAudio,
+                    chunkDurationInSeconds,
+                    addRemotionMetadata: !shouldCreateVideo,
+                    binariesDirectory,
+                    fps,
+                    cancelSignal,
+                    onProgress: (frames) => {
+                        concatenatedAudio = frames;
+                        updateProgress();
+                    },
+                    sampleRate,
+                })
+                : null,
+            shouldCreateVideo && !seamlessVideo && videoOutput
+                ? (0, combine_video_streams_1.combineVideoStreams)({
+                    codec,
+                    filelistDir,
+                    fps,
+                    indent,
+                    logLevel,
+                    numberOfGifLoops,
+                    output: videoOutput,
+                    files: videoFiles,
+                    addRemotionMetadata: !shouldCreateAudio,
+                    binariesDirectory,
+                    cancelSignal,
+                    onProgress: (frames) => {
+                        concatenatedVideo = frames;
+                        updateProgress();
+                    },
+                })
+                : null,
+        ].filter(truthy_1.truthy));
         await (0, mux_video_and_audio_1.muxVideoAndAudio)({
-            audioOutput,
+            audioOutput: separateAudioTo === null ? audioOutput : null,
             indent,
             logLevel,
             onProgress: (frames) => {
@@ -127,12 +134,33 @@ const internalCombineChunks = async ({ outputLocation: output, onProgress, codec
             audioCodec: resolvedAudioCodec,
             sampleRate,
         });
+        if (separateAudioTo !== null && audioOutput !== null) {
+            const extension = (_b = (_a = (0, get_extension_of_filename_1.getExtensionOfFilename)(separateAudioTo)) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : null;
+            if ((0, get_mp4_brand_1.getMp4BrandForExtension)(extension)) {
+                await (0, mux_video_and_audio_1.muxVideoAndAudio)({
+                    videoOutput: null,
+                    audioOutput,
+                    output: separateAudioTo,
+                    indent,
+                    logLevel,
+                    onProgress: () => undefined,
+                    binariesDirectory,
+                    fps,
+                    cancelSignal,
+                    metadata: null,
+                    numberOfGifLoops: null,
+                    audioCodec: resolvedAudioCodec,
+                    sampleRate,
+                });
+            }
+            else {
+                (0, node_fs_1.copyFileSync)(audioOutput, separateAudioTo);
+            }
+        }
         onProgress({ totalProgress: 1, frames: numberOfFrames });
-        (0, node_fs_1.rmSync)(filelistDir, { recursive: true });
     }
-    catch (err) {
-        (0, node_fs_1.rmSync)(filelistDir, { recursive: true });
-        throw err;
+    finally {
+        (0, node_fs_1.rmSync)(filelistDir, { recursive: true, force: true });
     }
 };
 exports.internalCombineChunks = internalCombineChunks;
@@ -159,6 +187,7 @@ const combineChunks = (options) => {
         frameRange: (_j = options.frameRange) !== null && _j !== void 0 ? _j : null,
         compositionDurationInFrames: options.compositionDurationInFrames,
         sampleRate: (_k = options.sampleRate) !== null && _k !== void 0 ? _k : 48000,
+        separateAudioTo: null,
     });
 };
 exports.combineChunks = combineChunks;

package/dist/combine-video-streams.js

@@ -34,6 +34,9 @@ const combineVideoStreams = async ({ fps, codec, filelistDir, numberOfGifLoops,
         '-an',
         '-c:v',
         encoder,
+        // Keep the MP4/MOV video time base consistent with the initial encoding.
+        '-video_track_timescale',
+        '90000',
         codec === 'h265' ? '-tag:v' : null,
         codec === 'h265' ? 'hvc1' : null,
         addRemotionMetadata ? `-metadata` : null,

package/dist/compositor/get-executable-path.js

@@ -8,27 +8,42 @@ exports.getExecutableDir = exports.getExecutablePath = void 0;
 exports.isMusl = isMusl;
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("../logger");
-let warned = false;
+let cachedIsMusl = null;
 function isMusl({ indent, logLevel, }) {
-    var _a;
+    if (cachedIsMusl !== null) {
+        return cachedIsMusl;
+    }
     if (!process.report && typeof Bun !== 'undefined') {
-        if (!warned) {
-            logger_1.Log.warn({ indent, logLevel }, 'Bun limitation: Could not determine if your Linux is using musl or glibc. Assuming glibc.');
-        }
-        warned = true;
-        return false;
+        logger_1.Log.warn({ indent, logLevel }, 'Bun limitation: Could not determine if your Linux is using musl or glibc. Assuming glibc.');
+        cachedIsMusl = false;
+        return cachedIsMusl;
     }
-    const report = (_a = process.report) === null || _a === void 0 ? void 0 : _a.getReport();
-    if (report && typeof report === 'string') {
-        if (!warned) {
+    const processReport = process.report;
+    const excludeNetwork = processReport && 'excludeNetwork' in processReport
+        ? processReport.excludeNetwork
+        : null;
+    try {
+        // Diagnostic reports can block on reverse DNS lookups for open sockets.
+        // This option is available in Node.js 20.13.0+ and 22.0.0+.
+        if (processReport && 'excludeNetwork' in processReport) {
+            processReport.excludeNetwork = true;
+        }
+        const report = processReport === null || processReport === void 0 ? void 0 : processReport.getReport();
+        if (report && typeof report === 'string') {
             logger_1.Log.warn({ indent, logLevel }, 'Bun limitation: Could not determine if your Windows is using musl or glibc. Assuming glibc.');
+            cachedIsMusl = false;
+            return cachedIsMusl;
+        }
+        // @ts-expect-error no types
+        const { glibcVersionRuntime } = report.header;
+        cachedIsMusl = !glibcVersionRuntime;
+        return cachedIsMusl;
+    }
+    finally {
+        if (processReport && 'excludeNetwork' in processReport) {
+            processReport.excludeNetwork = excludeNetwork;
         }
-        warned = true;
-        return false;
     }
-    // @ts-expect-error no types
-    const { glibcVersionRuntime } = report.header;
-    return !glibcVersionRuntime;
 }
 const getExecutablePath = ({ indent, logLevel, type, binariesDirectory, }) => {
     const base = binariesDirectory !== null && binariesDirectory !== void 0 ? binariesDirectory : (0, exports.getExecutableDir)(indent, logLevel);

package/dist/cycle-browser-tabs.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cycleBrowserTabs = void 0;
+const flaky_errors_1 = require("./browser/flaky-errors");
 const logger_1 = require("./logger");
 const cycleBrowserTabs = ({ puppeteerInstance, concurrency, logLevel, indent, }) => {
     if (concurrency <= 1) {
@@ -25,7 +26,14 @@ const cycleBrowserTabs = ({ puppeteerInstance, concurrency, logLevel, indent, })
                 if (!(currentPage === null || currentPage === void 0 ? void 0 : currentPage.closed) &&
                     !stopped &&
                     (currentPage === null || currentPage === void 0 ? void 0 : currentPage.url()) !== 'about:blank') {
-                    return currentPage.bringToFront();
+                    return currentPage.bringToFront().catch((err) => {
+                        // The tabs are closed at the end of a render while a
+                        // bringToFront() may still be in flight. Only that case is ignored.
+                        if (stopped && (0, flaky_errors_1.isTargetClosedErr)(err)) {
+                            return;
+                        }
+                        throw err;
+                    });
                 }
             })
                 .catch((err) => logger_1.Log.error({ indent, logLevel }, err))

package/dist/ensure-browser.d.ts

@@ -29,6 +29,7 @@ export declare const ensureBrowser: (options?: Partial<{
     readonly logLevel: {
         cliFlag: "log";
         name: string;
+        addedIn: string;
         ssrName: string;
         description: () => import("react/jsx-runtime").JSX.Element;
         docLink: string;
@@ -46,6 +47,7 @@ export declare const ensureBrowser: (options?: Partial<{
     };
     readonly onBrowserDownload: {
         name: string;
+        addedIn: string;
         cliFlag: "on-browser-download";
         description: () => import("react/jsx-runtime").JSX.Element;
         ssrName: "onBrowserDownload";
@@ -58,6 +60,7 @@ export declare const ensureBrowser: (options?: Partial<{
     readonly chromeMode: {
         cliFlag: "chrome-mode";
         name: string;
+        addedIn: string;
         ssrName: string;
         description: () => import("react/jsx-runtime").JSX.Element;
         docLink: string;

package/dist/ensure-browser.js

@@ -10,18 +10,37 @@ const BrowserFetcher_1 = require("./browser/BrowserFetcher");
 const logger_1 = require("./logger");
 let currentEnsureBrowserOperation = Promise.resolve();
 const internalEnsureBrowserUncapped = async ({ indent, logLevel, browserExecutable, onBrowserDownload, chromeMode, }) => {
-    const status = getBrowserStatus({ browserExecutable, chromeMode });
+    const defaultStatus = getBrowserStatus({
+        browserExecutable,
+        chromeMode,
+        version: null,
+    });
+    if (defaultStatus.type === 'local-puppeteer-browser' ||
+        defaultStatus.type === 'user-defined-path') {
+        return defaultStatus;
+    }
+    const { onProgress, version } = onBrowserDownload({ chromeMode });
+    const status = version
+        ? getBrowserStatus({ browserExecutable, chromeMode, version })
+        : defaultStatus;
+    if (status.type === 'local-puppeteer-browser') {
+        return status;
+    }
     if (status.type === 'version-mismatch') {
+        const expectedVersion = (0, BrowserFetcher_1.getExpectedVersion)({
+            version,
+            chromeMode,
+            platform: (0, BrowserFetcher_1.getPlatform)(),
+        });
         const versionInfo = status.actualVersion
             ? ` (installed: ${status.actualVersion})`
             : '';
-        logger_1.Log.info({ indent, logLevel }, `This version of Remotion uses Chrome version ${BrowserFetcher_1.TESTED_VERSION}, but the installed one differs${versionInfo}. Re-downloading.`);
+        logger_1.Log.info({ indent, logLevel }, `This version of Remotion uses Chrome version ${expectedVersion}, but the installed one differs${versionInfo}. Re-downloading.`);
     }
     if (status.type === 'no-browser' || status.type === 'version-mismatch') {
-        const { onProgress, version } = onBrowserDownload({ chromeMode });
         await (0, BrowserFetcher_1.downloadBrowser)({ indent, logLevel, onProgress, version, chromeMode });
     }
-    const newStatus = getBrowserStatus({ browserExecutable, chromeMode });
+    const newStatus = getBrowserStatus({ browserExecutable, chromeMode, version });
     return newStatus;
 };
 const internalEnsureBrowser = (options) => {
@@ -29,7 +48,7 @@ const internalEnsureBrowser = (options) => {
     return currentEnsureBrowserOperation;
 };
 exports.internalEnsureBrowser = internalEnsureBrowser;
-const getBrowserStatus = ({ browserExecutable, chromeMode, }) => {
+const getBrowserStatus = ({ browserExecutable, chromeMode, version, }) => {
     if (browserExecutable) {
         if (!fs_1.default.existsSync(browserExecutable)) {
             throw new Error(`"browserExecutable" was specified as '${browserExecutable}' but the path doesn't exist. Pass "null" for "browserExecutable" to download a browser automatically.`);
@@ -39,7 +58,12 @@ const getBrowserStatus = ({ browserExecutable, chromeMode, }) => {
     const revision = (0, BrowserFetcher_1.getRevisionInfo)(chromeMode);
     if (revision.local && fs_1.default.existsSync(revision.executablePath)) {
         const actualVersion = (0, BrowserFetcher_1.readVersionFile)(chromeMode);
-        if (actualVersion === BrowserFetcher_1.TESTED_VERSION) {
+        if (actualVersion ===
+            (0, BrowserFetcher_1.getExpectedVersion)({
+                version,
+                chromeMode,
+                platform: (0, BrowserFetcher_1.getPlatform)(),
+            })) {
             return { path: revision.executablePath, type: 'local-puppeteer-browser' };
         }
         return { type: 'version-mismatch', actualVersion };