@remotion/renderer 4.0.125 → 4.0.127

package/dist/assets/convert-assets-to-file-urls.d.ts

@@ -1,9 +1,10 @@
 import type { TRenderAsset } from 'remotion/no-react';
 import type { LogLevel } from '../log-level';
+import type { FrameAndAssets } from '../render-frames';
 import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
 import type { DownloadMap } from './download-map';
 export declare const convertAssetsToFileUrls: ({ assets, onDownload, downloadMap, indent, logLevel, }: {
-    assets: TRenderAsset[][];
+    assets: FrameAndAssets[];
     onDownload: RenderMediaOnDownload;
     downloadMap: DownloadMap;
     indent: boolean;

package/dist/assets/convert-assets-to-file-urls.js

@@ -13,8 +13,8 @@ const convertAssetsToFileUrls = async ({ assets, onDownload, downloadMap, indent
     const chunks = chunk(assets, 1000);
     const results = [];
     for (const ch of chunks) {
-        const result = await Promise.all(ch.map((assetsForFrame) => {
-            return Promise.all(assetsForFrame.map((a) => {
+        const assetPromises = ch.map((frame) => {
+            const frameAssetPromises = frame.assets.map((a) => {
                 return (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
                     renderAsset: a,
                     onDownload,
@@ -22,8 +22,10 @@ const convertAssetsToFileUrls = async ({ assets, onDownload, downloadMap, indent
                     indent,
                     logLevel,
                 });
-            }));
-        }));
+            });
+            return Promise.all(frameAssetPromises);
+        });
+        const result = await Promise.all(assetPromises);
         results.push(result);
     }
     return results.flat(1);

package/dist/assets/download-map.d.ts

@@ -1,5 +1,5 @@
-import type { TRenderAsset } from 'remotion/no-react';
 import { OffthreadVideoServerEmitter } from '../offthread-video-server';
+import type { FrameAndAssets } from '../render-frames';
 import type { RenderMediaOnDownload } from './download-and-map-assets-to-file';
 export type AudioChannelsAndDurationResultCache = {
     channels: number;
@@ -41,10 +41,14 @@ export type DownloadMap = {
     isPreventedFromCleanup: () => boolean;
 };
 export type RenderAssetInfo = {
-    assets: TRenderAsset[][];
+    assets: FrameAndAssets[];
     imageSequenceName: string;
     firstFrameIndex: number;
     downloadMap: DownloadMap;
+    chunkLengthInSeconds: number;
+    trimLeftOffset: number;
+    trimRightOffset: number;
+    forSeamlessAacConcatenation: boolean;
 };
 export declare const makeDownloadMap: () => DownloadMap;
 export declare const cleanDownloadMap: (downloadMap: DownloadMap) => void;

package/dist/assets/ffmpeg-volume-expression.js

@@ -32,7 +32,7 @@ const ffmpegIsOneOfFrames = ({ frames, trimLeft, fps, }) => {
     })
         .join('+');
 };
-const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
+const ffmpegBuildVolumeExpression = ({ arr, delay, fps, }) => {
     if (arr.length === 0) {
         throw new Error('Volume array expression should never have length 0');
     }
@@ -41,7 +41,7 @@ const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
     }
     const [first, ...rest] = arr;
     const [volume, frames] = first;
-    return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression(rest, delay, fps));
+    return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression({ arr: rest, delay, fps }));
 };
 const ffmpegVolumeExpression = ({ volume, fps, trimLeft, allowAmplificationDuringRender, }) => {
     const maxVolume = allowAmplificationDuringRender ? Infinity : 1;
@@ -85,7 +85,11 @@ const ffmpegVolumeExpression = ({ volume, fps, trimLeft, allowAmplificationDurin
         .map((key) => [Number(key), volumeMap[key]])
         .sort((a, b) => a[1].length - b[1].length);
     // Construct and tell FFMPEG it has to evaluate expression on each frame
-    const expression = ffmpegBuildVolumeExpression(volumeArray, trimLeft, fps);
+    const expression = ffmpegBuildVolumeExpression({
+        arr: volumeArray,
+        delay: trimLeft,
+        fps,
+    });
     return {
         eval: 'frame',
         value: `'${expression}'`,

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

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

package/dist/calculate-ffmpeg-filters.js

@@ -2,36 +2,29 @@
 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, forSeamlessAacConcatenation, }) => {
+const calculateFfmpegFilter = ({ asset, fps, channels, assetDuration, trimLeftOffset, trimRightOffset, chunkLengthInSeconds, forSeamlessAacConcatenation, }) => {
     if (channels === 0) {
         return null;
     }
-    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;
+    const trimLeft = (asset.trimLeft * asset.playbackRate) / fps +
+        trimLeftOffset * asset.playbackRate;
+    const trimRight = trimLeft +
+        (asset.duration * asset.playbackRate) / fps +
+        trimRightOffset * asset.playbackRate;
     return (0, stringify_ffmpeg_filter_1.stringifyFfmpegFilter)({
         channels,
         startInVideo: asset.startInVideo,
-        trimLeft: assetTrimLeft,
-        trimRight: assetTrimRight,
+        trimLeft,
+        trimRight,
         volume: (0, flatten_volume_array_1.flattenVolumeArray)(asset.volume),
         fps,
         playbackRate: asset.playbackRate,
-        durationInFrames,
         assetDuration,
         allowAmplificationDuringRender: asset.allowAmplificationDuringRender,
         toneFrequency: asset.toneFrequency,
+        chunkLengthInSeconds,
+        forSeamlessAacConcatenation,
     });
 };
 exports.calculateFfmpegFilter = calculateFfmpegFilter;

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;