@remotion/renderer 3.3.60 → 3.3.62

package/dist/calculate-ffmpeg-filters.d.ts

@@ -1,8 +1,9 @@
 import type { MediaAsset } from './assets/types';
+import type { FilterWithoutPaddingApplied } from './stringify-ffmpeg-filter';
 export declare const calculateFfmpegFilter: ({ asset, fps, durationInFrames, channels, assetDuration, }: {
     asset: MediaAsset;
     fps: number;
     durationInFrames: number;
     channels: number;
     assetDuration: number | null;
-}) => string | null;
+}) => FilterWithoutPaddingApplied | null;

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -1,5 +1,15 @@
 import type { DownloadMap } from './assets/download-map';
-export declare const createFfmpegComplexFilter: (filters: number, downloadMap: DownloadMap) => Promise<{
-    complexFilterFlag: [string, string] | null;
+import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { PreprocessedAudioTrack } from './preprocess-audio-track';
+export declare const createFfmpegComplexFilter: ({ filters, downloadMap, ffmpegExecutable, remotionRoot, }: {
+    filters: PreprocessedAudioTrack[];
+    downloadMap: DownloadMap;
+    ffmpegExecutable: FfmpegExecutable;
+    remotionRoot: string;
+}) => Promise<{
+    complexFilterFlag: [
+        string,
+        string
+    ] | null;
     cleanup: () => void;
 }>;

package/dist/create-ffmpeg-complex-filter.js

@@ -3,12 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFfmpegComplexFilter = void 0;
 const create_ffmpeg_merge_filter_1 = require("./create-ffmpeg-merge-filter");
 const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
-const createFfmpegComplexFilter = async (filters, downloadMap) => {
-    if (filters === 0) {
+const createFfmpegComplexFilter = async ({ filters, downloadMap, ffmpegExecutable, remotionRoot, }) => {
+    if (filters.length === 0) {
         return { complexFilterFlag: null, cleanup: () => undefined };
     }
-    const complexFilter = (0, create_ffmpeg_merge_filter_1.createFfmpegMergeFilter)(filters);
-    const { file, cleanup } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(complexFilter, downloadMap);
+    const complexFilter = await (0, create_ffmpeg_merge_filter_1.createFfmpegMergeFilter)({
+        inputs: filters,
+        ffmpegExecutable,
+        remotionRoot,
+    });
+    const { file, cleanup } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFileStr)(complexFilter, downloadMap);
     return {
         complexFilterFlag: ['-filter_complex_script', file],
         cleanup,

package/dist/create-ffmpeg-merge-filter.d.ts

@@ -1 +1,8 @@
-export declare const createFfmpegMergeFilter: (inputs: number) => string;
+import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { PreprocessedAudioTrack } from './preprocess-audio-track';
+export declare const OUTPUT_FILTER_NAME = "outputaudio";
+export declare const createFfmpegMergeFilter: ({ inputs, ffmpegExecutable, remotionRoot, }: {
+    inputs: PreprocessedAudioTrack[];
+    ffmpegExecutable: FfmpegExecutable;
+    remotionRoot: string;
+}) => Promise<string>;

package/dist/create-ffmpeg-merge-filter.js

@@ -1,7 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFfmpegMergeFilter = void 0;
-const createFfmpegMergeFilter = (inputs) => {
-    return `[0:a][1:a]amix=inputs=${inputs},pan=stereo[a]`;
+exports.createFfmpegMergeFilter = exports.OUTPUT_FILTER_NAME = void 0;
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const truthy_1 = require("./truthy");
+exports.OUTPUT_FILTER_NAME = 'outputaudio';
+const createFfmpegMergeFilter = async ({ inputs, ffmpegExecutable, remotionRoot, }) => {
+    const ffmpegVersion = await (0, ffmpeg_flags_1.getFfmpegVersion)({
+        ffmpegExecutable,
+        remotionRoot,
+    });
+    const supportsNormalize = ffmpegVersion === null ||
+        (ffmpegVersion[0] === 4 && ffmpegVersion[1] >= 4) ||
+        ffmpegVersion[0] >= 5;
+    const pads = inputs.map((input, index) => {
+        const filters = [
+            input.filter.pad_start ? input.filter.pad_start : null,
+            input.filter.pad_end ? input.filter.pad_end : null,
+            'acopy',
+        ];
+        return `[${index}:a]${filters.filter(truthy_1.truthy).join(',')}[padded${index}]`;
+    });
+    const normalize = supportsNormalize ? ':normalize=0' : '';
+    return [
+        ...pads,
+        `${new Array(inputs.length)
+            .fill(true)
+            .map((_, i) => {
+            return `[padded${i}]`;
+        })
+            .join('')}amix=inputs=${inputs.length}:dropout_transition=0${normalize}[${exports.OUTPUT_FILTER_NAME}]`,
+    ].join(';');
 };
 exports.createFfmpegMergeFilter = createFfmpegMergeFilter;

package/dist/determine-resize-params.d.ts

@@ -1 +1,4 @@
-export declare const determineResizeParams: (needsResize: [number, number] | null) => string[];
+export declare const determineResizeParams: (needsResize: [
+    number,
+    number
+] | null) => string[];

package/dist/extract-frame-from-video.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

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

@@ -1,5 +1,10 @@
 import type { DownloadMap } from './assets/download-map';
-export declare const makeFfmpegFilterFile: (complexFilter: string, downloadMap: DownloadMap) => Promise<{
+import type { FilterWithoutPaddingApplied } from './stringify-ffmpeg-filter';
+export declare const makeFfmpegFilterFile: (complexFilter: FilterWithoutPaddingApplied, downloadMap: DownloadMap) => Promise<{
+    file: string;
+    cleanup: () => void;
+}>;
+export declare const makeFfmpegFilterFileStr: (complexFilter: string, downloadMap: DownloadMap) => Promise<{
     file: string;
     cleanup: () => void;
 }>;

package/dist/ffmpeg-filter-file.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeFfmpegFilterFile = void 0;
+exports.makeFfmpegFilterFileStr = exports.makeFfmpegFilterFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const makeFfmpegFilterFile = async (complexFilter, downloadMap) => {
     const random = Math.random().toString().replace('.', '');
     const filterFile = path_1.default.join(downloadMap.complexFilter, 'complex-filter-' + random + '.txt');
-    await fs_1.default.promises.writeFile(filterFile, complexFilter);
+    await fs_1.default.promises.writeFile(filterFile, complexFilter.filter);
     return {
         file: filterFile,
         cleanup: () => {
@@ -20,3 +20,15 @@ const makeFfmpegFilterFile = async (complexFilter, downloadMap) => {
     };
 };
 exports.makeFfmpegFilterFile = makeFfmpegFilterFile;
+const makeFfmpegFilterFileStr = async (complexFilter, downloadMap) => {
+    const random = Math.random().toString().replace('.', '');
+    const filterFile = path_1.default.join(downloadMap.complexFilter, 'complex-filter-' + random + '.txt');
+    await fs_1.default.promises.writeFile(filterFile, complexFilter);
+    return {
+        file: filterFile,
+        cleanup: () => {
+            fs_1.default.unlinkSync(filterFile);
+        },
+    };
+};
+exports.makeFfmpegFilterFileStr = makeFfmpegFilterFileStr;

package/dist/get-frame-of-video-slow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';
@@ -8,7 +7,10 @@ export declare const getFrameOfVideoSlow: ({ src, duration, ffmpegExecutable, im
     duration: number;
     imageFormat: OffthreadVideoImageFormat;
     specialVCodecForTransparency: SpecialVCodecForTransparency;
-    needsResize: [number, number] | null;
+    needsResize: [
+        number,
+        number
+    ] | null;
     offset: number;
     fps: number | null;
     remotionRoot: string;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';

package/dist/last-frame-from-video-cache.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/merge-audio-track.d.ts

@@ -1,8 +1,9 @@
 import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { PreprocessedAudioTrack } from './preprocess-audio-track';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
-    files: string[];
+    files: PreprocessedAudioTrack[];
     outName: string;
     numberOfSeconds: number;
     downloadMap: DownloadMap;

package/dist/merge-audio-track.js

@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeAudioTrack = void 0;
 const execa_1 = __importDefault(require("execa"));
+const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const chunk_1 = require("./chunk");
-const convert_to_pcm_1 = require("./convert-to-pcm");
 const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
+const create_ffmpeg_merge_filter_1 = require("./create-ffmpeg-merge-filter");
 const create_silent_audio_1 = require("./create-silent-audio");
 const delete_directory_1 = require("./delete-directory");
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
@@ -26,12 +27,7 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
         return;
     }
     if (files.length === 1) {
-        await (0, convert_to_pcm_1.convertToPcm)({
-            outName,
-            ffmpegExecutable,
-            input: files[0],
-            remotionRoot,
-        });
+        (0, fs_1.copyFileSync)(files[0].outName, outName);
         return;
     }
     // In FFMPEG, the total number of left and right tracks that can be merged at one time is limited to 64
@@ -53,7 +49,13 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             }));
             await (0, exports.mergeAudioTrack)({
                 ffmpegExecutable,
-                files: chunkNames,
+                files: chunkNames.map((c) => ({
+                    filter: {
+                        pad_end: null,
+                        pad_start: null,
+                    },
+                    outName: c,
+                })),
                 numberOfSeconds,
                 outName,
                 downloadMap,
@@ -65,12 +67,17 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             (0, delete_directory_1.deleteDirectory)(tempPath);
         }
     }
-    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length, downloadMap);
+    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)({
+        filters: files,
+        downloadMap,
+        ffmpegExecutable,
+        remotionRoot,
+    });
     const args = [
-        ...files.map((f) => ['-i', f]),
+        ...files.map((f) => ['-i', f.outName]),
         mergeFilter,
         ['-c:a', 'pcm_s16le'],
-        ['-map', '[a]'],
+        ['-map', `[${create_ffmpeg_merge_filter_1.OUTPUT_FILTER_NAME}]`],
         ['-y', outName],
     ]
         .filter(truthy_1.truthy)

package/dist/preprocess-audio-track.d.ts

@@ -1,6 +1,7 @@
 import type { DownloadMap } from './assets/download-map';
 import type { MediaAsset } from './assets/types';
 import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { ProcessedTrack } from './stringify-ffmpeg-filter';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
     ffprobeExecutable: FfmpegExecutable;
@@ -11,5 +12,9 @@ declare type Options = {
     downloadMap: DownloadMap;
     remotionRoot: string;
 };
-export declare const preprocessAudioTrack: (options: Options) => Promise<string | null>;
+export declare type PreprocessedAudioTrack = {
+    outName: string;
+    filter: ProcessedTrack;
+};
+export declare const preprocessAudioTrack: (options: Options) => Promise<PreprocessedAudioTrack | null>;
 export {};

package/dist/preprocess-audio-track.js

@@ -11,6 +11,7 @@ const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const p_limit_1 = require("./p-limit");
 const resolve_asset_src_1 = require("./resolve-asset-src");
+const sample_rate_1 = require("./sample-rate");
 const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutable, outName, asset, expectedFrames, fps, downloadMap, remotionRoot, }) => {
     const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)(downloadMap, (0, resolve_asset_src_1.resolveAssetSrc)(asset.src), ffprobeExecutable, remotionRoot);
     const filter = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilter)({
@@ -29,11 +30,12 @@ const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutab
         ['-ac', '2'],
         ['-filter_script:a', file],
         ['-c:a', 'pcm_s16le'],
+        ['-ar', String(sample_rate_1.DEFAULT_SAMPLE_RATE)],
         ['-y', outName],
     ].flat(2);
     await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), args);
     cleanup();
