@remotion/renderer 3.1.8 → 3.2.0

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -1,8 +1,5 @@
 import type { DownloadMap } from './assets/download-map';
 export declare const createFfmpegComplexFilter: (filters: number, downloadMap: DownloadMap) => Promise<{
-    complexFilterFlag: [
-        string,
-        string
-    ] | null;
+    complexFilterFlag: [string, string] | null;
     cleanup: () => void;
 }>;

package/dist/get-extension-from-codec.d.ts

@@ -1,2 +1,2 @@
 import type { Codec } from './codec';
-export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";
+export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";

package/dist/get-video-threads-flag.d.ts

@@ -0,0 +1 @@
+export declare const getIdealVideoThreadsFlag: () => number;

package/dist/get-video-threads-flag.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIdealVideoThreadsFlag = void 0;
+const os_1 = __importDefault(require("os"));
+const MEMORY_USAGE_PER_THREAD = 400000000; // 400MB
+const RESERVED_MEMORY = 2000000000;
+const getIdealVideoThreadsFlag = () => {
+    const freeMemory = os_1.default.freemem();
+    const cpus = os_1.default.cpus().length;
+    const maxRecommendedBasedOnCpus = (cpus * 2) / 3;
+    const maxRecommendedBasedOnMemory = (freeMemory - RESERVED_MEMORY) / MEMORY_USAGE_PER_THREAD;
+    const maxRecommended = Math.min(maxRecommendedBasedOnCpus, maxRecommendedBasedOnMemory);
+    return Math.max(1, Math.round(maxRecommended));
+};
+exports.getIdealVideoThreadsFlag = getIdealVideoThreadsFlag;

package/dist/guess-extension-for-media.d.ts

@@ -1 +1 @@
-export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "mp4" | "webm">;
+export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "webm" | "mp4">;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -60,14 +61,14 @@ export declare const RenderInternals: {
         width: number;
         height: number;
         scale: number;
-        codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     }) => void;
     normalizeServeUrl: (unnormalized: string) => string;
     spawnFfmpeg: (options: import("./stitch-frames-to-video").StitcherOptions) => Promise<{
         task: Promise<Buffer | null>;
         getLogs: () => string;
     }>;
