@remotion/renderer 4.0.126 → 4.0.127

package/dist/render-frames.js

@@ -18,6 +18,7 @@ const handle_javascript_exception_1 = require("./error-handling/handle-javascrip
 const find_closest_package_json_1 = require("./find-closest-package-json");
 const get_concurrency_1 = require("./get-concurrency");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
+const get_extra_frames_to_capture_1 = require("./get-extra-frames-to-capture");
 const get_frame_padded_index_1 = require("./get-frame-padded-index");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const jpeg_quality_1 = require("./jpeg-quality");
@@ -37,7 +38,7 @@ const validate_1 = require("./validate");
 const validate_scale_1 = require("./validate-scale");
 const wrap_with_error_handling_1 = require("./wrap-with-error-handling");
 const MAX_RETRIES_PER_FRAME = 1;
-const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, jpegQuality, imageFormat, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, compositor, sourceMapGetter, logLevel, indent, parallelEncodingEnabled, }) => {
+const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, jpegQuality, imageFormat, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, compositor, sourceMapGetter, logLevel, indent, parallelEncodingEnabled, compositionStart, forSeamlessAacConcatenation, }) => {
     if (outputDir) {
         if (!node_fs_1.default.existsSync(outputDir)) {
             node_fs_1.default.mkdirSync(outputDir, {
@@ -47,6 +48,12 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
     }
     const downloadPromises = [];
     const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange);
+    const { extraFramesToCaptureAssets, chunkLengthInSeconds, trimLeftOffset, trimRightOffset, } = (0, get_extra_frames_to_capture_1.getExtraFramesToCapture)({
+        fps: composition.fps,
+        compositionStart,
+        realFrameRange,
+        forSeamlessAacConcatenation,
+    });
     const framesToRender = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame);
     const lastFrame = framesToRender[framesToRender.length - 1];
     const makePage = async (context) => {
@@ -136,13 +143,13 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
         frameCount: framesToRender.length,
         parallelEncoding: parallelEncodingEnabled,
     });
-    const assets = new Array(framesToRender.length).fill(undefined);
+    const assets = [];
     let stopped = false;
     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
         stopped = true;
     });
     const frameDir = outputDir !== null && outputDir !== void 0 ? outputDir : downloadMap.compositingDir;
-    const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, compId, }) => {
+    const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, compId, assetsOnly, }) => {
         const pool = await poolPromise;
         const freePage = await pool.acquire();
         if (stopped) {
@@ -182,15 +189,17 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             frame,
             freePage,
             height,
-            imageFormat,
-            output: node_path_1.default.join(frameDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
-                frame,
-                imageFormat,
-                index,
-                countType,
-                lastFrame,
-                totalFrames: framesToRender.length,
-            })),
+            imageFormat: assetsOnly ? 'none' : imageFormat,
+            output: index === null
+                ? null
+                : node_path_1.default.join(frameDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
+                    frame,
+                    imageFormat,
+                    index,
+                    countType,
+                    lastFrame,
+                    totalFrames: framesToRender.length,
+                })),
             jpegQuality,
             width,
             scale,
@@ -199,15 +208,21 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             compositor,
             timeoutInMilliseconds,
         });
-        if (onFrameBuffer) {
+        if (onFrameBuffer && !assetsOnly) {
             if (!buffer) {
                 throw new Error('unexpected null buffer');
             }
             onFrameBuffer(buffer, frame);
         }
         (0, perf_1.stopPerfMeasure)(id);
-        const compressedAssets = collectedAssets.map((asset) => (0, compress_assets_1.compressAsset)(assets.filter(truthy_1.truthy).flat(1), asset));
-        assets[index] = compressedAssets;
+        const compressedAssets = collectedAssets.map((asset) => (0, compress_assets_1.compressAsset)(assets
+            .filter(truthy_1.truthy)
+            .map((a) => a.assets)
+            .flat(2), asset));
+        assets.push({
+            assets: compressedAssets,
+            frame,
+        });
         compressedAssets.forEach((renderAsset) => {
             (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
                 renderAsset,
@@ -219,13 +234,15 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
                 onError(new Error(`Error while downloading asset: ${err.stack}`));
             });
         });
