@remotion/renderer 4.0.131 → 4.0.133

package/dist/preprocess-audio-track.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preprocessAudioTrack = void 0;
+const flatten_volume_array_1 = require("./assets/flatten-volume-array");
 const get_audio_channels_1 = require("./assets/get-audio-channels");
-const calculate_ffmpeg_filters_1 = require("./calculate-ffmpeg-filters");
 const call_ffmpeg_1 = require("./call-ffmpeg");
 const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
 const logger_1 = require("./logger");
@@ -10,6 +10,7 @@ const p_limit_1 = require("./p-limit");
 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 preprocessAudioTrackUnlimited = async ({ outName, asset, fps, downloadMap, indent, logLevel, binariesDirectory, cancelSignal, onProgress, chunkLengthInSeconds, trimLeftOffset, trimRightOffset, forSeamlessAacConcatenation, }) => {
     var _a;
     const { channels, duration } = await (0, get_audio_channels_1.getAudioChannelsAndDuration)({
@@ -20,7 +21,7 @@ const preprocessAudioTrackUnlimited = async ({ outName, asset, fps, downloadMap,
         binariesDirectory,
         cancelSignal,
     });
-    const filter = (0, calculate_ffmpeg_filters_1.calculateFfmpegFilter)({
+    const filter = (0, stringify_ffmpeg_filter_1.stringifyFfmpegFilter)({
         asset,
         fps,
         channels,
@@ -29,6 +30,7 @@ const preprocessAudioTrackUnlimited = async ({ outName, asset, fps, downloadMap,
         trimLeftOffset,
         trimRightOffset,
         forSeamlessAacConcatenation,
+        volume: (0, flatten_volume_array_1.flattenVolumeArray)(asset.volume),
     });
     if (filter === null) {
         return null;

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

@@ -6,15 +6,11 @@ export type ProcessedTrack = {
     pad_start: string | null;
     pad_end: string | null;
 };
-export declare const stringifyFfmpegFilter: ({ channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, }: {
+export declare const stringifyFfmpegFilter: ({ channels, volume, fps, assetDuration, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, }: {
     channels: number;
-    startInVideo: number;
     volume: AssetVolume;
     fps: number;
-    playbackRate: number;
     assetDuration: number | null;
-    allowAmplificationDuringRender: boolean;
-    toneFrequency: number | null;
     chunkLengthInSeconds: number;
     forSeamlessAacConcatenation: boolean;
     trimLeftOffset: number;

package/dist/stringify-ffmpeg-filter.js

@@ -14,25 +14,22 @@ const stringifyTrim = (trim) => {
     }
     return asString;
 };
-const trimAndSetTempo = ({ playbackRate, forSeamlessAacConcatenation, assetDuration, asset, trimLeftOffset, trimRightOffset, fps, }) => {
+const trimAndSetTempo = ({ forSeamlessAacConcatenation, assetDuration, asset, trimLeftOffset, trimRightOffset, fps, }) => {
     // 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 trimLeft = (asset.trimLeft * asset.playbackRate) / fps +
-            trimLeftOffset * asset.playbackRate;
-        const trimRight = trimLeft +
-            (asset.duration * asset.playbackRate) / fps +
-            trimRightOffset * asset.playbackRate;
+        const trimLeft = (asset.trimLeft / fps + trimLeftOffset) / asset.playbackRate;
+        const trimRight = trimLeft + (asset.duration / fps + trimRightOffset) / asset.playbackRate;
         const trimRightOrAssetDuration = assetDuration
-            ? Math.min(trimRight, assetDuration * asset.playbackRate)
+            ? Math.min(trimRight, assetDuration / asset.playbackRate)
             : trimRight;
-        const actualTrimLeft = trimLeft / playbackRate;
-        const actualTrimRight = trimRightOrAssetDuration / playbackRate;
+        const actualTrimLeft = trimLeft * asset.playbackRate;
+        const actualTrimRight = trimRightOrAssetDuration * asset.playbackRate;
         return {
             filter: [
-                (0, calculate_atempo_1.calculateATempo)(playbackRate),
+                (0, calculate_atempo_1.calculateATempo)(asset.playbackRate),
                 `atrim=${stringifyTrim(actualTrimLeft)}:${stringifyTrim(actualTrimRight)}`,
             ],
             actualTrimLeft,
@@ -42,35 +39,36 @@ const trimAndSetTempo = ({ playbackRate, forSeamlessAacConcatenation, assetDurat
     // Otherwise, we first trim and then apply playback rate, as then the atempo
     // filter needs to do less work.
     if (!forSeamlessAacConcatenation) {
-        const trimLeft = asset.trimLeft / fps + trimLeftOffset * asset.playbackRate;
-        const trimRight = trimLeft + asset.duration / fps + trimRightOffset * asset.playbackRate;
+        const trimLeft = asset.trimLeft / fps;
+        const trimRight = (trimLeft + asset.duration / fps) * asset.playbackRate;
         const trimRightOrAssetDuration = assetDuration
             ? Math.min(trimRight, assetDuration)
             : trimRight;
+        const actualTrimLeft = trimLeft * asset.playbackRate;
         return {
             filter: [
-                `atrim=${stringifyTrim(trimLeft)}:${stringifyTrim(trimRightOrAssetDuration)}`,
-                (0, calculate_atempo_1.calculateATempo)(playbackRate),
+                `atrim=${stringifyTrim(actualTrimLeft)}:${stringifyTrim(trimRightOrAssetDuration)}`,
+                (0, calculate_atempo_1.calculateATempo)(asset.playbackRate),
             ],
-            actualTrimLeft: trimLeft,
-            audibleDuration: (trimRightOrAssetDuration - trimLeft) / playbackRate,
+            actualTrimLeft,
+            audibleDuration: (trimRightOrAssetDuration - actualTrimLeft) / asset.playbackRate,
         };
     }
     throw new Error('This should never happen');
 };
-const stringifyFfmpegFilter = ({ channels, startInVideo, volume, fps, playbackRate, assetDuration, allowAmplificationDuringRender, toneFrequency, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, }) => {
+const stringifyFfmpegFilter = ({ channels, volume, fps, assetDuration, chunkLengthInSeconds, forSeamlessAacConcatenation, trimLeftOffset, trimRightOffset, asset, }) => {
     if (channels === 0) {
         return null;
     }
+    const { toneFrequency, startInVideo, trimLeft, playbackRate } = asset;
     const startInVideoSeconds = startInVideo / fps;
-    if (assetDuration && asset.trimLeft / fps >= assetDuration) {
+    if (assetDuration && (trimLeft / fps) * playbackRate >= assetDuration) {
         return null;
     }
     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,
         trimLeftOffset,
@@ -82,7 +80,7 @@ const stringifyFfmpegFilter = ({ channels, startInVideo, volume, fps, playbackRa
         volume,
         fps,
         trimLeft: actualTrimLeft,
-        allowAmplificationDuringRender,
+        allowAmplificationDuringRender: asset.allowAmplificationDuringRender,
     });
     const padAtEnd = chunkLengthInSeconds - audibleDuration - startInVideoSeconds;
     // Set as few filters as possible, as combining them can create noise

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.131",
+  "version": "4.0.133",
   "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.131"
+    "remotion": "4.0.133"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-x64": "4.0.131",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.131",
-    "@remotion/compositor-darwin-arm64": "4.0.131",
-    "@remotion/compositor-linux-arm64-musl": "4.0.131",
-    "@remotion/compositor-linux-x64-musl": "4.0.131",
-    "@remotion/compositor-win32-x64-msvc": "4.0.131",
-    "@remotion/compositor-linux-x64-gnu": "4.0.131"
+    "@remotion/compositor-darwin-arm64": "4.0.133",
+    "@remotion/compositor-darwin-x64": "4.0.133",
+    "@remotion/compositor-linux-arm64-musl": "4.0.133",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.133",
+    "@remotion/compositor-linux-x64-gnu": "4.0.133",
+    "@remotion/compositor-linux-x64-musl": "4.0.133",
+    "@remotion/compositor-win32-x64-msvc": "4.0.133"
   },
   "keywords": [
     "remotion",