-    return outName;
+    return { outName, filter };
 };
 const limit = (0, p_limit_1.pLimit)(2);
 const preprocessAudioTrack = (options) => {

package/dist/provide-screenshot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';

package/dist/puppeteer-screenshot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 export declare const screenshot: (options: {

package/dist/render-media.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';

package/dist/screenshot-dom-element.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { ImageFormat } from './image-format';

package/dist/screenshot-task.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { ClipRegion } from 'remotion';
 import type { Page } from './browser/BrowserPage';
 import type { StillImageFormat } from './image-format';

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

@@ -102,7 +102,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     onProgress(1);
     (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     preprocessed.forEach((p) => {
-        (0, delete_directory_1.deleteDirectory)(p);
+        (0, delete_directory_1.deleteDirectory)(p.outName);
     });
     return outName;
 };

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

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

package/dist/stringify-ffmpeg-filter.js

@@ -23,37 +23,38 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
         : trimRight;
     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}`,
-            // Order matters! First trim the audio
-            `atrim=${trimLeft.toFixed(6)}:${actualTrimRight.toFixed(6)}`,
-            // then set the tempo
-            (0, calculate_atempo_1.calculateATempo)(playbackRate),
-            // set the volume if needed
-            // The timings for volume must include whatever is in atrim, unless the volume
-            // filter gets applied before atrim
-            volumeFilter.value === '1'
-                ? null
-                : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
-            // For n channels, we delay n + 1 channels.
-            // This is because `ffprobe` for some audio files reports the wrong amount
-            // of channels.
-            // This should be fine because FFMPEG documentation states:
-            // "Unused delays will be silently ignored."
-            // https://ffmpeg.org/ffmpeg-filters.html#adelay
-            startInVideoSeconds === 0
-                ? null
-                : `adelay=${new Array(channels + 1)
-                    .fill((startInVideoSeconds * 1000).toFixed(0))
-                    .join('|')}`,
-            // Only in the end, we pad to the full length.
-            padAtEnd > 0.0000001
-                ? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)
-                : null,
-        ]
-            .filter(truthy_1.truthy)
-            .join(',') +
-        `[a0]`);
+    return {
+        filter: `[0:a]` +
+            [
+                `aformat=sample_fmts=s32:sample_rates=${sample_rate_1.DEFAULT_SAMPLE_RATE}`,
+                // Order matters! First trim the audio
+                `atrim=${trimLeft.toFixed(6)}:${actualTrimRight.toFixed(6)}`,
+                // then set the tempo
+                (0, calculate_atempo_1.calculateATempo)(playbackRate),
+                // set the volume if needed
+                // The timings for volume must include whatever is in atrim, unless the volume
+                // filter gets applied before atrim
+                volumeFilter.value === '1'
+                    ? null
+                    : `volume=${volumeFilter.value}:eval=${volumeFilter.eval}`,
+                // For n channels, we delay n + 1 channels.
+                // This is because `ffprobe` for some audio files reports the wrong amount
+                // of channels.
+                // This should be fine because FFMPEG documentation states:
+                // "Unused delays will be silently ignored."
+                // https://ffmpeg.org/ffmpeg-filters.html#adelay
+            ]
+                .filter(truthy_1.truthy)
+                .join(',') +
+            `[a0]`,
+        pad_end: padAtEnd > 0.0000001
+            ? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)
+            : null,
+        pad_start: startInVideoSeconds === 0
+            ? null
+            : `adelay=${new Array(channels + 1)
+                .fill((startInVideoSeconds * 1000).toFixed(0))
+                .join('|')}`,
+    };
 };
 exports.stringifyFfmpegFilter = stringifyFfmpegFilter;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { TAsset } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { Page } from './browser/BrowserPage';

package/dist/try-to-extract-frame-of-video-fast.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { NeedsResize, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.60",
+	"version": "3.3.62",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.3.60",
+		"remotion": "3.3.62",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -49,13 +49,13 @@
 		"vitest": "0.24.3"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "3.3.60",
-		"@remotion/compositor-darwin-x64": "3.3.60",
-		"@remotion/compositor-linux-arm64-gnu": "3.3.60",
-		"@remotion/compositor-linux-arm64-musl": "3.3.60",
-		"@remotion/compositor-linux-x64-gnu": "3.3.60",
-		"@remotion/compositor-linux-x64-musl": "3.3.60",
-		"@remotion/compositor-win32-x64-msvc": "3.3.60"
+		"@remotion/compositor-darwin-arm64": "3.3.62",
+		"@remotion/compositor-darwin-x64": "3.3.62",
+		"@remotion/compositor-linux-arm64-gnu": "3.3.62",
+		"@remotion/compositor-linux-arm64-musl": "3.3.62",
+		"@remotion/compositor-linux-x64-gnu": "3.3.62",
+		"@remotion/compositor-linux-x64-musl": "3.3.62",
+		"@remotion/compositor-win32-x64-msvc": "3.3.62"
 	},
 	"keywords": [
 		"remotion",
@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "60797b0861ef1017cec53ba656214cbc10db011b"
+	"gitHead": "8fb0700ad70d5feca5fa86c414434757d323292a"
 }