-        framesRendered++;
-        onFrameUpdate === null || onFrameUpdate === void 0 ? void 0 : onFrameUpdate(framesRendered, frame, perf_hooks_1.performance.now() - startTime);
+        if (!assetsOnly) {
+            framesRendered++;
+            onFrameUpdate === null || onFrameUpdate === void 0 ? void 0 : onFrameUpdate(framesRendered, frame, perf_hooks_1.performance.now() - startTime);
+        }
         cleanupPageError();
         freePage.off('error', errorCallbackOnFrame);
         pool.release(freePage);
     };
-    const renderFrame = (frame, index) => {
+    const renderFrame = (frame, index, assetsOnly) => {
         return new Promise((resolve, reject) => {
             renderFrameWithOptionToReject({
                 frame,
@@ -234,6 +251,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
                 width: composition.width,
                 height: composition.height,
                 compId: composition.id,
+                assetsOnly,
             })
                 .then(() => {
                 resolve();
@@ -243,10 +261,10 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             });
         });
     };
-    const renderFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, }) => {
+    const renderFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, assetsOnly, }) => {
         try {
             await Promise.race([
-                renderFrame(frame, index),
+                renderFrame(frame, index, assetsOnly),
                 new Promise((_, reject) => {
                     cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
                         reject(new Error(make_cancel_signal_1.cancelErrorMessages.renderFrames));
@@ -284,23 +302,42 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
                 index,
                 retriesLeft: retriesLeft - 1,
                 attempt: attempt + 1,
+                assetsOnly,
             });
         }
     };
-    const progress = Promise.all(framesToRender.map((frame, index) => renderFrameAndRetryTargetClose({
-        frame,
-        index,
-        retriesLeft: MAX_RETRIES_PER_FRAME,
-        attempt: 1,
-    })));
-    const happyPath = progress.then(() => {
+    const extraFrames = Promise.all(extraFramesToCaptureAssets.map((frame) => {
+        return renderFrameAndRetryTargetClose({
+            frame,
+            index: null,
+            retriesLeft: MAX_RETRIES_PER_FRAME,
+            attempt: 1,
+            assetsOnly: true,
+        });
+    }));
+    const mainFrames = Promise.all(framesToRender.map((frame, index) => {
+        return renderFrameAndRetryTargetClose({
+            frame,
+            index,
+            retriesLeft: MAX_RETRIES_PER_FRAME,
+            attempt: 1,
+            assetsOnly: false,
+        });
+    }));
+    const happyPath = Promise.all([extraFrames, mainFrames]).then(() => {
         const firstFrameIndex = countType === 'from-zero' ? 0 : framesToRender[0];
         const returnValue = {
             assetsInfo: {
-                assets,
+                assets: assets.sort((a, b) => {
+                    return a.frame - b.frame;
+                }),
                 imageSequenceName: node_path_1.default.join(frameDir, `element-%0${filePadLength}d.${imageFormat}`),
                 firstFrameIndex,
                 downloadMap,
+                trimLeftOffset,
+                trimRightOffset,
+                chunkLengthInSeconds,
+                forSeamlessAacConcatenation,
             },
             frameCount: framesToRender.length,
         };
@@ -310,7 +347,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
     await Promise.all(downloadPromises);
     return result;
 };
-const internalRenderFramesRaw = ({ browserExecutable, cancelSignal, chromiumOptions, composition, concurrency, envVariables, everyNthFrame, frameRange, imageFormat, indent, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, onFrameUpdate, onStart, outputDir, port, puppeteerInstance, scale, server, timeoutInMilliseconds, logLevel, webpackBundleOrServeUrl, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, offthreadVideoCacheSizeInBytes, parallelEncodingEnabled, binariesDirectory, }) => {
+const internalRenderFramesRaw = ({ browserExecutable, cancelSignal, chromiumOptions, composition, concurrency, envVariables, everyNthFrame, frameRange, imageFormat, indent, jpegQuality, muted, onBrowserLog, onDownload, onFrameBuffer, onFrameUpdate, onStart, outputDir, port, puppeteerInstance, scale, server, timeoutInMilliseconds, logLevel, webpackBundleOrServeUrl, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, offthreadVideoCacheSizeInBytes, parallelEncodingEnabled, binariesDirectory, forSeamlessAacConcatenation, compositionStart, }) => {
     (0, validate_1.validateDimension)(composition.height, 'height', 'in the `config` object passed to `renderFrames()`');
     (0, validate_1.validateDimension)(composition.width, 'width', 'in the `config` object passed to `renderFrames()`');
     (0, validate_1.validateFps)(composition.fps, 'in the `config` object of `renderFrames()`', false);
@@ -401,6 +438,8 @@ const internalRenderFramesRaw = ({ browserExecutable, cancelSignal, chromiumOpti
                     serializedResolvedPropsWithCustomSchema,
                     parallelEncodingEnabled,
                     binariesDirectory,
+                    forSeamlessAacConcatenation,
+                    compositionStart,
                 });
             }),
         ])
@@ -493,6 +532,8 @@ const renderFrames = (options) => {
         offthreadVideoCacheSizeInBytes: offthreadVideoCacheSizeInBytes !== null && offthreadVideoCacheSizeInBytes !== void 0 ? offthreadVideoCacheSizeInBytes : null,
         parallelEncodingEnabled: false,
         binariesDirectory: binariesDirectory !== null && binariesDirectory !== void 0 ? binariesDirectory : null,
+        compositionStart: 0,
+        forSeamlessAacConcatenation: false,
     });
 };
 exports.renderFrames = renderFrames;

package/dist/render-media.d.ts

@@ -65,6 +65,7 @@ export type InternalRenderMediaOptions = {
     concurrency: number | string | null;
     finishRenderProgress: () => void;
     binariesDirectory: string | null;
+    compositionStart: number;
 } & MoreRenderMediaOptions;
 type Prettify<T> = {
     [K in keyof T]: T[K];

package/dist/render-media.js

@@ -47,7 +47,7 @@ const validate_scale_1 = require("./validate-scale");
 const validate_videobitrate_1 = require("./validate-videobitrate");
 const wrap_with_error_handling_1 = require("./wrap-with-error-handling");
 const SLOWEST_FRAME_COUNT = 10;
-const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, serializedInputPropsWithCustomSchema, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, encodingMaxRate, encodingBufferSize, audioCodec, concurrency, disallowParallelEncoding, everyNthFrame, imageFormat: provisionalImageFormat, indent, jpegQuality, numberOfGifLoops, onCtrlCExit, preferLossless, serveUrl, server: reusedServer, logLevel, serializedResolvedPropsWithCustomSchema, offthreadVideoCacheSizeInBytes, colorSpace, repro, finishRenderProgress, binariesDirectory, separateAudioTo, forSeamlessAacConcatenation, }) => {
+const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, serializedInputPropsWithCustomSchema, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, audioBitrate, videoBitrate, encodingMaxRate, encodingBufferSize, audioCodec, concurrency, disallowParallelEncoding, everyNthFrame, imageFormat: provisionalImageFormat, indent, jpegQuality, numberOfGifLoops, onCtrlCExit, preferLossless, serveUrl, server: reusedServer, logLevel, serializedResolvedPropsWithCustomSchema, offthreadVideoCacheSizeInBytes, colorSpace, repro, finishRenderProgress, binariesDirectory, separateAudioTo, forSeamlessAacConcatenation, compositionStart, }) => {
     if (repro) {
         (0, repro_1.enableRepro)({
             serveUrl,
@@ -340,6 +340,8 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
                 offthreadVideoCacheSizeInBytes,
                 parallelEncodingEnabled: parallelEncoding,
                 binariesDirectory,
+                compositionStart,
+                forSeamlessAacConcatenation,
             });
             return renderFramesProc;
         })