-    getFileExtensionFromCodec: (codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";
+    getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";
     tmpDir: (str: string) => string;
     deleteDirectory: (directory: string) => Promise<void>;
     isServeUrl: (potentialUrl: string) => boolean;
@@ -115,17 +116,17 @@ export declare const RenderInternals: {
     };
     registerErrorSymbolicationLock: () => number;
     unlockErrorSymbolicationLock: (id: number) => void;
-    canUseParallelEncoding: (codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => boolean;
+    canUseParallelEncoding: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => boolean;
     mimeContentType: typeof mimeContentType;
     mimeLookup: typeof mimeLookup;
     validateConcurrency: (value: unknown, setting: string) => void;
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: import("./browser").Browser;
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
-    getDefaultCrfForCodec: (codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => number;
-    validateSelectedCrfAndCodecCombination: (crf: unknown, codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
+    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
+    getDefaultCrfForCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => number;
+    validateSelectedCrfAndCodecCombination: (crf: unknown, codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
     validImageFormats: readonly ["png", "jpeg", "none"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_OVERWRITE: boolean;
@@ -133,14 +134,14 @@ export declare const RenderInternals: {
     validateQuality: (q: number | undefined) => void;
     validateFrame: (frame: number, durationInFrames: number) => void;
     DEFAULT_TIMEOUT: number;
-    getValidCrfRanges: (codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => [number, number];
-    validateSelectedPixelFormatAndCodecCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
-    validateSelectedCodecAndProResCombination: (actualCodec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", actualProResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | undefined) => void;
-    validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "none" | "png" | "jpeg") => "none" | "valid";
-    DEFAULT_CODEC: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
-    isAudioCodec: (codec: "vp9" | "vp8" | "h264" | "h265" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
+    getValidCrfRanges: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => [number, number];
+    validateSelectedPixelFormatAndCodecCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
+    validateSelectedCodecAndProResCombination: (actualCodec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", actualProResProfile: "proxy" | "4444-xq" | "4444" | "hq" | "standard" | "light" | undefined) => void;
+    validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "jpeg" | "png" | "none") => "none" | "valid";
+    DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
+    isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
     logLevels: readonly ["verbose", "info", "warn", "error"];
-    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "info" | "warn" | "error", level: "verbose" | "info" | "warn" | "error") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "error" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
     isValidLogLevel: (level: string) => boolean;
     validateEveryNthFrame: (everyNthFrame: unknown) => void;
     perf: typeof perf;

package/dist/last-frame-from-video-cache.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/offthread-video-server.js

@@ -45,6 +45,17 @@ const startOffthreadVideoServer = ({ ffmpegExecutable, ffprobeExecutable, onDown
         const { src, time, imageFormat } = (0, exports.extractUrlAndSourceFromUrl)(req.url);
         res.setHeader('access-control-allow-origin', '*');
         res.setHeader('content-type', `image/${imageFormat === 'jpeg' ? 'jpg' : 'png'}`);
+        // Handling this case on Lambda:
+        // https://support.google.com/chrome/a/answer/7679408?hl=en
+        // Chrome sends Private Network Access preflights for subresources
+        if (req.method === 'OPTIONS') {
+            res.statusCode = 200;
+            if (req.headers['access-control-request-private-network']) {
+                res.setHeader('Access-Control-Allow-Private-Network', 'true');
+            }
+            res.end();
+            return;
+        }
         (0, download_and_map_assets_to_file_1.downloadAsset)({ src, onDownload, downloadMap })
             .then((to) => {
             return (0, extract_frame_from_video_1.extractFrameFromVideo)({

package/dist/open-browser.js

@@ -9,6 +9,7 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const node_1 = require("./browser/node");
 const get_local_browser_executable_1 = require("./get-local-browser-executable");
+const get_video_threads_flag_1 = require("./get-video-threads-flag");
 const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validRenderers = ['swangle', 'angle', 'egl', 'swiftshader'];
 const getOpenGlRenderer = (option) => {
@@ -69,7 +70,7 @@ const openBrowser = async (browser, options) => {
             '--force-color-profile=srgb',
             '--metrics-recording-only',
             '--no-first-run',
-            '--video-threads=16',
+            '--video-threads=' + (0, get_video_threads_flag_1.getIdealVideoThreadsFlag)(),
             '--enable-automation',
             '--password-store=basic',
             '--use-mock-keychain',

package/dist/prestitcher-memory-usage.d.ts

@@ -0,0 +1,12 @@
+export declare const estimateMemoryUsageForPrestitcher: ({ width, height, }: {
+    width: number;
+    height: number;
+}) => number;
+export declare const shouldUseParallelEncoding: ({ width, height, }: {
+    width: number;
+    height: number;
+}) => {
+    hasEnoughMemory: boolean;
+    freeMemory: number;
+    estimatedUsage: number;
+};

package/dist/prestitcher-memory-usage.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldUseParallelEncoding = exports.estimateMemoryUsageForPrestitcher = void 0;
+const os_1 = __importDefault(require("os"));
+const estimateMemoryUsageForPrestitcher = ({ width, height, }) => {
+    // Empirically we detected that per 1 million pixels, FFMPEG uses around 1GB of memory, relatively independent of
+    // the duration of the video.
+    const memoryUsageFor4K = 1000000000;
+    const memoryUsageOfPixel = memoryUsageFor4K / 1000000;
+    return memoryUsageOfPixel * width * height;
+};
+exports.estimateMemoryUsageForPrestitcher = estimateMemoryUsageForPrestitcher;
+const shouldUseParallelEncoding = ({ width, height, }) => {
+    const freeMemory = os_1.default.freemem();
+    const estimatedUsage = (0, exports.estimateMemoryUsageForPrestitcher)({
+        height,
+        width,
+    });
+    const hasEnoughMemory = freeMemory - estimatedUsage > 2000000000 &&
+        estimatedUsage / freeMemory < 0.5;
+    return {
+        hasEnoughMemory,
+        freeMemory,
+        estimatedUsage,
+    };
+};
+exports.shouldUseParallelEncoding = shouldUseParallelEncoding;

package/dist/render-media.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { DownloadMap } from './assets/download-map';

package/dist/render-media.js

@@ -23,6 +23,7 @@ const make_cancel_signal_1 = require("./make-cancel-signal");
 const overwrite_1 = require("./overwrite");
 const perf_1 = require("./perf");
 const prespawn_ffmpeg_1 = require("./prespawn-ffmpeg");
+const prestitcher_memory_usage_1 = require("./prestitcher-memory-usage");
 const quality_1 = require("./quality");
 const render_frames_1 = require("./render-frames");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
@@ -57,7 +58,21 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
     let cancelled = false;
     const renderStart = Date.now();
     const downloadMap = (_c = options.downloadMap) !== null && _c !== void 0 ? _c : (0, download_map_1.makeDownloadMap)();
-    const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
+    const { estimatedUsage, freeMemory, hasEnoughMemory } = (0, prestitcher_memory_usage_1.shouldUseParallelEncoding)({
+        height: composition.height,
+        width: composition.width,
+    });
+    const parallelEncoding = hasEnoughMemory && (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
+    if (options.verbose) {
+        console.log('[PRESTITCHER] Free memory:', freeMemory, 'Estimated usage parallel encoding', estimatedUsage);
+        console.log('[PRESTICHER]: Codec supports parallel rendering:', (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec));
+        if (parallelEncoding) {
+            console.log('[PRESTICHER] Parallel encoding is enabled.');
+        }
+        else {
+            console.log('[PRESTITCHER] Parallel encoding is disabled.');
+        }
+    }
     const actualImageFormat = imageFormat !== null && imageFormat !== void 0 ? imageFormat : 'jpeg';
     const preEncodedFileLocation = parallelEncoding
         ? path_1.default.join(downloadMap.preEncode, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))

package/dist/screenshot-task.js

@@ -7,6 +7,7 @@ exports._screenshotTask = void 0;
 const fs_1 = __importDefault(require("fs"));
 const perf_1 = require("./perf");
 const _screenshotTask = async (page, format, options) => {
+    var _a;
     const client = page._client();
     const target = page.target();
     const perfTarget = (0, perf_1.startPerfMeasure)('activate-target');
@@ -20,20 +21,34 @@ const _screenshotTask = async (page, format, options) => {
             color: { r: 0, g: 0, b: 0, a: 0 },
         });
     const cap = (0, perf_1.startPerfMeasure)('capture');
-    const result = await client.send('Page.captureScreenshot', {
-        format,
-        quality: options.quality,
-        clip: undefined,
-        captureBeyondViewport: true,
-    });
-    (0, perf_1.stopPerfMeasure)(cap);
-    if (shouldSetDefaultBackground)
-        await client.send('Emulation.setDefaultBackgroundColorOverride');
-    const saveMarker = (0, perf_1.startPerfMeasure)('save');
-    const buffer = Buffer.from(result.data, 'base64');
-    if (options.path)
-        await fs_1.default.promises.writeFile(options.path, buffer);
-    (0, perf_1.stopPerfMeasure)(saveMarker);
-    return buffer;
+    try {
+        const result = await client.send('Page.captureScreenshot', {
+            format,
+            quality: options.quality,
+            clip: undefined,
+            captureBeyondViewport: true,
+        });
+        (0, perf_1.stopPerfMeasure)(cap);
+        if (shouldSetDefaultBackground)
+            await client.send('Emulation.setDefaultBackgroundColorOverride');
+        const saveMarker = (0, perf_1.startPerfMeasure)('save');
+        const buffer = Buffer.from(result.data, 'base64');
+        if (options.path)
+            await fs_1.default.promises.writeFile(options.path, buffer);
+        (0, perf_1.stopPerfMeasure)(saveMarker);
+        return buffer;
+    }
+    catch (err) {
+        if (err.message.includes('Unable to capture screenshot')) {
+            const errMessage = [
+                'Could not take a screenshot because Google Chrome ran out of memory or disk space.',
+                ((_a = process === null || process === void 0 ? void 0 : process.env) === null || _a === void 0 ? void 0 : _a.REMOTION_LAMBDA)
+                    ? 'Deploy a new Lambda function with more memory or disk space.'
+                    : 'Decrease the concurrency to use less RAM.',
+            ].join(' ');
+            throw new Error(errMessage);
+        }
+        throw err;
+    }
 };
 exports._screenshotTask = _screenshotTask;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.1.8",
+	"version": "3.2.0",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.1.8",
+		"remotion": "3.2.0",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "57f34a02b0f830053f92af426a6b70b6824f887e"
+	"gitHead": "47b188161a9e922a247eaa998e72d37af9137707"
 }

package/dist/make-assets-download-dir.d.ts

@@ -1 +0,0 @@
-export declare const makeAssetsDownloadTmpDir: () => string;

package/dist/make-assets-download-dir.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeAssetsDownloadTmpDir = void 0;
-const tmp_dir_1 = require("./tmp-dir");
-let dir = null;
-const makeAssetsDownloadTmpDir = () => {
-    if (dir) {
-        return dir;
-    }
-    dir = (0, tmp_dir_1.tmpDir)('remotion-assets-dir');
-    return dir;
-};
-exports.makeAssetsDownloadTmpDir = makeAssetsDownloadTmpDir;