@remotion/renderer 4.0.347 → 4.0.348

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

@@ -3,7 +3,10 @@ import type { FilterWithoutPaddingApplied } from './stringify-ffmpeg-filter';
 export declare const makeFfmpegFilterFile: (complexFilter: FilterWithoutPaddingApplied, downloadMap: DownloadMap) => Promise<{
     file: string;
     cleanup: () => void;
-}>;
+}> | {
+    file: null;
+    cleanup: () => undefined;
+};
 export declare const makeFfmpegFilterFileStr: (complexFilter: string, downloadMap: DownloadMap) => Promise<{
     file: string;
     cleanup: () => void;

package/dist/ffmpeg-filter-file.js

@@ -42,6 +42,12 @@ exports.makeFfmpegFilterFileStr = exports.makeFfmpegFilterFile = void 0;
 const node_fs_1 = __importStar(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const makeFfmpegFilterFile = (complexFilter, downloadMap) => {
+    if (complexFilter.filter === null) {
+        return {
+            file: null,
+            cleanup: () => undefined,
+        };
+    }
     return (0, exports.makeFfmpegFilterFileStr)(complexFilter.filter, downloadMap);
 };
 exports.makeFfmpegFilterFile = makeFfmpegFilterFile;

package/dist/filter-asset-types.d.ts

@@ -1,7 +1,8 @@
-import type { AudioOrVideoAsset, TRenderAsset } from 'remotion/no-react';
+import type { AudioOrVideoAsset, InlineAudioAsset, TRenderAsset } from 'remotion/no-react';
 import type { EmittedArtifact } from './serialize-artifact';
 export declare const onlyAudioAndVideoAssets: (assets: TRenderAsset[]) => AudioOrVideoAsset[];
 export declare const onlyArtifact: ({ assets, frameBuffer, }: {
     assets: TRenderAsset[];
     frameBuffer: Buffer | null;
 }) => EmittedArtifact[];
+export declare const onlyInlineAudio: (assets: TRenderAsset[]) => InlineAudioAsset[];

package/dist/filter-asset-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onlyArtifact = exports.onlyAudioAndVideoAssets = void 0;
+exports.onlyInlineAudio = exports.onlyArtifact = exports.onlyAudioAndVideoAssets = void 0;
 const truthy_1 = require("./truthy");
 const onlyAudioAndVideoAssets = (assets) => {
     return assets.filter((asset) => asset.type === 'audio' || asset.type === 'video');
@@ -38,3 +38,7 @@ const onlyArtifact = ({ assets, frameBuffer, }) => {
         .filter(truthy_1.truthy);
 };
 exports.onlyArtifact = onlyArtifact;
+const onlyInlineAudio = (assets) => {
+    return assets.filter((asset) => asset.type === 'inline-audio');
+};
+exports.onlyInlineAudio = onlyInlineAudio;

package/dist/preprocess-audio-track.js

@@ -11,6 +11,7 @@ const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const resolve_asset_src_1 = require("./resolve-asset-src");
 const sample_rate_1 = require("./sample-rate");
 const stringify_ffmpeg_filter_1 = require("./stringify-ffmpeg-filter");
+const truthy_1 = require("./truthy");
 const preprocessAudioTrackUnlimited = async ({ outName, asset, fps, downloadMap, indent, logLevel, binariesDirectory, cancelSignal, onProgress, chunkLengthInSeconds, trimLeftOffset, trimRightOffset, forSeamlessAacConcatenation, audioStreamIndex, }) => {
     var _a;
     const { channels, duration, startTime } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)({
@@ -45,11 +46,13 @@ const preprocessAudioTrackUnlimited = async ({ outName, asset, fps, downloadMap,
         ['-i', (0, resolve_asset_src_1.resolveAssetSrc)(asset.src)],
         audioStreamIndex ? ['-map', `0:a:${audioStreamIndex}`] : [],
         ['-ac', '2'],
-        ['-filter_script:a', file],
+        file ? ['-filter_script:a', file] : null,
         ['-c:a', 'pcm_s16le'],
         ['-ar', String(sample_rate_1.DEFAULT_SAMPLE_RATE)],
         ['-y', outName],
-    ].flat(2);
+    ]
+        .flat(2)
+        .filter(truthy_1.truthy);
     logger_1.Log.verbose({ indent, logLevel }, 'Preprocessing audio track:', JSON.stringify(args.join(' ')), 'Filter:', filter.filter);
     const startTimestamp = Date.now();
     const task = (0, call_ffmpeg_1.callFf)({

package/dist/render-frame-and-retry-target-close.d.ts

@@ -11,7 +11,7 @@ import type { NextFrameToRender } from './next-frame-to-render';
 import type { Pool } from './pool';
 import type { FrameAndAssets, OnArtifact } from './render-frames';
 import type { BrowserReplacer } from './replace-browser';
-export declare const renderFrameAndRetryTargetClose: ({ retriesLeft, attempt, assets, imageFormat, binariesDirectory, cancelSignal, composition, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, onError, outputDir, poolPromise, scale, stoppedSignal, timeoutInMilliseconds, indent, logLevel, makeBrowser, makeNewPage, browserReplacer, concurrencyOrFramesToRender, framesRenderedObj, lastFrame, onFrameBuffer, onFrameUpdate, nextFrameToRender, imageSequencePattern, }: {
+export declare const renderFrameAndRetryTargetClose: ({ retriesLeft, attempt, assets, imageFormat, binariesDirectory, cancelSignal, composition, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, onError, outputDir, poolPromise, scale, stoppedSignal, timeoutInMilliseconds, indent, logLevel, makeBrowser, makeNewPage, browserReplacer, concurrencyOrFramesToRender, framesRenderedObj, lastFrame, onFrameBuffer, onFrameUpdate, nextFrameToRender, imageSequencePattern, trimLeftOffset, trimRightOffset, allFramesAndExtraFrames, }: {
     retriesLeft: number;
     attempt: number;
     imageFormat: VideoImageFormat;
@@ -48,4 +48,7 @@ export declare const renderFrameAndRetryTargetClose: ({ retriesLeft, attempt, as
     onFrameUpdate: null | ((framesRendered: number, frameIndex: number, timeToRenderInMilliseconds: number) => void);
     nextFrameToRender: NextFrameToRender;
     imageSequencePattern: string | null;
+    trimLeftOffset: number;
+    trimRightOffset: number;
+    allFramesAndExtraFrames: number[];
 }) => Promise<void>;

package/dist/render-frame-and-retry-target-close.js

@@ -7,7 +7,7 @@ const is_delay_render_error_with_retry_1 = require("./is-delay-render-error-with
 const logger_1 = require("./logger");
 const make_cancel_signal_1 = require("./make-cancel-signal");
 const render_frame_1 = require("./render-frame");
-const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, imageFormat, binariesDirectory, cancelSignal, composition, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, onError, outputDir, poolPromise, scale, stoppedSignal, timeoutInMilliseconds, indent, logLevel, makeBrowser, makeNewPage, browserReplacer, concurrencyOrFramesToRender, framesRenderedObj, lastFrame, onFrameBuffer, onFrameUpdate, nextFrameToRender, imageSequencePattern, }) => {
+const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, imageFormat, binariesDirectory, cancelSignal, composition, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, onError, outputDir, poolPromise, scale, stoppedSignal, timeoutInMilliseconds, indent, logLevel, makeBrowser, makeNewPage, browserReplacer, concurrencyOrFramesToRender, framesRenderedObj, lastFrame, onFrameBuffer, onFrameUpdate, nextFrameToRender, imageSequencePattern, trimLeftOffset, trimRightOffset, allFramesAndExtraFrames, }) => {
     var _a;
     const currentPool = await poolPromise;
     if (stoppedSignal.stopped) {
@@ -18,6 +18,9 @@ const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, im
     try {
         await Promise.race([
             (0, render_frame_1.renderFrame)({
+                trimLeftOffset,
+                trimRightOffset,
+                allFramesAndExtraFrames,
                 attempt,
                 assets,
                 binariesDirectory,
@@ -116,6 +119,9 @@ const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, im
                 onFrameUpdate,
                 nextFrameToRender,
                 imageSequencePattern,
+                trimLeftOffset,
+                trimRightOffset,
+                allFramesAndExtraFrames,
             });
         }
         logger_1.Log.warn({ indent, logLevel }, `The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
@@ -164,6 +170,9 @@ const renderFrameAndRetryTargetClose = async ({ retriesLeft, attempt, assets, im
             onFrameUpdate,
             nextFrameToRender,
             imageSequencePattern,
+            trimLeftOffset,
+            trimRightOffset,
+            allFramesAndExtraFrames,
         });
     }
 };

package/dist/render-frame-with-option-to-reject.d.ts

@@ -6,7 +6,7 @@ import type { VideoImageFormat } from './image-format';
 import type { LogLevel } from './log-level';
 import type { CancelSignal } from './make-cancel-signal';
 import type { FrameAndAssets, OnArtifact } from './render-frames';
-export declare const renderFrameWithOptionToReject: ({ reject, width, height, compId, attempt, stoppedSignal, indent, logLevel, timeoutInMilliseconds, outputDir, onFrameBuffer, imageFormat, onError, lastFrame, jpegQuality, frameDir, scale, countType, assets, framesToRender, onArtifact, onDownload, downloadMap, binariesDirectory, cancelSignal, framesRenderedObj, onFrameUpdate, frame, page, imageSequencePattern, }: {
+export declare const renderFrameWithOptionToReject: ({ reject, width, height, compId, attempt, stoppedSignal, indent, logLevel, timeoutInMilliseconds, outputDir, onFrameBuffer, imageFormat, onError, lastFrame, jpegQuality, frameDir, scale, countType, assets, framesToRender, onArtifact, onDownload, downloadMap, binariesDirectory, cancelSignal, framesRenderedObj, onFrameUpdate, frame, page, imageSequencePattern, fps, trimLeftOffset, trimRightOffset, allFramesAndExtraFrames, }: {
     reject: (err: Error) => void;
     width: number;
     height: number;
@@ -41,4 +41,8 @@ export declare const renderFrameWithOptionToReject: ({ reject, width, height, co
     frame: number;
     page: Page;
     imageSequencePattern: string | null;
+    fps: number;
+    trimLeftOffset: number;
+    trimRightOffset: number;
+    allFramesAndExtraFrames: number[];
 }) => Promise<undefined>;

package/dist/render-frame-with-option-to-reject.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderFrameWithOptionToReject = void 0;
 const path_1 = __importDefault(require("path"));
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
+const collect_assets_1 = require("./collect-assets");
 const compress_assets_1 = require("./compress-assets");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
 const filter_asset_types_1 = require("./filter-asset-types");
@@ -14,7 +15,7 @@ const logger_1 = require("./logger");
 const seek_to_frame_1 = require("./seek-to-frame");
 const take_frame_1 = require("./take-frame");
 const truthy_1 = require("./truthy");
-const renderFrameWithOptionToReject = async ({ reject, width, height, compId, attempt, stoppedSignal, indent, logLevel, timeoutInMilliseconds, outputDir, onFrameBuffer, imageFormat, onError, lastFrame, jpegQuality, frameDir, scale, countType, assets, framesToRender, onArtifact, onDownload, downloadMap, binariesDirectory, cancelSignal, framesRenderedObj, onFrameUpdate, frame, page, imageSequencePattern, }) => {
+const renderFrameWithOptionToReject = async ({ reject, width, height, compId, attempt, stoppedSignal, indent, logLevel, timeoutInMilliseconds, outputDir, onFrameBuffer, imageFormat, onError, lastFrame, jpegQuality, frameDir, scale, countType, assets, framesToRender, onArtifact, onDownload, downloadMap, binariesDirectory, cancelSignal, framesRenderedObj, onFrameUpdate, frame, page, imageSequencePattern, fps, trimLeftOffset, trimRightOffset, allFramesAndExtraFrames, }) => {
     const startTime = performance.now();
     const index = framesToRender.indexOf(frame);
     const assetsOnly = index === -1;
@@ -50,28 +51,34 @@ const renderFrameWithOptionToReject = async ({ reject, width, height, compId, at
     if (outputDir && onFrameBuffer && imageFormat !== 'none') {
         throw new Error('Pass either `outputDir` or `onFrameBuffer` to renderFrames(), not both.');
     }
-    const { buffer, collectedAssets } = await (0, take_frame_1.takeFrame)({
-        frame,
-        freePage: page,
-        height,
-        imageFormat: assetsOnly ? 'none' : imageFormat,
-        output: index === null
-            ? null
-            : path_1.default.join(frameDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
-                frame,
-                imageFormat,
-                index,
-                countType,
-                lastFrame,
-                totalFrames: framesToRender.length,
-                imageSequencePattern,
-            })),
-        jpegQuality,
-        width,
-        scale,
-        wantsBuffer: Boolean(onFrameBuffer),
-        timeoutInMilliseconds,
-    });
+    const [buffer, collectedAssets] = await Promise.all([
+        (0, take_frame_1.takeFrame)({
+            freePage: page,
+            height,
+            imageFormat: assetsOnly ? 'none' : imageFormat,
+            output: index === null
+                ? null
+                : path_1.default.join(frameDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
+                    frame,
+                    imageFormat,
+                    index,
+                    countType,
+                    lastFrame,
+                    totalFrames: framesToRender.length,
+                    imageSequencePattern,
+                })),
+            jpegQuality,
+            width,
+            scale,
+            wantsBuffer: Boolean(onFrameBuffer),
+            timeoutInMilliseconds,
+        }),
+        (0, collect_assets_1.collectAssets)({
+            frame,
+            freePage: page,
+            timeoutInMilliseconds,
+        }),
+    ]);
     if (onFrameBuffer && !assetsOnly) {
         if (!buffer) {
             throw new Error('unexpected null buffer');
@@ -101,6 +108,7 @@ const renderFrameWithOptionToReject = async ({ reject, width, height, compId, at
     const compressedAssets = audioAndVideoAssets.map((asset) => {
         return (0, compress_assets_1.compressAsset)(previousAudioRenderAssets, asset);
     });
+    const inlineAudioAssets = (0, filter_asset_types_1.onlyInlineAudio)(collectedAssets);
     assets.push({
         audioAndVideoAssets: compressedAssets,
         frame,
@@ -110,6 +118,7 @@ const renderFrameWithOptionToReject = async ({ reject, width, height, compId, at
                 filename: a.filename,
             };
         }),
+        inlineAudioAssets,
     });
     for (const renderAsset of compressedAssets) {
         (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
@@ -127,6 +136,16 @@ const renderFrameWithOptionToReject = async ({ reject, width, height, compId, at
             onError(new Error(`Error while downloading ${truncateWithEllipsis}: ${err.stack}`));
         });
     }
+    for (const renderAsset of inlineAudioAssets) {
+        downloadMap.inlineAudioMixing.addAsset({
+            asset: renderAsset,
+            fps,
+            totalNumberOfFrames: allFramesAndExtraFrames.length,
+            firstFrame: allFramesAndExtraFrames[0],
+            trimLeftOffset,
+            trimRightOffset,
+        });
+    }
     cleanupPageError();
     page.off('error', errorCallbackOnFrame);
     if (!assetsOnly) {

package/dist/render-frame.d.ts

@@ -8,7 +8,7 @@ import type { LogLevel } from './log-level';
 import type { CancelSignal } from './make-cancel-signal';
 import type { NextFrameToRender } from './next-frame-to-render';
 import type { FrameAndAssets, OnArtifact } from './render-frames';
-export declare const renderFrame: ({ attempt, binariesDirectory, cancelSignal, imageFormat, indent, logLevel, assets, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, scale, composition, onError, outputDir, stoppedSignal, timeoutInMilliseconds, lastFrame, onFrameBuffer, onFrameUpdate, framesRenderedObj, frame, page, imageSequencePattern, }: {
+export declare const renderFrame: ({ attempt, binariesDirectory, cancelSignal, imageFormat, indent, logLevel, assets, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, scale, composition, onError, outputDir, stoppedSignal, timeoutInMilliseconds, lastFrame, onFrameBuffer, onFrameUpdate, framesRenderedObj, frame, page, imageSequencePattern, trimLeftOffset, trimRightOffset, allFramesAndExtraFrames, }: {
     attempt: number;
     indent: boolean;
     logLevel: LogLevel;
@@ -41,4 +41,7 @@ export declare const renderFrame: ({ attempt, binariesDirectory, cancelSignal, i
     frame: number;
     page: Page;
     imageSequencePattern: string | null;
+    trimLeftOffset: number;
+    trimRightOffset: number;
+    allFramesAndExtraFrames: number[];
 }) => Promise<void>;

package/dist/render-frame.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderFrame = void 0;
 const render_frame_with_option_to_reject_1 = require("./render-frame-with-option-to-reject");
-const renderFrame = ({ attempt, binariesDirectory, cancelSignal, imageFormat, indent, logLevel, assets, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, scale, composition, onError, outputDir, stoppedSignal, timeoutInMilliseconds, lastFrame, onFrameBuffer, onFrameUpdate, framesRenderedObj, frame, page, imageSequencePattern, }) => {
+const renderFrame = ({ attempt, binariesDirectory, cancelSignal, imageFormat, indent, logLevel, assets, countType, downloadMap, frameDir, framesToRender, jpegQuality, onArtifact, onDownload, scale, composition, onError, outputDir, stoppedSignal, timeoutInMilliseconds, lastFrame, onFrameBuffer, onFrameUpdate, framesRenderedObj, frame, page, imageSequencePattern, trimLeftOffset, trimRightOffset, allFramesAndExtraFrames, }) => {
     return new Promise((resolve, reject) => {
         (0, render_frame_with_option_to_reject_1.renderFrameWithOptionToReject)({
             reject,
@@ -35,6 +35,10 @@ const renderFrame = ({ attempt, binariesDirectory, cancelSignal, imageFormat, in
             frame,
             page,
             imageSequencePattern,
+            fps: composition.fps,
+            trimLeftOffset,
+            trimRightOffset,
+            allFramesAndExtraFrames,
         })
             .then(() => {
             resolve();

package/dist/render-frames.d.ts

@@ -1,4 +1,4 @@
-import type { AudioOrVideoAsset, VideoConfig } from 'remotion/no-react';
+import type { AudioOrVideoAsset, InlineAudioAsset, VideoConfig } from 'remotion/no-react';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { BrowserExecutable } from './browser-executable';
 import type { BrowserLog } from './browser-log';
@@ -51,6 +51,7 @@ export type FrameAndAssets = {
     frame: number;
     audioAndVideoAssets: AudioOrVideoAsset[];
     artifactAssets: ArtifactWithoutContent[];
+    inlineAudioAssets: InlineAudioAsset[];
 };
 export type RenderFramesOptions = {
     onStart: (data: OnStartData) => void;

package/dist/render-frames.js

@@ -169,6 +169,9 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             onFrameUpdate,
             nextFrameToRender,
             imageSequencePattern: pattern,
+            trimLeftOffset,
+            trimRightOffset,
+            allFramesAndExtraFrames,
         });
     }));
     const firstFrameIndex = countType === 'from-zero' ? 0 : framesToRender[0];

package/dist/render-still.js

@@ -43,6 +43,7 @@ const no_react_1 = require("remotion/no-react");
 const browser_1 = require("./browser");
 const TimeoutSettings_1 = require("./browser/TimeoutSettings");
 const browser_download_progress_bar_1 = require("./browser/browser-download-progress-bar");
+const collect_assets_1 = require("./collect-assets");
 const convert_to_positive_frame_index_1 = require("./convert-to-positive-frame-index");
 const ensure_output_directory_1 = require("./ensure-output-directory");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
@@ -202,18 +203,24 @@ const innerRenderStill = async ({ composition, imageFormat = image_format_1.DEFA
         logLevel,
         attempt: 0,
     });
-    const { buffer, collectedAssets } = await (0, take_frame_1.takeFrame)({
-        frame: stillFrame,
-        freePage: page,
-        height: composition.height,
-        width: composition.width,
-        imageFormat,
-        scale,
-        output,
-        jpegQuality,
-        wantsBuffer: !output,
-        timeoutInMilliseconds,
-    });
+    const [buffer, collectedAssets] = await Promise.all([
+        (0, take_frame_1.takeFrame)({
+            freePage: page,
+            height: composition.height,
+            width: composition.width,
+            imageFormat,
+            scale,
+            output,
+            jpegQuality,
+            wantsBuffer: !output,
+            timeoutInMilliseconds,
+        }),
+        (0, collect_assets_1.collectAssets)({
+            frame,
+            freePage: page,
+            timeoutInMilliseconds,
+        }),
+    ]);
     const artifactAssets = (0, filter_asset_types_1.onlyArtifact)({
         assets: collectedAssets,
         frameBuffer: buffer,

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

@@ -170,6 +170,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
             }
         });
         (0, delete_directory_1.deleteDirectory)(assetsInfo.downloadMap.stitchFrames);
+        assetsInfo.downloadMap.allowCleanup();
         return Promise.resolve(file);
     }
     const ffmpegArgs = [
@@ -265,10 +266,9 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
         (0, node_fs_1.cpSync)(audio, finalDestination);
         (0, node_fs_1.rmSync)(audio);
     }
-    return new Promise((resolve, reject) => {
+    const result = await new Promise((resolve, reject) => {
         task.once('close', (code, signal) => {
             if (code === 0) {
-                assetsInfo.downloadMap.allowCleanup();
                 if (tempFile === null) {
                     (0, download_map_1.cleanDownloadMap)(assetsInfo.downloadMap);
                     return resolve(null);
@@ -290,6 +290,8 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec:
             }
         });
     });
+    assetsInfo.downloadMap.allowCleanup();
+    return result;
 };
 const internalStitchFramesToVideo = (options) => {
     const remotionRoot = (0, find_closest_package_json_1.findRemotionRoot)();

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

@@ -1,23 +1,13 @@
 import type { AssetVolume, MediaAsset } from './assets/types';
 import type { LogLevel } from './log-level';
 export type FilterWithoutPaddingApplied = ProcessedTrack & {
-    filter: string;
+    filter: string | null;
     actualTrimLeft: number;
 };
 export type ProcessedTrack = {
     pad_start: string | null;
     pad_end: string | null;
 };
-export declare const getActualTrimLeft: ({ asset, fps, trimLeftOffset, seamless, assetDuration, }: {
-    asset: MediaAsset;
-    fps: number;
-    trimLeftOffset: number;
-    seamless: boolean;
-    assetDuration: number | null;
-}) => {
-    trimLeft: number;
-    maxTrim: number | null;
-};
 export declare const stringifyFfmpegFilter: ({ channels, volume, fps, assetDuration, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, indent, logLevel, presentationTimeOffsetInSeconds, }: {
     channels: number;
     volume: AssetVolume;

package/dist/stringify-ffmpeg-filter.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyFfmpegFilter = exports.getActualTrimLeft = void 0;
+exports.stringifyFfmpegFilter = void 0;
 const calculate_atempo_1 = require("./assets/calculate-atempo");
 const ffmpeg_volume_expression_1 = require("./assets/ffmpeg-volume-expression");
 const logger_1 = require("./logger");
 const sample_rate_1 = require("./sample-rate");
+const seamless_aac_trim_1 = require("./seamless-aac-trim");
 const truthy_1 = require("./truthy");
 const cleanUpFloatingPointError = (value) => {
     if (value % 1 < 0.0000001) {
@@ -24,38 +25,19 @@ const stringifyTrim = (trim) => {
     }
     return asString;
 };
-const getActualTrimLeft = ({ asset, fps, trimLeftOffset, seamless, assetDuration, }) => {
-    const sinceStart = asset.trimLeft - asset.audioStartFrame;
-    if (!seamless) {
-        return {
-            trimLeft: asset.audioStartFrame / fps +
-                (sinceStart / fps) * asset.playbackRate +
-                trimLeftOffset,
-            maxTrim: assetDuration,
-        };
-    }
-    if (seamless) {
-        return {
-            trimLeft: asset.audioStartFrame / fps / asset.playbackRate +
-                sinceStart / fps +
-                trimLeftOffset,
-            maxTrim: assetDuration ? assetDuration / asset.playbackRate : null,
-        };
-    }
-    throw new Error('This should never happen');
-};
-exports.getActualTrimLeft = getActualTrimLeft;
 const trimAndSetTempo = ({ assetDuration, asset, trimLeftOffset, trimRightOffset, fps, indent, logLevel, }) => {
     // 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.
-    const { trimLeft, maxTrim } = (0, exports.getActualTrimLeft)({
-        asset,
+    const { trimLeft, maxTrim } = (0, seamless_aac_trim_1.getActualTrimLeft)({
+        trimLeft: asset.trimLeft,
         fps,
         trimLeftOffset,
         seamless: true,
         assetDuration,
+        audioStartFrame: asset.audioStartFrame,
+        playbackRate: asset.playbackRate,
     });
     const trimRight = trimLeft + asset.duration / fps - trimLeftOffset + trimRightOffset;
     let trimRightOrAssetDuration = maxTrim
@@ -86,12 +68,14 @@ const stringifyFfmpegFilter = ({ channels, volume, fps, assetDuration, chunkLeng
     }
     const { toneFrequency, startInVideo } = asset;
     const startInVideoSeconds = startInVideo / fps;
-    const { trimLeft, maxTrim } = (0, exports.getActualTrimLeft)({
-        asset,
+    const { trimLeft, maxTrim } = (0, seamless_aac_trim_1.getActualTrimLeft)({
+        trimLeft: asset.trimLeft,
         fps,
         trimLeftOffset,
         seamless: forSeamlessAacConcatenation,
         assetDuration,
+        audioStartFrame: asset.audioStartFrame,
+        playbackRate: asset.playbackRate,
     });
     if (maxTrim && trimLeft >= maxTrim) {
         return null;

package/dist/take-frame.d.ts

@@ -1,18 +1,13 @@
-import type { TRenderAsset } from 'remotion/no-react';
 import type { Page } from './browser/BrowserPage';
 import type { StillImageFormat, VideoImageFormat } from './image-format';
-export declare const takeFrame: ({ freePage, imageFormat, jpegQuality, frame, width, height, output, scale, wantsBuffer, timeoutInMilliseconds, }: {
+export declare const takeFrame: ({ freePage, imageFormat, jpegQuality, width, height, output, scale, wantsBuffer, timeoutInMilliseconds, }: {
     freePage: Page;
     imageFormat: VideoImageFormat | StillImageFormat;
     jpegQuality: number | undefined;
-    frame: number;
     height: number;
     width: number;
     output: string | null;
     scale: number;
     wantsBuffer: boolean;
     timeoutInMilliseconds: number;
-}) => Promise<{
-    buffer: Buffer | null;
-    collectedAssets: TRenderAsset[];
-}>;
+}) => Promise<Buffer | null>;

package/dist/take-frame.js

@@ -1,18 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeFrame = void 0;
-const collect_assets_1 = require("./collect-assets");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const puppeteer_screenshot_1 = require("./puppeteer-screenshot");
-const takeFrame = async ({ freePage, imageFormat, jpegQuality, frame, width, height, output, scale, wantsBuffer, timeoutInMilliseconds, }) => {
+const takeFrame = async ({ freePage, imageFormat, jpegQuality, width, height, output, scale, wantsBuffer, timeoutInMilliseconds, }) => {
     var _a;
-    const collectedAssets = await (0, collect_assets_1.collectAssets)({
-        frame,
-        freePage,
-        timeoutInMilliseconds,
-    });
     if (imageFormat === 'none') {
-        return { buffer: null, collectedAssets };
+        return null;
     }
     if (imageFormat === 'png' ||
         imageFormat === 'pdf' ||
@@ -48,6 +42,6 @@ const takeFrame = async ({ freePage, imageFormat, jpegQuality, frame, width, hei
         height,
         scale,
     });
-    return { buffer: buf, collectedAssets };
+    return buf;
 };
 exports.takeFrame = takeFrame;

package/package.json

@@ -3,7 +3,7 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/renderer"
   },
   "name": "@remotion/renderer",
-  "version": "4.0.347",
+  "version": "4.0.348",
   "description": "Render Remotion videos using Node.js or Bun",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,8 +18,8 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.17.1",
-    "@remotion/streaming": "4.0.347",
-    "remotion": "4.0.347"
+    "remotion": "4.0.348",
+    "@remotion/streaming": "4.0.348"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -33,17 +33,17 @@
     "react-dom": "19.0.0",
     "@types/ws": "8.5.10",
     "eslint": "9.19.0",
-    "@remotion/example-videos": "4.0.347",
-    "@remotion/eslint-config-internal": "4.0.347"
+    "@remotion/example-videos": "4.0.348",
+    "@remotion/eslint-config-internal": "4.0.348"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.347",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.347",
-    "@remotion/compositor-linux-arm64-musl": "4.0.347",
-    "@remotion/compositor-darwin-x64": "4.0.347",
-    "@remotion/compositor-linux-x64-musl": "4.0.347",
-    "@remotion/compositor-linux-x64-gnu": "4.0.347",
-    "@remotion/compositor-win32-x64-msvc": "4.0.347"
+    "@remotion/compositor-darwin-x64": "4.0.348",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.348",
+    "@remotion/compositor-linux-x64-gnu": "4.0.348",
+    "@remotion/compositor-linux-x64-musl": "4.0.348",
+    "@remotion/compositor-win32-x64-msvc": "4.0.348",
+    "@remotion/compositor-linux-arm64-musl": "4.0.348",
+    "@remotion/compositor-darwin-arm64": "4.0.348"
   },
   "keywords": [
     "remotion",