@@ -399,7 +401,6 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
                     colorSpace,
                     binariesDirectory,
                     separateAudioTo,
-                    forSeamlessAacConcatenation,
                 }),
                 stitchStart,
             ]);
@@ -547,6 +548,8 @@ const renderMedia = ({ proResProfile, x264Preset, crf, composition, inputProps,
         binariesDirectory: binariesDirectory !== null && binariesDirectory !== void 0 ? binariesDirectory : null,
         separateAudioTo: separateAudioTo !== null && separateAudioTo !== void 0 ? separateAudioTo : null,
         forSeamlessAacConcatenation: forSeamlessAacConcatenation !== null && forSeamlessAacConcatenation !== void 0 ? forSeamlessAacConcatenation : false,
+        // TODO: In the future, introduce this as a public API when launching the distributed rendering API
+        compositionStart: 0,
     });
 };
 exports.renderMedia = renderMedia;

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

@@ -75,5 +75,5 @@ export declare const internalStitchFramesToVideo: (options: InternalStitchFrames
  * @description Takes a series of images and audio information generated by renderFrames() and encodes it to a video.
  * @see [Documentation](https://www.remotion.dev/docs/renderer/stitch-frames-to-video)
  */
-export declare const stitchFramesToVideo: ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, binariesDirectory, separateAudioTo, forSeamlessAacConcatenation, }: StitchFramesToVideoOptions) => Promise<Buffer | null>;
+export declare const stitchFramesToVideo: ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, binariesDirectory, separateAudioTo, }: StitchFramesToVideoOptions) => Promise<Buffer | null>;
 export {};

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

