@remotion/renderer 4.0.0-defer.6 → 4.0.0-esm.17

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

@@ -1,48 +1,81 @@
 "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 fs_1 = __importStar(require("fs"));
 const path_1 = __importDefault(require("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 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 ffmpeg_flags_1 = require("./ffmpeg-flags");
+const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_audio_codec_name_1 = require("./get-audio-codec-name");
 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 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 tmp_dir_1 = require("./tmp-dir");
+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'))
     : null;
-const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, remotionRoot, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
-        downloadDir,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
+        downloadMap,
     });
-    (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
+    (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);
     }
-    const tempPath = (0, tmp_dir_1.tmpDir)('remotion-audio-mixing');
     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(tempPath, `${index}.wav`);
+        const filterFile = 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,
@@ -50,129 +83,185 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
             asset,
             expectedFrames,
             fps,
+            downloadMap,
+            remotionRoot,
         });
         preprocessProgress[index] = 1;
         updateProgress();
         return result;
-    }))).filter(remotion_1.Internals.truthy);
-    const outName = path_1.default.join(tempPath, `audio.wav`);
+    }))).filter(truthy_1.truthy);
+    const outName = 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,
     });
     onProgress(1);
-    preprocessed.forEach((p) => {
-        (0, delete_directory_1.deleteDirectory)(p);
-    });
+    await Promise.all([
+        (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing),
+        ...preprocessed.map((p) => {
+            return (0, delete_directory_1.deleteDirectory)(p);
+        }),
+    ]);
     return outName;
 };
-const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+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;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
-    remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
-    const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : remotion_1.Internals.DEFAULT_CODEC;
+    const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : codec_1.DEFAULT_CODEC;
     (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
         width: options.width,
         height: options.height,
         codec,
         scale: 1,
     });
