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

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

@@ -1,38 +1,65 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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 = __importDefault(require("fs"));
-const promises_1 = require("fs/promises");
-const path_1 = __importDefault(require("path"));
+exports.stitchFramesToVideo = exports.internalStitchFramesToVideo = 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 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 get_audio_codec_name_1 = require("./get-audio-codec-name");
+const does_have_m2_bug_1 = require("./does-have-m2-bug");
+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");
 const get_prores_profile_name_1 = require("./get-prores-profile-name");
+const logger_1 = require("./logger");
+const make_cancel_signal_1 = require("./make-cancel-signal");
 const merge_audio_track_1 = require("./merge-audio-track");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const pixel_format_1 = require("./pixel-format");
 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 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 validate_videobitrate_1 = require("./validate-videobitrate");
+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, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, onProgress, downloadMap, remotionRoot, indent, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
@@ -40,18 +67,14 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     });
     (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)(downloadMap);
     const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
-    if (verbose) {
-        console.log('asset positions', assetPositions);
-    }
+    logger_1.Log.verboseAdvanced({ indent, logLevel: verbose ? 'verbose' : 'info', tag: 'audio' }, 'asset positions', JSON.stringify(assetPositions));
     const preprocessProgress = new Array(assetPositions.length).fill(0);
     const updateProgress = () => {
         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,
@@ -62,115 +85,141 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
         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)),
         downloadMap,
+        remotionRoot,
     });
-    (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     onProgress(1);
+    (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     preprocessed.forEach((p) => {
-        (0, delete_directory_1.deleteDirectory)(p);
+        (0, delete_directory_1.deleteDirectory)(p.outName);
     });
     return outName;
 };
-const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-    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;
+const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, verbose, videoBitrate, width, numberOfGifLoops, onProgress, }, remotionRoot) => {
+    var _a;
+    remotion_1.Internals.validateDimension(height, 'height', 'passed to `stitchFramesToVideo()`');
+    remotion_1.Internals.validateDimension(width, 'width', 'passed to `stitchFramesToVideo()`');
     (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
-        width: options.width,
-        height: options.height,
+        width,
+        height,
         codec,
         scale: 1,
     });
-    remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', false);
-    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : (0, crf_1.getDefaultCrfForCodec)(codec);
-    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : pixel_format_1.DEFAULT_PIXEL_FORMAT;
-    await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
+    (0, prores_profile_1.validateSelectedCodecAndProResCombination)({
+        codec,
+        proResProfile,
+    });
+    (0, validate_videobitrate_1.validateBitrate)(audioBitrate, 'audioBitrate');
+    (0, validate_videobitrate_1.validateBitrate)(videoBitrate, 'videoBitrate');
+    remotion_1.Internals.validateFps(fps, 'in `stitchFramesToVideo()`', false);
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
-    const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
-    const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
+    const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, proResProfile);
     const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
-    const supportsCrf = (0, codec_supports_media_1.codecSupportsCrf)(codec);
-    const tempFile = options.outputLocation
-        ? null
-        : path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final')}`);
     const shouldRenderAudio = mediaSupport.audio &&
-        (options.assetsInfo.assets.flat(1).length > 0 ||
-            options.enforceAudioTrack) &&
-        !options.muted;
+        (assetsInfo.assets.flat(1).length > 0 || enforceAudioTrack) &&
+        !muted;
     const shouldRenderVideo = mediaSupport.video;
     if (!shouldRenderAudio && !shouldRenderVideo) {
         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.');
     }