@@ -28,7 +28,7 @@ const prores_profile_1 = require("./prores-profile");
 const validate_1 = require("./validate");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_videobitrate_1 = require("./validate-videobitrate");
-const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec: audioCodecSetting, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, logLevel, videoBitrate, encodingMaxRate, encodingBufferSize, width, numberOfGifLoops, onProgress, x264Preset, colorSpace, binariesDirectory, separateAudioTo, forSeamlessAacConcatenation, }, remotionRoot) => {
+const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec: audioCodecSetting, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, logLevel, videoBitrate, encodingMaxRate, encodingBufferSize, width, numberOfGifLoops, onProgress, x264Preset, colorSpace, binariesDirectory, separateAudioTo, }, remotionRoot) => {
     var _a;
     (0, validate_1.validateDimension)(height, 'height', 'passed to `stitchFramesToVideo()`');
     (0, validate_1.validateDimension)(width, 'width', 'passed to `stitchFramesToVideo()`');
@@ -101,7 +101,6 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
         encodingBufferSize,
     });
     (0, pixel_format_1.validateSelectedPixelFormatAndCodecCombination)(pixelFormat, codec);
-    const expectedFrames = assetsInfo.assets.length;
     const updateProgress = (muxProgress) => {
         onProgress === null || onProgress === void 0 ? void 0 : onProgress(muxProgress);
     };
@@ -110,7 +109,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
             assets: assetsInfo.assets,
             onDownload,
             fps,
-            expectedFrames,
+            chunkLengthInSeconds: assetsInfo.chunkLengthInSeconds,
             logLevel,
             onProgress: () => updateProgress(0),
             downloadMap: assetsInfo.downloadMap,
@@ -120,7 +119,9 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
             audioBitrate,
             audioCodec: resolvedAudioCodec,
             cancelSignal: cancelSignal !== null && cancelSignal !== void 0 ? cancelSignal : undefined,
-            forSeamlessAacConcatenation,
+            trimLeftOffset: assetsInfo.trimLeftOffset,
+            trimRightOffset: assetsInfo.trimRightOffset,
+            forSeamlessAacConcatenation: assetsInfo.forSeamlessAacConcatenation,
         })
         : null;
     if (mediaSupport.audio && !mediaSupport.video) {
@@ -134,7 +135,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
             throw new Error('`separateAudioTo` was set, but this render was audio-only. This option is meant to be used for video renders.');
         }
         (0, node_fs_1.cpSync)(audio, outputLocation !== null && outputLocation !== void 0 ? outputLocation : tempFile);
