🎥 Make videos programmatically with React
@remotion/renderer: Guard VP9 row multithreading
JonnyBurgerdb1a6e99c35d
diff --git a/packages/renderer/src/ffmpeg-args.ts b/packages/renderer/src/ffmpeg-args.tsindex e96fb5756e..ddb67ba73d 100644--- a/packages/renderer/src/ffmpeg-args.ts+++ b/packages/renderer/src/ffmpeg-args.ts@@ -23,6 +23,8 @@ const firstEncodingStepOnly = ({encodingBufferSize,hardwareAcceleration,hardwareAccelerated,+ cpuCount,+ lambdaMemoryInBytes,}: {hasPreencoded: boolean;proResProfileName: string | null;@@ -36,6 +38,8 @@ const firstEncodingStepOnly = ({encodingBufferSize: string | null;hardwareAcceleration: HardwareAccelerationOption;hardwareAccelerated: boolean;+ cpuCount: number;+ lambdaMemoryInBytes: number | null;}): string[][] => {if (hasPreencoded || codec === 'gif') {return [];@@ -51,8 +55,15 @@ const firstEncodingStepOnly = ({// transparent WebM generation doesn't workpixelFormat === 'yuva420p' ? ['-auto-alt-ref', '0'] : null,// Without row-based multithreading, libvpx only splits VP9 work by- // tile columns (4 at 1080p), which leaves most cores idle- codec === 'vp9' ? ['-row-mt', '1'] : null,+ // tile columns (4 at 1080p), which leaves most cores idle. It is slower+ // with 2 CPUs outside Lambda. On Lambda, it is faster with the default+ // 2048 MB allocation even though only 2 CPUs are reported.+ codec === 'vp9' &&+ (cpuCount > 2 ||+ (lambdaMemoryInBytes !== null &&+ lambdaMemoryInBytes >= 2048 * 1024 * 1024))+ ? ['-row-mt', '1']+ : null,x264Preset ? ['-preset', x264Preset] : null,gopSize === null ? null : ['-g', String(gopSize)],// Apply a fixed a timescale across all environments:@@ -85,6 +96,8 @@ export const generateFfmpegArgs = ({hardwareAcceleration,indent,logLevel,+ cpuCount,+ lambdaMemoryInBytes,}: {hasPreencoded: boolean;proResProfileName: string | null;@@ -100,6 +113,8 @@ export const generateFfmpegArgs = ({hardwareAcceleration: HardwareAccelerationOption;indent: boolean;logLevel: LogLevel;+ cpuCount: number;+ lambdaMemoryInBytes: number | null;}): string[][] => {const encoderSettings = getCodecName({codec,@@ -184,6 +199,8 @@ export const generateFfmpegArgs = ({gopSize,hardwareAcceleration,hardwareAccelerated,+ cpuCount,+ lambdaMemoryInBytes,}),].filter(truthy);};diff --git a/packages/renderer/src/prespawn-ffmpeg.ts b/packages/renderer/src/prespawn-ffmpeg.tsindex a91dbddd4a..516400388e 100644--- a/packages/renderer/src/prespawn-ffmpeg.ts+++ b/packages/renderer/src/prespawn-ffmpeg.ts@@ -6,11 +6,13 @@ import type {Codec} from './codec';import {DEFAULT_CODEC} from './codec';import {generateFfmpegArgs} from './ffmpeg-args';import type {FfmpegOverrideFn} from './ffmpeg-override';+import {getCpuCount} from './get-cpu-count';import {getProResProfileName} from './get-prores-profile-name';import type {VideoImageFormat} from './image-format';import type {LogLevel} from './log-level';import {Log} from './logger';import type {CancelSignal} from './make-cancel-signal';+import {getMaxLambdaMemory} from './memory/from-lambda-env';import type {ColorSpace} from './options/color-space';import type {X264Preset} from './options/x264-preset';import {parseFfmpegProgress} from './parse-ffmpeg-progress';@@ -129,6 +131,8 @@ export const prespawnFfmpeg = (options: PreStitcherOptions) => {hardwareAcceleration: resolvedHardwareAcceleration,indent: options.indent,logLevel: options.logLevel,+ cpuCount: getCpuCount(),+ lambdaMemoryInBytes: getMaxLambdaMemory(),}),'-y',diff --git a/packages/renderer/src/stitch-frames-to-video.ts b/packages/renderer/src/stitch-frames-to-video.tsindex aaca541b82..0639c38b44 100644--- a/packages/renderer/src/stitch-frames-to-video.ts+++ b/packages/renderer/src/stitch-frames-to-video.ts@@ -18,6 +18,7 @@ import {generateFfmpegArgs} from './ffmpeg-args';import type {FfmpegOverrideFn} from './ffmpeg-override';import {finalizeFastStart} from './finalize-fast-start';import {findRemotionRoot} from './find-closest-package-json';+import {getCpuCount} from './get-cpu-count';import {getFileExtensionFromCodec} from './get-extension-from-codec';import {getExtensionOfFilename} from './get-extension-of-filename';import {getFastStartMuxer} from './get-fast-start-muxer';@@ -27,6 +28,7 @@ import {Log} from './logger';import type {CancelSignal} from './make-cancel-signal';import {cancelErrorMessages} from './make-cancel-signal';import {makeMetadataArgs} from './make-metadata-args';+import {getMaxLambdaMemory} from './memory/from-lambda-env';import type {AudioCodec} from './options/audio-codec';import {resolveAudioCodec} from './options/audio-codec';import {DEFAULT_COLOR_SPACE, type ColorSpace} from './options/color-space';@@ -427,6 +429,8 @@ const innerStitchFramesToVideo = async (hardwareAcceleration: resolvedHardwareAcceleration,indent,logLevel,+ cpuCount: getCpuCount(),+ lambdaMemoryInBytes: getMaxLambdaMemory(),}),// Ignore metadata that may come from remote media['-map_metadata', '-1'],diff --git a/packages/renderer/src/test/ffmpeg-args.test.ts b/packages/renderer/src/test/ffmpeg-args.test.tsindex 1648a7f145..75fad5b9bb 100644--- a/packages/renderer/src/test/ffmpeg-args.test.ts+++ b/packages/renderer/src/test/ffmpeg-args.test.ts@@ -39,6 +39,8 @@ const makeArgs = ({hardwareAcceleration,indent: false,logLevel: 'info',+ cpuCount: 4,+ lambdaMemoryInBytes: null,}).flat();test('does not pass the default CRF option to hardware encoders', () => {diff --git a/packages/renderer/src/test/gop-size.test.ts b/packages/renderer/src/test/gop-size.test.tsindex 3709bd29c3..9e431b111a 100644--- a/packages/renderer/src/test/gop-size.test.ts+++ b/packages/renderer/src/test/gop-size.test.ts@@ -26,6 +26,8 @@ test('passes GOP size to FFmpeg', () => {hardwareAcceleration: 'disable',indent: false,logLevel: 'info',+ cpuCount: 4,+ lambdaMemoryInBytes: null,});expect(args.flat()).toContain('-g');@@ -60,6 +62,8 @@ test('passes GOP size to all non-GIF video codecs', () => {hardwareAcceleration: 'disable',indent: false,logLevel: 'info',+ cpuCount: 4,+ lambdaMemoryInBytes: null,});expect(args.flat()).toContain('-g');