-    if (options.verbose) {
-        console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
-        console.log('[verbose] encoder', encoderName);
-        console.log('[verbose] audioCodec', audioCodecName);
-        console.log('[verbose] pixelFormat', pixelFormat);
-        if (supportsCrf) {
-            console.log('[verbose] crf', crf);
-        }
-        if (options.ffmpegOverride) {
-            console.log('[verbose] ffmpegOverride', options.ffmpegOverride);
-        }
-        console.log('[verbose] codec', codec);
-        console.log('[verbose] shouldRenderAudio', shouldRenderAudio);
-        console.log('[verbose] shouldRenderVideo', shouldRenderVideo);
-        console.log('[verbose] proResProfileName', proResProfileName);
-    }
-    (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
+    // Explanation: https://github.com/remotion-dev/remotion/issues/1647
+    const resolvedAudioCodec = preferLossless
+        ? (0, audio_codec_1.getDefaultAudioCodec)({ codec, preferLossless: true })
+        : audioCodec !== null && audioCodec !== void 0 ? audioCodec : (0, audio_codec_1.getDefaultAudioCodec)({ codec, preferLossless: false });
+    const tempFile = outputLocation
+        ? null
+        : node_path_1.default.join(assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, resolvedAudioCodec)}`);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'encoder', encoderName);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'audioCodec', resolvedAudioCodec);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'pixelFormat', pixelFormat);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'codec', codec);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'shouldRenderAudio', shouldRenderAudio);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'shouldRenderVideo', shouldRenderVideo);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'proResProfileName', proResProfileName);
+    (0, crf_1.validateQualitySettings)({
+        crf,
+        codec,
+        videoBitrate,
+    });
     (0, pixel_format_1.validateSelectedPixelFormatAndCodecCombination)(pixelFormat, codec);
-    const expectedFrames = options.assetsInfo.assets.length;
+    const expectedFrames = assetsInfo.assets.length;
     const updateProgress = (preStitchProgress, muxProgress) => {
-        var _a;
         const totalFrameProgress = 0.5 * preStitchProgress * expectedFrames + muxProgress * 0.5;
-        (_a = options.onProgress) === null || _a === void 0 ? void 0 : _a.call(options, Math.round(totalFrameProgress));
+        onProgress === null || onProgress === void 0 ? void 0 : onProgress(Math.round(totalFrameProgress));
     };
     const audio = shouldRenderAudio
         ? await getAssetsData({
-            assets: options.assetsInfo.assets,
-            onDownload: options.onDownload,
-            fps: options.fps,
+            assets: assetsInfo.assets,
+            onDownload,
+            fps,
             expectedFrames,
-            verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
-            ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
-            ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
+            verbose,
             onProgress: (prog) => updateProgress(prog, 0),
-            downloadMap: options.assetsInfo.downloadMap,
+            downloadMap: assetsInfo.downloadMap,
+            remotionRoot,
+            indent,
         })
         : null;
     if (mediaSupport.audio && !mediaSupport.video) {
-        if (!audioCodecName) {
+        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)('ffmpeg', [
+        const ffmpegTask = (0, call_ffmpeg_1.callFf)('ffmpeg', [
             '-i',
             audio,
             '-c:a',
-            audioCodecName,
+            (0, audio_codec_1.mapAudioCodecToFfmpegAudioCodecName)(resolvedAudioCodec),
             // Set bitrate up to 320k, for aac it might effectively be lower
             '-b:a',
-            '320k',
-            options.force ? '-y' : null,
-            (_j = options.outputLocation) !== null && _j !== void 0 ? _j : tempFile,
+            audioBitrate !== null && audioBitrate !== void 0 ? audioBitrate : '320k',
+            force ? '-y' : null,
+            outputLocation !== null && outputLocation !== void 0 ? outputLocation : tempFile,
         ].filter(remotion_1.Internals.truthy));
-        (_k = options.cancelSignal) === null || _k === void 0 ? void 0 : _k.call(options, () => {
+        cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, expectedFrames);
+        onProgress === null || onProgress === void 0 ? void 0 : onProgress(expectedFrames);
         if (audio) {
-            await (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) {
-                (0, promises_1.readFile)(tempFile)
+                node_fs_1.promises
+                    .readFile(tempFile)
                     .then((f) => {
                     return resolve(f);
                 })
@@ -180,47 +229,49 @@ const spawnFfmpeg = async (options) => {
                 resolve(null);
             }
         });
-        await (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
+        (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames);
         return {
             getLogs: () => '',
             task: Promise.resolve(file),
         };
     }
     const ffmpegArgs = [
-        ['-r', String(options.fps)],
-        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
-            ? [['-i', (_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation]]
+        ...(preEncodedFileLocation
+            ? [['-i', preEncodedFileLocation]]
             : [
+                ['-r', String(fps)],
                 ['-f', 'image2'],
-                ['-s', `${options.width}x${options.height}`],
-                ['-start_number', String(options.assetsInfo.firstFrameIndex)],
-                ['-i', options.assetsInfo.imageSequenceName],
+                ['-s', `${width}x${height}`],
+                ['-start_number', String(assetsInfo.firstFrameIndex)],
+                ['-i', assetsInfo.imageSequenceName],
             ]),
         audio ? ['-i', audio] : null,
-        ((_p = options.numberOfGifLoops) !== null && _p !== void 0 ? _p : null) === null
+        numberOfGifLoops === null
             ? null
-            : [
-                '-loop',
-                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null),
-            ],
+            : ['-loop', (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)(numberOfGifLoops)],
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_r = options.internalOptions) === null || _r === void 0 ? void 0 : _r.preEncodedFileLocation)
+        ...(preEncodedFileLocation
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
-                supportsCrf ? ['-crf', String(crf)] : null,
                 ['-pix_fmt', pixelFormat],
                 // Without explicitly disabling auto-alt-ref,
                 // transparent WebM generation doesn't work
                 pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
-                ['-b:v', '1M'],
+                ...(0, crf_1.validateQualitySettings)({
+                    crf,
+                    videoBitrate,
+                    codec,
+                }),
             ]),
         codec === 'h264' ? ['-movflags', 'faststart'] : null,
-        audioCodecName ? ['-c:a', audioCodecName] : null,
+        resolvedAudioCodec
+            ? ['-c:a', (0, audio_codec_1.mapAudioCodecToFfmpegAudioCodecName)(resolvedAudioCodec)]
+            : null,
         // Set max bitrate up to 1024kbps, will choose lower if that's too much
-        audioCodecName ? ['-b:a', '512K'] : null,
+        resolvedAudioCodec ? ['-b:a', audioBitrate || '512K'] : null,
         // Ignore metadata that may come from remote media
         ['-map_metadata', '-1'],
         [
@@ -228,34 +279,36 @@ const spawnFfmpeg = async (options) => {
             `comment=` +
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
-        options.force ? '-y' : null,
-        (_s = options.outputLocation) !== null && _s !== void 0 ? _s : tempFile,
+        force ? '-y' : null,
+        outputLocation !== null && outputLocation !== void 0 ? outputLocation : tempFile,
     ];
-    if (options.verbose) {
-        console.log('Generated FFMPEG command:');
-        console.log(ffmpegArgs);
-    }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const finalFfmpegString = options.ffmpegOverride
-        ? options.ffmpegOverride({ type: 'stitcher', args: ffmpegString })
+    const finalFfmpegString = ffmpegOverride
+        ? ffmpegOverride({ type: 'stitcher', args: ffmpegString })
         : ffmpegString;
-    if (options.verbose && options.ffmpegOverride) {
-        console.log('Generated final FFMPEG command:');
-        console.log(finalFfmpegString);
-    }
-    const task = (0, execa_1.default)((_t = options.ffmpegExecutable) !== null && _t !== void 0 ? _t : 'ffmpeg', finalFfmpegString, {
-        cwd: options.dir,
+    logger_1.Log.verboseAdvanced({
+        indent: indent !== null && indent !== void 0 ? indent : false,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, 'Generated final FFMPEG command:');
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel: verbose ? 'verbose' : 'info',
+        tag: 'stitchFramesToVideo()',
+    }, finalFfmpegString.join(' '));
+    const task = (0, call_ffmpeg_1.callFf)('ffmpeg', finalFfmpegString, {
+        cwd: dir,
     });
-    (_u = options.cancelSignal) === null || _u === void 0 ? void 0 : _u.call(options, () => {
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_v = task.stderr) === null || _v === void 0 ? void 0 : _v.on('data', (data) => {
+    (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
-        if (options.onProgress) {
+        if (onProgress) {
             const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
             // FFMPEG bug: In some cases, FFMPEG does hang after it is finished with it's job
             // Example repo: https://github.com/JonnyBurger/ffmpeg-repro (access can be given upon request)
@@ -275,17 +328,18 @@ const spawnFfmpeg = async (options) => {
     });
     return {
         task: task.then(() => {
-            (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.audioPreprocessing);
+            (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.audioPreprocessing);
             if (tempFile === null) {
-                (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
+                (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames);
                 return null;
             }
-            return (0, promises_1.readFile)(tempFile)
+            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)(options.assetsInfo.downloadMap.stitchFrames),
+                    (0, delete_directory_1.deleteDirectory)(node_path_1.default.dirname(tempFile)),
+                    (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames),
                 ]);
             })
                 .then(([file]) => file);
@@ -293,9 +347,10 @@ const spawnFfmpeg = async (options) => {
         getLogs: () => ffmpegOutput,
     };
 };
-exports.spawnFfmpeg = spawnFfmpeg;
-const stitchFramesToVideo = async (options) => {
-    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options);
+const internalStitchFramesToVideo = async (options) => {
+    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    (0, does_have_m2_bug_1.warnAboutM2Bug)(options.codec, options.pixelFormat);
+    const { task, getLogs } = await innerStitchFramesToVideo(options, remotionRoot);
     const happyPath = task.catch(() => {
         throw new Error(getLogs());
     });
@@ -304,9 +359,43 @@ const stitchFramesToVideo = async (options) => {
         new Promise((_resolve, reject) => {
             var _a;
             (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
-                reject(new Error('stitchFramesToVideo() got cancelled'));
+                reject(new Error(make_cancel_signal_1.cancelErrorMessages.stitchFramesToVideo));
             });
         }),
     ]);
 };
+exports.internalStitchFramesToVideo = internalStitchFramesToVideo;
+/**
+ * @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)
+ */
+const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, }) => {
+    return (0, exports.internalStitchFramesToVideo)({
+        assetsInfo,
+        audioBitrate: audioBitrate !== null && audioBitrate !== void 0 ? audioBitrate : null,
+        audioCodec: audioCodec !== null && audioCodec !== void 0 ? audioCodec : null,
+        cancelSignal: cancelSignal !== null && cancelSignal !== void 0 ? cancelSignal : null,
+        codec: codec !== null && codec !== void 0 ? codec : codec_1.DEFAULT_CODEC,
+        crf: crf !== null && crf !== void 0 ? crf : null,
+        dir,
+        enforceAudioTrack: enforceAudioTrack !== null && enforceAudioTrack !== void 0 ? enforceAudioTrack : false,
+        ffmpegOverride: ffmpegOverride !== null && ffmpegOverride !== void 0 ? ffmpegOverride : null,
+        force,
+        fps,
+        height,
+        indent: false,
+        muted: muted !== null && muted !== void 0 ? muted : false,
+        numberOfGifLoops: numberOfGifLoops !== null && numberOfGifLoops !== void 0 ? numberOfGifLoops : null,
+        onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : undefined,
+        onProgress,
+        outputLocation: outputLocation !== null && outputLocation !== void 0 ? outputLocation : null,
+        pixelFormat: pixelFormat !== null && pixelFormat !== void 0 ? pixelFormat : pixel_format_1.DEFAULT_PIXEL_FORMAT,
+        proResProfile,
+        verbose: verbose !== null && verbose !== void 0 ? verbose : false,
+        videoBitrate: videoBitrate !== null && videoBitrate !== void 0 ? videoBitrate : null,
+        width,
+        preEncodedFileLocation: null,
+        preferLossless: false,
+    });
+};
 exports.stitchFramesToVideo = stitchFramesToVideo;

package/dist/stringify-ffmpeg-filter.d.ts

@@ -1,5 +1,12 @@
 import type { AssetVolume } from './assets/types';
-export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }: {
+export type FilterWithoutPaddingApplied = ProcessedTrack & {
+    filter: string;
+};
+export type ProcessedTrack = {
+    pad_start: string | null;
+    pad_end: string | null;
+};
+export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, allowAmplificationDuringRender, }: {
     trimLeft: number;
     trimRight: number;
     channels: number;
@@ -9,4 +16,5 @@ export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, st
     durationInFrames: number;
     playbackRate: number;
     assetDuration: number | null;
-}) => string | null;
+    allowAmplificationDuringRender: boolean;
+}) => FilterWithoutPaddingApplied | null;

package/dist/stringify-ffmpeg-filter.js

@@ -5,7 +5,7 @@ const calculate_atempo_1 = require("./assets/calculate-atempo");
 const ffmpeg_volume_expression_1 = require("./assets/ffmpeg-volume-expression");
 const sample_rate_1 = require("./sample-rate");
 const truthy_1 = require("./truthy");
-const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }) => {
+const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, allowAmplificationDuringRender, }) => {
     const startInVideoSeconds = startInVideo / fps;
     if (assetDuration && trimLeft >= assetDuration) {
         return null;
@@ -14,44 +14,47 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
         volume,
         fps,
         trimLeft,
+        allowAmplificationDuringRender,
     });
     // Avoid setting filters if possible, as combining them can create noise
     const chunkLength = durationInFrames / fps;
     const actualTrimRight = assetDuration
         ? Math.min(trimRight, assetDuration)
         : trimRight;
-    const padAtEnd = chunkLength - (actualTrimRight - trimLeft) - startInVideoSeconds;
-    return (`[0:a]` +
-        [
-            `aformat=sample_fmts=s32:sample_rates=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
-            // Order matters! First trim the audio
-            `atrim=${trimLeft.toFixed(6)}:${actualTrimRight.toFixed(6)}`,
-            // then set the tempo
-            (0, calculate_atempo_1.calculateATempo)(playbackRate),
-            // set the volume if needed
-            // The timings for volume must include whatever is in atrim, unless the volume
-            // filter gets applied before atrim
-            volumeFilter.value === '1'
-                ? null
-                : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
-            // For n channels, we delay n + 1 channels.
-            // This is because `ffprobe` for some audio files reports the wrong amount
-            // of channels.
-            // This should be fine because FFMPEG documentation states:
-            // "Unused delays will be silently ignored."
-            // https://ffmpeg.org/ffmpeg-filters.html#adelay
-            startInVideoSeconds === 0
-                ? null
-                : `adelay=${new Array(channels + 1)
-                    .fill((startInVideoSeconds * 1000).toFixed(0))
-                    .join('|')}`,
-            // Only in the end, we pad to the full length.
-            padAtEnd > 0.0000001
-                ? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)
-                : null,
-        ]
-            .filter(truthy_1.truthy)
-            .join(',') +
-        `[a0]`);
+    const audibleDuration = (actualTrimRight - trimLeft) / playbackRate;
+    const padAtEnd = chunkLength - audibleDuration - startInVideoSeconds;
+    return {
+        filter: `[0:a]` +
+            [
+                `aformat=sample_fmts=s32:sample_rates=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
+                // Order matters! First trim the audio
+                `atrim=${trimLeft.toFixed(6)}:${actualTrimRight.toFixed(6)}`,
+                // then set the tempo
+                (0, calculate_atempo_1.calculateATempo)(playbackRate),
+                // set the volume if needed
+                // The timings for volume must include whatever is in atrim, unless the volume
+                // filter gets applied before atrim
+                volumeFilter.value === '1'
+                    ? null
+                    : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
+                // For n channels, we delay n + 1 channels.
+                // This is because `ffprobe` for some audio files reports the wrong amount
+                // of channels.
+                // This should be fine because FFMPEG documentation states:
+                // "Unused delays will be silently ignored."
+                // https://ffmpeg.org/ffmpeg-filters.html#adelay
+            ]
+                .filter(truthy_1.truthy)
+                .join(',') +
+            `[a0]`,
+        pad_end: padAtEnd > 0.0000001
+            ? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)
+            : null,
+        pad_start: startInVideoSeconds === 0
+            ? null
+            : `adelay=${new Array(channels + 1)
+                .fill((startInVideoSeconds * 1000).toFixed(0))
+                .join('|')}`,
+    };
 };
 exports.stringifyFfmpegFilter = stringifyFfmpegFilter;