-        onProgress === null || onProgress === void 0 ? void 0 : onProgress(expectedFrames);
+        onProgress === null || onProgress === void 0 ? void 0 : onProgress(Math.round(assetsInfo.chunkLengthInSeconds * fps));
         (0, delete_directory_1.deleteDirectory)(node_path_1.default.dirname(audio));
         const file = await new Promise((resolve, reject) => {
             if (tempFile) {
@@ -196,7 +197,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
         indent: indent !== null && indent !== void 0 ? indent : false,
         logLevel,
         tag: 'stitchFramesToVideo()',
-    }, 'Generated final FFMPEG command:');
+    }, 'Generated final FFmpeg command:');
     logger_1.Log.verbose({
         indent,
         logLevel,
@@ -222,7 +223,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
             // Example repo: https://github.com/JonnyBurger/ffmpeg-repro (access can be given upon request)
             if (parsed !== undefined) {
                 // If two times in a row the finishing frame is logged, we quit the render
-                if (parsed === expectedFrames) {
+                if (parsed === assetsInfo.assets.length) {
                     if (isFinished) {
                         (_a = task.stdin) === null || _a === void 0 ? void 0 : _a.write('q');
                     }
@@ -286,7 +287,7 @@ 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, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, binariesDirectory, separateAudioTo, forSeamlessAacConcatenation, }) => {
+const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitrate, audioCodec, cancelSignal, codec, crf, enforceAudioTrack, ffmpegOverride, muted, numberOfGifLoops, onDownload, onProgress, outputLocation, pixelFormat, proResProfile, verbose, videoBitrate, encodingMaxRate, encodingBufferSize, x264Preset, colorSpace, binariesDirectory, separateAudioTo, }) => {
     return (0, exports.internalStitchFramesToVideo)({
         assetsInfo,
         audioBitrate: audioBitrate !== null && audioBitrate !== void 0 ? audioBitrate : null,
@@ -318,7 +319,6 @@ const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitra
         colorSpace: colorSpace !== null && colorSpace !== void 0 ? colorSpace : 'default',
         binariesDirectory: binariesDirectory !== null && binariesDirectory !== void 0 ? binariesDirectory : null,
         separateAudioTo: separateAudioTo !== null && separateAudioTo !== void 0 ? separateAudioTo : null,
-        forSeamlessAacConcatenation: forSeamlessAacConcatenation !== null && forSeamlessAacConcatenation !== void 0 ? forSeamlessAacConcatenation : false,
     });
 };
 exports.stitchFramesToVideo = stitchFramesToVideo;

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

@@ -6,16 +6,17 @@ 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, toneFrequency, }: {
+export declare const stringifyFfmpegFilter: ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, }: {
     trimLeft: number;
     trimRight: number;
     channels: number;
     startInVideo: number;
     volume: AssetVolume;
     fps: number;
-    durationInFrames: number;
     playbackRate: number;
     assetDuration: number | null;
     allowAmplificationDuringRender: boolean;
     toneFrequency: number | null;
+    chunkLengthInSeconds: number;
+    forSeamlessAacConcatenation: boolean;
 }) => FilterWithoutPaddingApplied | null;

package/dist/stringify-ffmpeg-filter.js

