@remotion/renderer 3.0.9 → 3.0.10

package/dist/assets/ffmpeg-volume-expression.d.ts

@@ -4,9 +4,10 @@ declare type FfmpegVolumeExpression = {
     eval: FfmpegEval;
     value: string;
 };
-export declare const ffmpegVolumeExpression: ({ volume, startInVideo, fps, }: {
+export declare const ffmpegVolumeExpression: ({ volume, startInVideo, fps, trimLeft, }: {
     volume: AssetVolume;
     startInVideo: number;
+    trimLeft: number;
     fps: number;
 }) => FfmpegVolumeExpression;
 export {};

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

@@ -12,7 +12,7 @@ const FFMPEG_TIME_VARIABLE = 't';
 const ffmpegIfOrElse = (condition, then, elseDo) => {
     return `if(${condition},${then},${elseDo})`;
 };
-const ffmpegIsOneOfFrames = (frames, fps) => {
+const ffmpegIsOneOfFrames = ({ frames, trimLeft, fps, }) => {
     const consecutiveArrays = [];
     for (let i = 0; i < frames.length; i++) {
         const previousFrame = frames[i - 1];
@@ -28,11 +28,11 @@ const ffmpegIsOneOfFrames = (frames, fps) => {
         const lastFrame = f[f.length - 1];
         const before = (firstFrame - 0.5) / fps;
         const after = (lastFrame + 0.5) / fps;
-        return `between(${FFMPEG_TIME_VARIABLE},${before.toFixed(4)},${after.toFixed(4)})`;
+        return `between(${FFMPEG_TIME_VARIABLE},${(before + trimLeft).toFixed(4)},${(after + trimLeft).toFixed(4)})`;
     })
         .join('+');
 };
-const ffmpegBuildVolumeExpression = (arr, fps) => {
+const ffmpegBuildVolumeExpression = (arr, delay, fps) => {
     if (arr.length === 0) {
         throw new Error('Volume array expression should never have length 0');
     }
@@ -40,13 +40,13 @@ const ffmpegBuildVolumeExpression = (arr, fps) => {
         // FFMpeg tends to request volume for frames outside the range
         // where the audio actually plays.
         // If this is the case, we just return volume 0 to clip it.
-        return ffmpegIfOrElse(ffmpegIsOneOfFrames(arr[0][1], fps), String(arr[0][0]), String(0));
+        return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames: arr[0][1], trimLeft: delay, fps }), String(arr[0][0]), String(0));
     }
     const [first, ...rest] = arr;
     const [volume, frames] = first;
-    return ffmpegIfOrElse(ffmpegIsOneOfFrames(frames, fps), String(volume), ffmpegBuildVolumeExpression(rest, fps));
+    return ffmpegIfOrElse(ffmpegIsOneOfFrames({ frames, trimLeft: delay, fps }), String(volume), ffmpegBuildVolumeExpression(rest, delay, fps));
 };
-const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
+const ffmpegVolumeExpression = ({ volume, startInVideo, fps, trimLeft, }) => {
     // If it's a static volume, we return it and tell
     // FFMPEG it only has to evaluate it once
     if (typeof volume === 'number') {
@@ -60,6 +60,7 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
             volume: volume[0],
             startInVideo,
             fps,
+            trimLeft,
         });
     }
     // Otherwise, we construct an FFMPEG expression. First step:
@@ -81,7 +82,7 @@ const ffmpegVolumeExpression = ({ volume, startInVideo, fps, }) => {
         .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, fps);
+    const expression = ffmpegBuildVolumeExpression(volumeArray, trimLeft, fps);
     return {
         eval: 'frame',
         value: `'${expression}'`,

package/dist/combine-videos.js

@@ -28,6 +28,8 @@ const combineVideos = async ({ files, filelistDir, output, onProgress, numberOfF
             remotion_1.Internals.isAudioCodec(codec) ? null : 'copy',
             '-c:a',
             (0, get_audio_codec_name_1.getAudioCodecName)(codec),
+            codec === 'h264' ? '-movflags' : null,
+            codec === 'h264' ? 'faststart' : null,
             '-shortest',
             '-y',
             output,

package/dist/offthread/index.js

@@ -0,0 +1 @@
+"use strict";

package/dist/prespawn-ffmpeg.js

@@ -57,15 +57,13 @@ const prespawnFfmpeg = async (options) => {
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...[
-            proResProfileName ? ['-profile:v', proResProfileName] : null,
-            supportsCrf ? ['-crf', String(crf)] : null,
-            ['-pix_fmt', pixelFormat],
-            // Without explicitly disabling auto-alt-ref,
-            // transparent WebM generation doesn't work
-            pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
-            ['-b:v', '1M'],
-        ],
+        proResProfileName ? ['-profile:v', proResProfileName] : null,
+        supportsCrf ? ['-crf', String(crf)] : null,
+        ['-pix_fmt', pixelFormat],
+        // Without explicitly disabling auto-alt-ref,
+        // transparent WebM generation doesn't work
+        pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
+        ['-b:v', '1M'],
         '-y',
         options.outputLocation,
     ];

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

@@ -160,6 +160,7 @@ const spawnFfmpeg = async (options) => {
                 pixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,
                 ['-b:v', '1M'],
             ]),
+        codec === 'h264' ? ['-movflags', 'faststart'] : null,
         audioCodecName ? ['-c:a', audioCodecName] : null,
         // Ignore metadata that may come from remote media
         ['-map_metadata', '-1'],

package/dist/stringify-ffmpeg-filter.js

@@ -11,6 +11,7 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
         volume,
         startInVideo,
         fps,
+        trimLeft,
     });
     // Avoid setting filters if possible, as combining them can create noise
     const chunkLength = durationInFrames / fps;
@@ -37,6 +38,8 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
                     .fill((startInVideoSeconds * 1000).toFixed(0))
                     .join('|')}`,
             // 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}`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.0.9",
+	"version": "3.0.10",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -20,10 +20,10 @@
 		"url": "https://github.com/remotion-dev/remotion/issues"
 	},
 	"dependencies": {
-		"@remotion/bundler": "3.0.9",
+		"@remotion/bundler": "3.0.10",
 		"execa": "5.1.1",
 		"puppeteer-core": "13.5.1",
-		"remotion": "3.0.9",
+		"remotion": "3.0.10",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -60,5 +60,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "46fcf0f5b12f2ba861eac423a2891ef38242ceeb"
+	"gitHead": "3ae18de4dd2dda522e37a04c0a5c225f2a94e3a1"
 }