@remotion/renderer 4.0.121 → 4.0.123

package/dist/assets/get-audio-channels.d.ts

@@ -1,10 +1,18 @@
 import type { LogLevel } from '../log-level';
+import type { CancelSignal } from '../make-cancel-signal';
 import type { AudioChannelsAndDurationResultCache, DownloadMap } from './download-map';
-export declare const getAudioChannelsAndDurationWithoutCache: (src: string, indent: boolean, logLevel: LogLevel, binariesDirectory: string | null) => Promise<AudioChannelsAndDurationResultCache>;
-export declare const getAudioChannelsAndDuration: ({ downloadMap, src, indent, logLevel, binariesDirectory, }: {
+export declare const getAudioChannelsAndDurationWithoutCache: ({ src, indent, logLevel, binariesDirectory, cancelSignal, }: {
+    src: string;
+    indent: boolean;
+    logLevel: LogLevel;
+    binariesDirectory: string | null;
+    cancelSignal: CancelSignal | undefined;
+}) => Promise<AudioChannelsAndDurationResultCache>;
+export declare const getAudioChannelsAndDuration: ({ downloadMap, src, indent, logLevel, binariesDirectory, cancelSignal, }: {
     downloadMap: DownloadMap;
     src: string;
     indent: boolean;
     logLevel: LogLevel;
     binariesDirectory: string | null;
+    cancelSignal: CancelSignal | undefined;
 }) => Promise<AudioChannelsAndDurationResultCache>;

package/dist/assets/get-audio-channels.js

@@ -4,7 +4,7 @@ exports.getAudioChannelsAndDuration = exports.getAudioChannelsAndDurationWithout
 const call_ffmpeg_1 = require("../call-ffmpeg");
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-const getAudioChannelsAndDurationWithoutCache = async (src, indent, logLevel, binariesDirectory) => {
+const getAudioChannelsAndDurationWithoutCache = async ({ src, indent, logLevel, binariesDirectory, cancelSignal, }) => {
     const args = [
         ['-v', 'error'],
         ['-show_entries', 'stream=channels:format=duration'],
@@ -19,6 +19,7 @@ const getAudioChannelsAndDurationWithoutCache = async (src, indent, logLevel, bi
         indent,
         logLevel,
         binariesDirectory,
+        cancelSignal,
     });
     const channels = task.stdout.match(/channels=([0-9]+)/);
     const duration = task.stdout.match(/duration=([0-9.]+)/);
@@ -29,21 +30,28 @@ const getAudioChannelsAndDurationWithoutCache = async (src, indent, logLevel, bi
     return result;
 };
 exports.getAudioChannelsAndDurationWithoutCache = getAudioChannelsAndDurationWithoutCache;
-async function getAudioChannelsAndDurationUnlimited({ downloadMap, src, indent, logLevel, binariesDirectory, }) {
+async function getAudioChannelsAndDurationUnlimited({ downloadMap, src, indent, logLevel, binariesDirectory, cancelSignal, }) {
     if (downloadMap.durationOfAssetCache[src]) {
         return downloadMap.durationOfAssetCache[src];
     }
-    const result = await (0, exports.getAudioChannelsAndDurationWithoutCache)(src, indent, logLevel, binariesDirectory);
+    const result = await (0, exports.getAudioChannelsAndDurationWithoutCache)({
+        src,
+        indent,
+        logLevel,
+        binariesDirectory,
+        cancelSignal,
+    });
     downloadMap.durationOfAssetCache[src] = result;
     return result;
 }
-const getAudioChannelsAndDuration = ({ downloadMap, src, indent, logLevel, binariesDirectory, }) => {
+const getAudioChannelsAndDuration = ({ downloadMap, src, indent, logLevel, binariesDirectory, cancelSignal, }) => {
     return limit(() => getAudioChannelsAndDurationUnlimited({
         downloadMap,
         src,
         indent,
         logLevel,
         binariesDirectory,
+        cancelSignal,
     }));
 };
 exports.getAudioChannelsAndDuration = getAudioChannelsAndDuration;

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

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

package/dist/calculate-ffmpeg-filters.js

@@ -2,13 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateFfmpegFilter = void 0;
 const flatten_volume_array_1 = require("./assets/flatten-volume-array");
+const combine_audio_1 = require("./combine-audio");
+const sample_rate_1 = require("./sample-rate");
 const stringify_ffmpeg_filter_1 = require("./stringify-ffmpeg-filter");
-const calculateFfmpegFilter = ({ asset, fps, durationInFrames, channels, assetDuration, }) => {
+const calculateFfmpegFilter = ({ asset, fps, durationInFrames, channels, assetDuration, forSeamlessAacConcatenation, }) => {
     if (channels === 0) {
         return null;
     }
-    const assetTrimLeft = (asset.trimLeft * asset.playbackRate) / fps;
-    const assetTrimRight = assetTrimLeft + (asset.duration * asset.playbackRate) / fps;
+    const assetTrimLeft = forSeamlessAacConcatenation
+        ? Math.max(0, (0, combine_audio_1.getClosestAlignedTime)(((asset.trimLeft * asset.playbackRate) / fps) * 1000000) /
+            1000000 -
+            2 * (1024 / sample_rate_1.DEFAULT_SAMPLE_RATE))
+        : (asset.trimLeft * asset.playbackRate) / fps;
+    const assetTrimRight = forSeamlessAacConcatenation
+        ? (0, combine_audio_1.getClosestAlignedTime)(((asset.trimLeft + asset.duration * asset.playbackRate) / fps) *
+            1000000) /
+            1000000 +
+            2 * (1024 / sample_rate_1.DEFAULT_SAMPLE_RATE)
+        : assetTrimLeft + (asset.duration * asset.playbackRate) / fps;
     return (0, stringify_ffmpeg_filter_1.stringifyFfmpegFilter)({
         channels,
         startInVideo: asset.startInVideo,

package/dist/call-ffmpeg.d.ts

@@ -2,19 +2,22 @@
 import execa from 'execa';
 import type { SpawnOptionsWithoutStdio } from 'node:child_process';
 import type { LogLevel } from './log-level';
-export declare const callFf: ({ args, bin, indent, logLevel, options, binariesDirectory, }: {
+import type { CancelSignal } from './make-cancel-signal';
+export declare const callFf: ({ args, bin, indent, logLevel, options, binariesDirectory, cancelSignal, }: {
     bin: 'ffmpeg' | 'ffprobe';
     args: (string | null)[];
     indent: boolean;
     logLevel: LogLevel;
     binariesDirectory: string | null;
+    cancelSignal: CancelSignal | undefined;
     options?: execa.Options<string> | undefined;
 }) => execa.ExecaChildProcess<string>;
-export declare const callFfNative: ({ args, bin, indent, logLevel, options, binariesDirectory, }: {
+export declare const callFfNative: ({ args, bin, indent, logLevel, options, binariesDirectory, cancelSignal, }: {
     bin: 'ffmpeg' | 'ffprobe';
     args: (string | null)[];
     indent: boolean;
     logLevel: LogLevel;
     binariesDirectory: string | null;
+    cancelSignal: CancelSignal | undefined;
     options?: SpawnOptionsWithoutStdio | undefined;
 }) => import("child_process").ChildProcessWithoutNullStreams;

package/dist/call-ffmpeg.js

@@ -6,39 +6,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.callFfNative = exports.callFf = void 0;
 const execa_1 = __importDefault(require("execa"));
 const node_child_process_1 = require("node:child_process");
-const node_fs_1 = require("node:fs");
 const path_1 = __importDefault(require("path"));
 const get_executable_path_1 = require("./compositor/get-executable-path");
+const make_file_executable_1 = require("./compositor/make-file-executable");
 const truthy_1 = require("./truthy");
-const callFf = ({ args, bin, indent, logLevel, options, binariesDirectory, }) => {
+const callFf = ({ args, bin, indent, logLevel, options, binariesDirectory, cancelSignal, }) => {
     const executablePath = (0, get_executable_path_1.getExecutablePath)({
         type: bin,
         indent,
         logLevel,
         binariesDirectory,
     });
-    if (!process.env.READ_ONLY_FS) {
-        (0, node_fs_1.chmodSync)(executablePath, 0o755);
-    }
-    return (0, execa_1.default)(executablePath, args.filter(truthy_1.truthy), {
+    (0, make_file_executable_1.makeFileExecutableIfItIsNot)(executablePath);
+    const task = (0, execa_1.default)(executablePath, args.filter(truthy_1.truthy), {
         cwd: path_1.default.dirname(executablePath),
         ...options,
     });
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+        task.kill();
+    });
+    return task;
 };
 exports.callFf = callFf;
-const callFfNative = ({ args, bin, indent, logLevel, options, binariesDirectory, }) => {
+const callFfNative = ({ args, bin, indent, logLevel, options, binariesDirectory, cancelSignal, }) => {
     const executablePath = (0, get_executable_path_1.getExecutablePath)({
         type: bin,
         indent,
         logLevel,
         binariesDirectory,
     });
-    if (!process.env.READ_ONLY_FS) {
-        (0, node_fs_1.chmodSync)(executablePath, 0o755);
-    }
-    return (0, node_child_process_1.spawn)(executablePath, args.filter(truthy_1.truthy), {
+    (0, make_file_executable_1.makeFileExecutableIfItIsNot)(executablePath);
+    const task = (0, node_child_process_1.spawn)(executablePath, args.filter(truthy_1.truthy), {
         cwd: path_1.default.dirname(executablePath),
         ...options,
     });
+    cancelSignal === null || cancelSignal === void 0 ? void 0 : cancelSignal(() => {
+        task.kill();
+    });
+    return task;
 };
 exports.callFfNative = callFfNative;

package/dist/can-use-parallel-encoding.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canUseParallelEncoding = void 0;
-const is_audio_codec_1 = require("./is-audio-codec");
+const audio_codec_1 = require("./options/audio-codec");
 const canUseParallelEncoding = (codec) => {
-    if ((0, is_audio_codec_1.isAudioCodec)(codec)) {
+    if ((0, audio_codec_1.isAudioCodec)(codec)) {
         return false;
     }
     return codec === 'h264' || codec === 'h264-mkv' || codec === 'h265';

package/dist/check-apple-silicon.d.ts

@@ -1,3 +1 @@
-import type { LogLevel } from './log-level';
-export declare const gLibCErrorMessage: (libCString: string) => string | null;
-export declare const checkNodeVersionAndWarnAboutRosetta: (logLevel: LogLevel, indent: boolean) => void;
+export declare const checkNodeVersionAndWarnAboutRosetta: () => void;

package/dist/check-apple-silicon.js

@@ -1,42 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkNodeVersionAndWarnAboutRosetta = exports.gLibCErrorMessage = void 0;
-const logger_1 = require("./logger");
-const gLibCErrorMessage = (libCString) => {
-    const split = libCString.split('.');
-    if (split.length !== 2) {
-        return null;
-    }
-    if (split[0] === '2' && Number(split[1]) >= 35) {
-        return null;
-    }
-    if (Number(split[0]) > 2) {
-        return null;
-    }
-    return `Rendering videos requires glibc 2.35 or higher. Your system has glibc ${libCString}.`;
-};
-exports.gLibCErrorMessage = gLibCErrorMessage;
-const checkLibCRequirement = (logLevel, indent) => {
-    const { report } = process;
-    if (report) {
-        // @ts-expect-error no types
-        const { glibcVersionRuntime } = report.getReport().header;
-        if (!glibcVersionRuntime) {
-            return;
-        }
-        const error = (0, exports.gLibCErrorMessage)(glibcVersionRuntime);
-        if (error) {
-            logger_1.Log.warn({ logLevel, indent }, error);
-        }
-    }
-};
-const checkNodeVersionAndWarnAboutRosetta = (logLevel, indent) => {
+exports.checkNodeVersionAndWarnAboutRosetta = void 0;
+const checkNodeVersionAndWarnAboutRosetta = () => {
     const version = process.version.replace('v', '').split('.');
     const majorVersion = Number(version[0]);
     const requiredNodeVersion = 16;
     if (majorVersion < 16) {
         throw new Error(`Remotion requires at least Node ${requiredNodeVersion}. You currently have ${process.version}. Update your node version to ${requiredNodeVersion} to use Remotion.`);
     }
-    checkLibCRequirement(logLevel, indent);
 };
 exports.checkNodeVersionAndWarnAboutRosetta = checkNodeVersionAndWarnAboutRosetta;