-    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
-    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.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: options.proResProfile,
+    });
+    (0, validate_videobitrate_1.validateBitrate)(options.audioBitrate, 'audioBitrate');
+    (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 audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
     const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
-    const isAudioOnly = encoderName === null;
-    const supportsCrf = encoderName && codec !== 'prores';
+    const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
+    const tempFile = options.outputLocation
+        ? null
+        : path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec)}`);
+    const shouldRenderAudio = mediaSupport.audio &&
+        (options.assetsInfo.assets.flat(1).length > 0 ||
+            options.enforceAudioTrack) &&
+        !options.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] ffmpeg', (_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : '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] isAudioOnly', isAudioOnly);
+        console.log('[verbose] shouldRenderAudio', shouldRenderAudio);
+        console.log('[verbose] shouldRenderVideo', shouldRenderVideo);
         console.log('[verbose] proResProfileName', proResProfileName);
     }
-    remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
-    remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
+    (0, crf_1.validateQualitySettings)({
+        crf: options.crf,
+        codec,
+        videoBitrate: options.videoBitrate,
+    });
+    (0, pixel_format_1.validateSelectedPixelFormatAndCodecCombination)(pixelFormat, codec);
     const expectedFrames = options.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));
     };
-    const audio = await getAssetsData({
-        assets: options.assetsInfo.assets,
-        downloadDir: options.assetsInfo.downloadDir,
-        onDownload: options.onDownload,
-        fps: options.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,
-        onProgress: (prog) => updateProgress(prog, 0),
-    });
-    if (isAudioOnly) {
+    const audio = shouldRenderAudio
+        ? await getAssetsData({
+            assets: options.assetsInfo.assets,
+            onDownload: options.onDownload,
+            fps: options.fps,
+            expectedFrames,
+            verbose: (_e = options.verbose) !== null && _e !== void 0 ? _e : false,
+            ffmpegExecutable: (_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : null,
+            ffprobeExecutable: (_g = options.ffprobeExecutable) !== null && _g !== void 0 ? _g : null,
+            onProgress: (prog) => updateProgress(prog, 0),
+            downloadMap: options.assetsInfo.downloadMap,
+            remotionRoot,
+        })
+        : null;
+    if (mediaSupport.audio && !mediaSupport.video) {
         if (!audioCodecName) {
             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, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)((_h = options.ffmpegExecutable) !== null && _h !== void 0 ? _h : null, remotionRoot, 'ffmpeg'), [
             '-i',
             audio,
             '-c:a',
             audioCodecName,
             // Set bitrate up to 320k, for aac it might effectively be lower
             '-b:a',
-            '320k',
+            (_j = options.audioBitrate) !== null && _j !== void 0 ? _j : '320k',
             options.force ? '-y' : null,
-            options.outputLocation,
+            (_k = options.outputLocation) !== null && _k !== void 0 ? _k : tempFile,
         ].filter(remotion_1.Internals.truthy));
-        (_j = options.cancelSignal) === null || _j === void 0 ? void 0 : _j.call(options, () => {
+        (_l = options.cancelSignal) === null || _l === void 0 ? void 0 : _l.call(options, () => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_k = options.onProgress) === null || _k === void 0 ? void 0 : _k.call(options, expectedFrames);
+        (_m = options.onProgress) === null || _m === void 0 ? void 0 : _m.call(options, expectedFrames);
+        if (audio) {
+            await (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(audio));
+        }
+        const file = await new Promise((resolve, reject) => {
+            if (tempFile) {
+                fs_1.promises
+                    .readFile(tempFile)
+                    .then((f) => {
+                    return resolve(f);
+                })
+                    .catch((e) => reject(e));
+            }
+            else {
+                resolve(null);
+            }
+        });
+        await (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
         return {
             getLogs: () => '',
-            task: Promise.resolve(),
+            task: Promise.resolve(file),
         };
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
-            ? [['-i', (_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation]]
+        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
+            ? [['-i', (_p = options.internalOptions) === null || _p === void 0 ? void 0 : _p.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
                 ['-start_number', String(options.assetsInfo.firstFrameIndex)],
                 ['-i', options.assetsInfo.imageSequenceName],
             ]),
-        ['-i', audio],
+        audio ? ['-i', audio] : null,
+        ((_q = options.numberOfGifLoops) !== null && _q !== void 0 ? _q : null) === null
+            ? null
+            : [
+                '-loop',
+                (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)((_r = options.numberOfGifLoops) !== null && _r !== void 0 ? _r : null),
+            ],
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
+        ...(((_s = options.internalOptions) === null || _s === void 0 ? void 0 : _s.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: options.crf,
+                    videoBitrate: options.videoBitrate,
+                    codec,
+                }),
             ]),
         codec === 'h264' ? ['-movflags', 'faststart'] : null,
         audioCodecName ? ['-c:a', audioCodecName] : null,
         // Set max bitrate up to 1024kbps, will choose lower if that's too much
-        audioCodecName ? ['-b:a', '512K'] : null,
+        audioCodecName ? ['-b:a', options.audioBitrate || '512K'] : null,
         // Ignore metadata that may come from remote media
         ['-map_metadata', '-1'],
         [
@@ -181,22 +270,29 @@ const spawnFfmpeg = async (options) => {
                 [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
         ],
         options.force ? '-y' : null,
-        options.outputLocation,
+        (_t = options.outputLocation) !== null && _t !== void 0 ? _t : tempFile,
     ];
     if (options.verbose) {
         console.log('Generated FFMPEG command:');
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_p = options.ffmpegExecutable) !== null && _p !== void 0 ? _p : 'ffmpeg', ffmpegString, {
+    const finalFfmpegString = options.ffmpegOverride
+        ? options.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)(await (0, ffmpeg_flags_1.getExecutableBinary)((_u = options.ffmpegExecutable) !== null && _u !== void 0 ? _u : null, remotionRoot, 'ffmpeg'), finalFfmpegString, {
         cwd: options.dir,
     });
-    (_q = options.cancelSignal) === null || _q === void 0 ? void 0 : _q.call(options, () => {
+    (_v = options.cancelSignal) === null || _v === void 0 ? void 0 : _v.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_r = task.stderr) === null || _r === void 0 ? void 0 : _r.on('data', (data) => {
+    (_w = task.stderr) === null || _w === void 0 ? void 0 : _w.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -218,11 +314,31 @@ const spawnFfmpeg = async (options) => {
             }
         }
     });
-    return { task: task.then(() => undefined), getLogs: () => ffmpegOutput };
+    return {
+        task: task.then(() => {
+            (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.audioPreprocessing);
+            if (tempFile === null) {
+                (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
+                return null;
+            }
+            return 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),
+                ]);
+            })
+                .then(([file]) => file);
+        }),
+        getLogs: () => ffmpegOutput,
+    };
 };
 exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
-    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options);
+    const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();
+    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options, remotionRoot);
     const happyPath = task.catch(() => {
         throw new Error(getLogs());
     });
@@ -231,7 +347,7 @@ 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));
             });
         }),
     ]);

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

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

package/dist/stringify-ffmpeg-filter.js

@@ -1,24 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringifyFfmpegFilter = void 0;
-const remotion_1 = require("remotion");
 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 stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }) => {
+const truthy_1 = require("./truthy");
+const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, allowAmplificationDuringRender, }) => {
     const startInVideoSeconds = startInVideo / fps;
+    if (assetDuration && trimLeft >= assetDuration) {
+        return null;
+    }
     const volumeFilter = (0, ffmpeg_volume_expression_1.ffmpegVolumeExpression)({
         volume,
-        startInVideo,
         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;
+    const audibleDuration = (actualTrimRight - trimLeft) / playbackRate;
+    const padAtEnd = chunkLength - audibleDuration - startInVideoSeconds;
     return (`[0:a]` +
         [
             `aformat=sample_fmts=s32:sample_rates=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
@@ -26,6 +30,12 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
             `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.
@@ -37,18 +47,12 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
                 : `adelay=${new Array(channels + 1)
                     .fill((startInVideoSeconds * 1000).toFixed(0))
                     .join('|')}`,
-            // 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}`,
             // 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(remotion_1.Internals.truthy)