@@ -5,7 +5,50 @@ 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, allowAmplificationDuringRender, toneFrequency, }) => {
+const stringifyTrim = (trim) => {
+    const value = trim * 1000000;
+    const asString = `${value}us`;
+    // Handle very small values such as `"6e-7us"`, those are essentially rounding errors to 0
+    if (asString.includes('e-')) {
+        return '0us';
+    }
+    return asString;
+};
+const trimAndSetTempo = ({ playbackRate, trimLeft, trimRight, forSeamlessAacConcatenation, assetDuration, }) => {
+    const trimRightOrAssetDuration = assetDuration
+        ? Math.min(trimRight, assetDuration)
+        : trimRight;
+    // If we need seamless AAC stitching, we need to apply the tempo filter first
+    // because the atempo filter is not frame-perfect. It creates a small offset
+    // and the offset needs to be the same for all audio tracks, before processing it further.
+    // This also affects the trimLeft and trimRight values, as they need to be adjusted.
+    if (forSeamlessAacConcatenation) {
+        const actualTrimLeft = trimLeft / playbackRate;
+        const actualTrimRight = trimRightOrAssetDuration / playbackRate;
+        return {
+            filter: [
+                (0, calculate_atempo_1.calculateATempo)(playbackRate),
+                `atrim=${stringifyTrim(actualTrimLeft)}:${stringifyTrim(actualTrimRight)}`,
+            ],
+            actualTrimLeft,
+            audibleDuration: actualTrimRight - actualTrimLeft,
+        };
+    }
+    // Otherwise, we first trim and then apply playback rate, as then the atempo
+    // filter needs to do less work.
+    if (!forSeamlessAacConcatenation) {
+        return {
+            filter: [
+                `atrim=${stringifyTrim(trimLeft)}:${stringifyTrim(trimRightOrAssetDuration)}`,
+                (0, calculate_atempo_1.calculateATempo)(playbackRate),
+            ],
+            actualTrimLeft: trimLeft,
+            audibleDuration: (trimRightOrAssetDuration - trimLeft) / playbackRate,
+        };
+    }
+    throw new Error('This should never happen');
+};
+const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, }) => {
     const startInVideoSeconds = startInVideo / fps;
     if (assetDuration && trimLeft >= assetDuration) {
         return null;
@@ -13,28 +56,27 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
     if (toneFrequency !== null && (toneFrequency <= 0 || toneFrequency > 2)) {
         throw new Error('toneFrequency must be a positive number between 0.01 and 2');
     }
+    const { actualTrimLeft, audibleDuration, filter: trimAndTempoFilter, } = trimAndSetTempo({
+        playbackRate,
+        forSeamlessAacConcatenation,
+        assetDuration,
+        trimLeft,
+        trimRight,
+    });
     const volumeFilter = (0, ffmpeg_volume_expression_1.ffmpegVolumeExpression)({
         volume,
         fps,
-        trimLeft,
+        trimLeft: actualTrimLeft,
         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 audibleDuration = (actualTrimRight - trimLeft) / playbackRate;
-    const padAtEnd = chunkLength - audibleDuration - startInVideoSeconds;
+    const padAtEnd = chunkLengthInSeconds - audibleDuration - startInVideoSeconds;
+    // Set as few filters as possible, as combining them can create noise
     return {
         filter: `[0:a]` +
             [
                 `aformat=sample_fmts=s32:sample_rates=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
-                // Order matters! First trim the audio
-                `atrim=${trimLeft * 1000000}us:${actualTrimRight * 1000000}us`,
-                // then set the tempo
-                (0, calculate_atempo_1.calculateATempo)(playbackRate),
-                // set the volume if needed
+                // The order matters here! For speed and correctness, we first trim the audio
+                ...trimAndTempoFilter,
                 // The timings for volume must include whatever is in atrim, unless the volume
                 // filter gets applied before atrim
                 volumeFilter.value === '1'

package/dist/x264-preset.d.ts

@@ -5,3 +5,18 @@ export declare const validateSelectedCodecAndPresetCombination: ({ codec, x264Pr
     codec: Codec;
     x264Preset: X264Preset | undefined;
 }) => void;
+export declare const x264Option: {
+    name: string;
+    cliFlag: "x264-preset";
+    description: () => import("react/jsx-runtime").JSX.Element;
+    ssrName: "x264Preset";
+    docLink: string;
+    type: "ultrafast" | "superfast" | "veryfast" | "faster" | "fast" | "medium" | "slow" | "slower" | "veryslow" | "placebo";
+    getValue: ({ commandLine }: {
+        commandLine: Record<string, unknown>;
+    }) => {
+        value: "ultrafast" | "superfast" | "veryfast" | "faster" | "fast" | "medium" | "slow" | "slower" | "veryslow" | "placebo";
+        source: string;
+    };
+    setConfig: (profile: X264Preset | undefined) => void;
+};

package/dist/x264-preset.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSelectedCodecAndPresetCombination = exports.x264PresetOptions = void 0;
+exports.x264Option = exports.validateSelectedCodecAndPresetCombination = exports.x264PresetOptions = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
 exports.x264PresetOptions = [
     'ultrafast',
     'superfast',
@@ -13,6 +14,7 @@ exports.x264PresetOptions = [
     'veryslow',
     'placebo',
 ];
+let preset;
 const validateSelectedCodecAndPresetCombination = ({ codec, x264Preset, }) => {
     if (typeof x264Preset !== 'undefined' &&
         codec !== 'h264' &&
@@ -27,3 +29,26 @@ const validateSelectedCodecAndPresetCombination = ({ codec, x264Preset, }) => {
     }
 };
 exports.validateSelectedCodecAndPresetCombination = validateSelectedCodecAndPresetCombination;
+const cliFlag = 'x264-preset';
+const DEFAULT_PRESET = 'medium';
+exports.x264Option = {
+    name: 'x264 Preset',
+    cliFlag,
+    description: () => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Sets a x264 preset profile. Only applies to videos rendered with", ' ', (0, jsx_runtime_1.jsx)("code", { children: "h264" }), " codec.", (0, jsx_runtime_1.jsx)("br", {}), "Possible values: ", (0, jsx_runtime_1.jsx)("code", { children: "superfast" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "veryfast" }), ",", ' ', (0, jsx_runtime_1.jsx)("code", { children: "faster" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "fast" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "medium" }), ",", ' ', (0, jsx_runtime_1.jsx)("code", { children: "slow" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "slower" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "veryslow" }), ",", ' ', (0, jsx_runtime_1.jsx)("code", { children: "placebo" }), ".", (0, jsx_runtime_1.jsx)("br", {}), "Default: ", (0, jsx_runtime_1.jsx)("code", { children: DEFAULT_PRESET })] })),
+    ssrName: 'x264Preset',
+    docLink: 'https://www.remotion.dev/docs/renderer/render-media',
+    type: 'fast',
+    getValue: ({ commandLine }) => {
+        const value = commandLine[cliFlag];
+        if (typeof value !== 'undefined') {
+            return { value: value, source: 'cli' };
+        }
+        if (typeof preset !== 'undefined') {
+            return { value: preset, source: 'config' };
+        }
+        return { value: DEFAULT_PRESET, source: 'default' };
+    },
+    setConfig: (profile) => {
+        preset = profile;
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.126",
+  "version": "4.0.127",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.126"
+    "remotion": "4.0.127"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.126",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.126",
-    "@remotion/compositor-darwin-x64": "4.0.126",
-    "@remotion/compositor-linux-arm64-musl": "4.0.126",
-    "@remotion/compositor-linux-x64-musl": "4.0.126",
-    "@remotion/compositor-win32-x64-msvc": "4.0.126",
-    "@remotion/compositor-linux-x64-gnu": "4.0.126"
+    "@remotion/compositor-darwin-arm64": "4.0.127",
+    "@remotion/compositor-darwin-x64": "4.0.127",
+    "@remotion/compositor-linux-arm64-musl": "4.0.127",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.127",
+    "@remotion/compositor-linux-x64-gnu": "4.0.127",
+    "@remotion/compositor-linux-x64-musl": "4.0.127",
+    "@remotion/compositor-win32-x64-msvc": "4.0.127"
   },
   "keywords": [
     "remotion",

package/dist/can-concatenate-seamlessly.d.ts

@@ -1,3 +0,0 @@
-import type { AudioCodec } from './audio-codec';
-import type { Codec } from './codec';
-export declare const canConcatSeamlessly: (audioCodec: AudioCodec | null, codec: Codec) => boolean;

package/dist/can-concatenate-seamlessly.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.canConcatSeamlessly = void 0;
-const canConcatSeamlessly = (audioCodec, codec) => {
-    return audioCodec === 'aac' && codec === 'h264';
-};
-exports.canConcatSeamlessly = canConcatSeamlessly;

package/dist/options/separate-audio-to.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.separateAudioOption = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-const DEFAULT = null;
-const cliFlag = 'separate-audio-to';
-exports.separateAudioOption = {
-    cliFlag,
-    description: () => {
-        return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: "If set, the audio will not be included in the main output but rendered as a separate file at the location you pass. It is recommended to use an absolute path. If a relative path is passed, it is relative to the Remotion Root." }));
-    },
-    docLink: 'https://remotion.dev/docs/renderer/render-media',
-    getValue: ({ commandLine }) => {
-        if (commandLine[cliFlag]) {
-            return {
-                source: 'cli',
-                value: commandLine[cliFlag],
-            };
-        }
-        return {
-            source: 'default',
-            value: DEFAULT,
-        };
-    },
-    name: 'Separate audio to',
-    setConfig: () => {
-        throw new Error('Not implemented');
-    },
-    ssrName: 'separateAudioTo',
-    type: 'string',
-};

package/dist/should-seamless.d.ts

@@ -1,3 +0,0 @@
-import type { AudioCodec } from './audio-codec';
-import type { Codec } from './codec';
-export declare const canConcatSeamlessly: (audioCodec: AudioCodec | null, codec: Codec) => boolean;

package/dist/should-seamless.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.canConcatSeamlessly = void 0;
-const canConcatSeamlessly = (audioCodec, codec) => {
-    return audioCodec === 'aac' && codec === 'h264';
-};
-exports.canConcatSeamlessly = canConcatSeamlessly;

package/dist/supported-audio-codecs.d.ts

@@ -1,13 +0,0 @@
-export declare const supportedAudioCodecs: {
-    readonly h264: readonly ["aac", "pcm-16", "mp3"];
-    readonly 'h264-mkv': readonly ["pcm-16", "mp3"];
-    readonly 'h264-ts': readonly ["pcm-16", "aac"];
-    readonly aac: readonly ["aac", "pcm-16"];
-    readonly gif: readonly [];
-    readonly h265: readonly ["aac", "pcm-16"];
-    readonly mp3: readonly ["mp3", "pcm-16"];
-    readonly prores: readonly ["aac", "pcm-16"];
-    readonly vp8: readonly ["opus", "pcm-16"];
-    readonly vp9: readonly ["opus", "pcm-16"];
-    readonly wav: readonly ["pcm-16"];
-};