+            .filter(truthy_1.truthy)
             .join(',') +
         `[a0]`);
 };

package/dist/symbolicate-stacktrace.d.ts

@@ -1,4 +1,4 @@
-import { UnsymbolicatedStackFrame } from './parse-browser-error-stack';
+import type { UnsymbolicatedStackFrame } from './parse-browser-error-stack';
 declare type ScriptLine = {
     lineNumber: number;
     content: string;

package/dist/symbolicate-stacktrace.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.symbolicateStackTrace = void 0;
-const remotion_1 = require("remotion");
 const source_map_1 = require("source-map");
 const read_file_1 = require("./assets/read-file");
+const truthy_1 = require("./truthy");
 function extractSourceMapUrl(fileContents) {
     const regex = /\/\/[#@] ?sourceMappingURL=([^\s'"]+)\s*$/gm;
     let match = null;
@@ -74,7 +74,7 @@ const symbolicateStackTrace = async (frames) => {
         ...new Set(frames
             .map((f) => f.fileName)
             .filter((f) => f.startsWith('http://') || f.startsWith('https://'))
-            .filter(remotion_1.Internals.truthy)),
+            .filter(truthy_1.truthy)),
     ];
     const maps = await Promise.all(uniqueFileNames.map(async (fileName) => {
         const fileContents = await fetchUrl(fileName);
@@ -105,6 +105,6 @@ const symbolicateStackTrace = async (frames) => {
             originalScriptCode: scriptCode,
         };
     })
-        .filter(remotion_1.Internals.truthy);
+        .filter(truthy_1.truthy);
 };
 exports.symbolicateStackTrace = symbolicateStackTrace;

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

@@ -0,0 +1,20 @@
+/// <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, }: {
+    freePage: Page;
+    imageFormat: ImageFormat;
+    quality: number | undefined;
+    frame: number;
+    height: number;
+    width: number;
+    output: string | null;
+    scale: number;
+    downloadMap: DownloadMap;
+    wantsBuffer: boolean;
+}) => Promise<{
+    buffer: Buffer | null;
+    collectedAssets: TAsset[];
+}>;

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

@@ -0,0 +1,96 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.takeFrameAndCompose = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("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, }) => {
+    var _a;
+    const [clipRegion, collectedAssets] = await Promise.all([
+        (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+            pageFunction: () => {
+                if (typeof window.remotion_getClipRegion === 'undefined') {
+                    return null;
+                }
+                return window.remotion_getClipRegion();
+            },
+            args: [],
+            frame,
+            page: freePage,
+        }),
+        (0, puppeteer_evaluate_1.puppeteerEvaluateWithCatch)({
+            pageFunction: () => {
+                return window.remotion_collectAssets();
+            },
+            args: [],
+            frame,
+            page: freePage,
+        }),
+    ]);
+    if (imageFormat === 'none') {
+        return { buffer: null, collectedAssets };
+    }
+    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}`),
+            clipRegion: clipRegion,
+        };
+    if (clipRegion !== 'hide') {
+        const shouldMakeBuffer = wantsBuffer && !needsComposing;
+        const buf = await (0, provide_screenshot_1.provideScreenshot)({
+            page: freePage,
+            imageFormat,
+            quality,
+            options: {
+                frame,
+                output: shouldMakeBuffer ? null : (_a = needsComposing === null || needsComposing === void 0 ? void 0 : needsComposing.tmpFile) !== null && _a !== void 0 ? _a : output,
+            },
+            height,
+            width,
+            clipRegion,
+        });
+        if (shouldMakeBuffer) {
+            return { buffer: buf, collectedAssets };
+        }
+    }
+    if (needsComposing) {
+        await (0, compose_1.compose)({
+            height: height * scale,
+            width: width * scale,
+            layers: [
+                needsComposing.clipRegion === 'hide'
+                    ? null
+                    : {
+                        type: imageFormat === 'jpeg'
+                            ? 'JpgImage'
+                            : 'PngImage',
+                        params: {
+                            height: needsComposing.clipRegion.height * scale,
+                            width: needsComposing.clipRegion.width * scale,
+                            src: needsComposing.tmpFile,
+                            x: needsComposing.clipRegion.x * scale,
+                            y: needsComposing.clipRegion.y * scale,
+                        },
+                    },
+            ].filter(truthy_1.truthy),
+            output: needsComposing.finalOutfie,
+            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);
+            return { buffer, collectedAssets };
+        }
+    }
+    return { buffer: null, collectedAssets };
+};
+exports.takeFrameAndCompose = takeFrameAndCompose;

package/dist/truthy.d.ts

@@ -0,0 +1,3 @@
+declare type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
+export declare function truthy<T>(value: T): value is Truthy<T>;
+export {};

package/dist/truthy.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.truthy = void 0;
+function truthy(value) {
+    return Boolean(value);
+}
+exports.truthy = truthy;