@remotion/renderer 3.1.7 → 3.1.11

package/dist/assets/download-and-map-assets-to-file.js

@@ -109,7 +109,6 @@ const downloadAsset = async ({ src, onDownload, downloadMap, }) => {
         downloadMap.isDownloadingMap[src][downloadDir] = false;
     }
     if ((_c = downloadMap.isDownloadingMap[src]) === null || _c === void 0 ? void 0 : _c[downloadDir]) {
-        console.log('TRIGGER WAIT', { src, downloadDir });
         return waitForAssetToBeDownloaded({ downloadMap, src, downloadDir });
     }
     if (!downloadMap.isDownloadingMap[src]) {

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

@@ -46,6 +46,12 @@ export declare type DownloadMap = {
     videoDurationResultCache: Record<string, VideoDurationResult>;
     durationOfAssetCache: Record<string, AudioChannelsAndDurationResultCache>;
     downloadDir: string;
+    preEncode: string;
+    audioMixing: string;
+    complexFilter: string;
+    audioPreprocessing: string;
+    stitchFrames: string;
+    assetDir: string;
 };
 export declare type RenderAssetInfo = {
     assets: TAsset[][];
@@ -54,4 +60,5 @@ export declare type RenderAssetInfo = {
     downloadMap: DownloadMap;
 };
 export declare const makeDownloadMap: () => DownloadMap;
+export declare const cleanDownloadMap: (downloadMap: DownloadMap) => Promise<void>;
 export {};

package/dist/assets/download-map.js

@@ -1,8 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeDownloadMap = void 0;
+exports.cleanDownloadMap = exports.makeDownloadMap = void 0;
+const fs_1 = __importStar(require("fs"));
+const path_1 = __importDefault(require("path"));
+const delete_directory_1 = require("../delete-directory");
 const tmp_dir_1 = require("../tmp-dir");
+const makeAndReturn = (dir, name) => {
+    const p = path_1.default.join(dir, name);
+    (0, fs_1.mkdirSync)(p);
+    return p;
+};
+const packageJsonPath = path_1.default.join(__dirname, '..', '..', 'package.json');
+const packageJson = fs_1.default.existsSync(packageJsonPath)
+    ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
+    : null;
 const makeDownloadMap = () => {
+    const dir = (0, tmp_dir_1.tmpDir)(packageJson
+        ? `remotion-v${packageJson.version.replace(/\./g, '-')}-assets`
+        : 'remotion-assets');
     return {
         isDownloadingMap: {},
         hasBeenDownloadedMap: {},
@@ -14,7 +55,19 @@ const makeDownloadMap = () => {
         videoDurationResultCache: {},
         durationOfAssetCache: {},
         id: String(Math.random()),
-        downloadDir: (0, tmp_dir_1.tmpDir)('remotion-assets-dir'),
+        assetDir: dir,
+        downloadDir: makeAndReturn(dir, 'remotion-assets-dir'),
+        complexFilter: makeAndReturn(dir, 'remotion-complex-filter'),
+        preEncode: makeAndReturn(dir, 'pre-encode'),
+        audioMixing: makeAndReturn(dir, 'remotion-audio-mixing'),
+        audioPreprocessing: makeAndReturn(dir, 'remotion-audio-preprocessing'),
+        stitchFrames: makeAndReturn(dir, 'remotion-stitch-temp-dir'),
     };
 };
 exports.makeDownloadMap = makeDownloadMap;
+const cleanDownloadMap = async (downloadMap) => {
+    await (0, delete_directory_1.deleteDirectory)(downloadMap.downloadDir);
+    await (0, delete_directory_1.deleteDirectory)(downloadMap.complexFilter);
+    await (0, delete_directory_1.deleteDirectory)(downloadMap.assetDir);
+};
+exports.cleanDownloadMap = cleanDownloadMap;

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

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

package/dist/create-ffmpeg-complex-filter.js

@@ -1,23 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFfmpegComplexFilter = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const create_ffmpeg_merge_filter_1 = require("./create-ffmpeg-merge-filter");
 const ffmpeg_filter_file_1 = require("./ffmpeg-filter-file");
-const tmp_dir_1 = require("./tmp-dir");
-const createFfmpegComplexFilter = async (filters) => {
+const createFfmpegComplexFilter = async (filters, downloadMap) => {
     if (filters === 0) {
         return { complexFilterFlag: null, cleanup: () => undefined };
     }
     const complexFilter = (0, create_ffmpeg_merge_filter_1.createFfmpegMergeFilter)(filters);
-    const { file, cleanup } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(complexFilter);
-    const tempPath = (0, tmp_dir_1.tmpDir)('remotion-complex-filter-script');
-    const filterFile = path_1.default.join(tempPath, 'complex-filter.txt');
-    await fs_1.default.promises.writeFile(filterFile, complexFilter);
+    const { file, cleanup } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(complexFilter, downloadMap);
     return {
         complexFilterFlag: ['-filter_complex_script', file],
         cleanup,

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

@@ -1,4 +1,5 @@
-export declare const makeFfmpegFilterFile: (complexFilter: string) => Promise<{
+import type { DownloadMap } from './assets/download-map';
+export declare const makeFfmpegFilterFile: (complexFilter: string, downloadMap: DownloadMap) => Promise<{
     file: string;
     cleanup: () => void;
 }>;

package/dist/ffmpeg-filter-file.js

@@ -8,16 +8,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeFfmpegFilterFile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const delete_directory_1 = require("./delete-directory");
-const tmp_dir_1 = require("./tmp-dir");
-const makeFfmpegFilterFile = async (complexFilter) => {
-    const tempPath = (0, tmp_dir_1.tmpDir)('remotion-complex-filter');
-    const filterFile = path_1.default.join(tempPath, 'complex-filter.txt');
+const makeFfmpegFilterFile = async (complexFilter, downloadMap) => {
+    const random = Math.random().toString().replace('.', '');
+    const filterFile = path_1.default.join(downloadMap.complexFilter, 'complex-filter-' + random + '.txt');
     await fs_1.default.promises.writeFile(filterFile, complexFilter);
     return {
         file: filterFile,
         cleanup: () => {
-            (0, delete_directory_1.deleteDirectory)(filterFile);
+            fs_1.default.unlinkSync(filterFile);
         },
     };
 };

package/dist/get-compositions.js

@@ -89,6 +89,10 @@ const getCompositions = async (serveUrlOrWebpackUrl, config) => {
             cleanup();
             close === null || close === void 0 ? void 0 : close();
             cleanupPageError();
+            // Clean download map if it was not passed in
+            if (!(config === null || config === void 0 ? void 0 : config.downloadMap)) {
+                (0, download_map_1.cleanDownloadMap)(downloadMap);
+            }
         });
     });
 };

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" | "webm" | "mp4" | "mov" | "mkv";
+export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";

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" | "webm" | "mp4">;
+export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "mp4" | "webm">;

package/dist/index.d.ts

@@ -68,7 +68,7 @@ export declare const RenderInternals: {
         task: Promise<Buffer | null>;
         getLogs: () => string;
     }>;
-    getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";
+    getFileExtensionFromCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", type: "chunk" | "final") => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";
     tmpDir: (str: string) => string;
     deleteDirectory: (directory: string) => Promise<void>;
     isServeUrl: (potentialUrl: string) => boolean;
@@ -123,8 +123,8 @@ export declare const RenderInternals: {
     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: "angle" | "swangle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
+    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "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"];
@@ -136,14 +136,15 @@ export declare const RenderInternals: {
     DEFAULT_TIMEOUT: number;
     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";
+    validateSelectedCodecAndProResCombination: (actualCodec: "h264" | "h265" | "vp8" | "vp9" | "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: "png" | "jpeg" | "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: "error" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "error" | "info" | "warn", level: "verbose" | "error" | "info" | "warn") => boolean;
     isValidLogLevel: (level: string) => boolean;
     validateEveryNthFrame: (everyNthFrame: unknown) => void;
     perf: typeof perf;
     makeDownloadMap: () => import("./assets/download-map").DownloadMap;
+    cleanDownloadMap: (downloadMap: import("./assets/download-map").DownloadMap) => Promise<void>;
 };

package/dist/index.js

@@ -157,4 +157,5 @@ exports.RenderInternals = {
     validateEveryNthFrame: validate_every_nth_frame_1.validateEveryNthFrame,
     perf,
     makeDownloadMap: download_map_1.makeDownloadMap,
+    cleanDownloadMap: download_map_1.cleanDownloadMap,
 };

package/dist/merge-audio-track.d.ts

@@ -1,9 +1,11 @@
+import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
     files: string[];
     outName: string;
     numberOfSeconds: number;
+    downloadMap: DownloadMap;
 };
 export declare const mergeAudioTrack: (options: Options) => Promise<void>;
 export {};

package/dist/merge-audio-track.js

@@ -14,7 +14,7 @@ const delete_directory_1 = require("./delete-directory");
 const p_limit_1 = require("./p-limit");
 const tmp_dir_1 = require("./tmp-dir");
 const truthy_1 = require("./truthy");
-const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, }) => {
+const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, downloadMap, }) => {
     if (files.length === 0) {
         await (0, create_silent_audio_1.createSilentAudio)({
             outName,
@@ -42,6 +42,7 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
                 files: chunkFiles,
                 numberOfSeconds,
                 outName: chunkOutname,
+                downloadMap,
             });
             return chunkOutname;
         }));
@@ -50,11 +51,12 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             files: chunkNames,
             numberOfSeconds,
             outName,
+            downloadMap,
         });
         await (0, delete_directory_1.deleteDirectory)(tempPath);
         return;
     }
-    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length);
+    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length, downloadMap);
     const args = [
         ...files.map((f) => ['-i', f]),
         mergeFilter,

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/preprocess-audio-track.js

@@ -22,7 +22,7 @@ const preprocessAudioTrackUnlimited = async ({ ffmpegExecutable, ffprobeExecutab
     if (filter === null) {
         return null;
     }
-    const { cleanup, file } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(filter);
+    const { cleanup, file } = await (0, ffmpeg_filter_file_1.makeFfmpegFilterFile)(filter, downloadMap);
     const args = [
         ['-i', (0, resolve_asset_src_1.resolveAssetSrc)(asset.src)],
         ['-ac', '2'],

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-frames.js

@@ -311,6 +311,7 @@ const renderFrames = (options) => {
             cleanup.forEach((c) => {
                 c();
             });
+            // Don't clear download dir because it might be used by stitchFramesToVideo
         });
     });
 };

package/dist/render-media.d.ts

@@ -1,4 +1,3 @@
-/// <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';
@@ -63,4 +62,4 @@ export declare type RenderMediaOptions = {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, downloadMap, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
+export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }: RenderMediaOptions) => Promise<Buffer | null>;

package/dist/render-media.js

@@ -11,6 +11,7 @@ const remotion_1 = require("remotion");
 const download_map_1 = require("./assets/download-map");
 const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
 const crf_1 = require("./crf");
+const delete_directory_1 = require("./delete-directory");
 const ensure_frames_in_order_1 = require("./ensure-frames-in-order");
 const ensure_output_directory_1 = require("./ensure-output-directory");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
@@ -22,10 +23,10 @@ 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");
-const tmp_dir_1 = require("./tmp-dir");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
@@ -34,8 +35,8 @@ const validate_scale_1 = require("./validate-scale");
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, downloadMap, ...options }) => {
-    var _a, _b;
+const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, ...options }) => {
+    var _a, _b, _c;
     (0, quality_1.validateQuality)(quality);
     if (typeof crf !== 'undefined' && crf !== null) {
         (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
@@ -56,11 +57,25 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
     let encodedDoneIn = null;
     let cancelled = false;
     const renderStart = Date.now();
-    const tmpdir = (0, tmp_dir_1.tmpDir)('pre-encode');
-    const parallelEncoding = (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
+    const downloadMap = (_c = options.downloadMap) !== null && _c !== void 0 ? _c : (0, download_map_1.makeDownloadMap)();
+    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(tmpdir, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
+        ? path_1.default.join(downloadMap.preEncode, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
         : null;
     const outputDir = parallelEncoding
         ? null
@@ -174,7 +189,7 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
             browserExecutable,
             port,
             cancelSignal: cancelRenderFrames.cancelSignal,
-            downloadMap: downloadMap !== null && downloadMap !== void 0 ? downloadMap : (0, download_map_1.makeDownloadMap)(),
+            downloadMap,
         });
         return renderFramesProc;
     })
@@ -252,7 +267,11 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
         .finally(() => {
         if (preEncodedFileLocation !== null &&
             fs_1.default.existsSync(preEncodedFileLocation)) {
-            fs_1.default.unlinkSync(preEncodedFileLocation);
+            (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(preEncodedFileLocation));
+        }
+        // Clean download map if it was not passed in
+        if (!(options === null || options === void 0 ? void 0 : options.downloadMap)) {
+            (0, download_map_1.cleanDownloadMap)(downloadMap);
         }
     });
     return Promise.race([

package/dist/render-still.js

@@ -175,7 +175,13 @@ const renderStill = (options) => {
         })
             .then((res) => resolve(res))
             .catch((err) => reject(err))
-            .finally(() => close === null || close === void 0 ? void 0 : close());
+            .finally(() => {
+            // Clean download map if it was not passed in
+            if (!(options === null || options === void 0 ? void 0 : options.downloadMap)) {
+                (0, download_map_1.cleanDownloadMap)(downloadMap);
+            }
+            return close === null || close === void 0 ? void 0 : close();
+        });
     });
     return Promise.race([
         happyPath,

package/dist/screenshot-task.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Page } from './browser/BrowserPage';
 import type { ScreenshotOptions } from './browser/ScreenshotOptions';
 import type { StillImageFormat } from './image-format';

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/dist/stitch-frames-to-video.js

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
-const fs_1 = __importStar(require("fs"));
+const fs_1 = __importDefault(require("fs"));
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
@@ -48,7 +25,6 @@ const merge_audio_track_1 = require("./merge-audio-track");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
 const pixel_format_1 = require("./pixel-format");
 const preprocess_audio_track_1 = require("./preprocess-audio-track");
-const tmp_dir_1 = require("./tmp-dir");
 const truthy_1 = require("./truthy");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
@@ -67,13 +43,12 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     if (verbose) {
         console.log('asset positions', assetPositions);
     }
-    const tempPath = (0, tmp_dir_1.tmpDir)('remotion-audio-mixing');
     const preprocessProgress = new Array(assetPositions.length).fill(0);
     const updateProgress = () => {
         onProgress(preprocessProgress.reduce((a, b) => a + b, 0) / assetPositions.length);
     };
     const preprocessed = (await Promise.all(assetPositions.map(async (asset, index) => {
-        const filterFile = path_1.default.join(tempPath, `${index}.wav`);
+        const filterFile = path_1.default.join(downloadMap.audioMixing, `${index}.wav`);
         const result = await (0, preprocess_audio_track_1.preprocessAudioTrack)({
             ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
             ffprobeExecutable: ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : null,
@@ -87,14 +62,15 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
         updateProgress();
         return result;
     }))).filter(truthy_1.truthy);
-    const outName = path_1.default.join((0, tmp_dir_1.tmpDir)('remotion-audio-preprocessing'), `audio.wav`);
+    const outName = path_1.default.join(downloadMap.audioPreprocessing, `audio.wav`);
     await (0, merge_audio_track_1.mergeAudioTrack)({
         ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
         files: preprocessed,
         outName,
         numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
+        downloadMap,
     });
-    (0, delete_directory_1.deleteDirectory)(tempPath);
+    (0, delete_directory_1.deleteDirectory)(downloadMap.audioMixing);
     onProgress(1);
     preprocessed.forEach((p) => {
         (0, delete_directory_1.deleteDirectory)(p);
@@ -123,7 +99,7 @@ const spawnFfmpeg = async (options) => {
     const supportsCrf = encoderName && codec !== 'prores';
     const tempFile = options.outputLocation
         ? null
-        : path_1.default.join((0, tmp_dir_1.tmpDir)('remotion-stitch-temp-dir'), `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final')}`);
+        : path_1.default.join(options.assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'final')}`);
     if (options.verbose) {
         console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
         console.log('[verbose] encoder', encoderName);
@@ -184,7 +160,6 @@ const spawnFfmpeg = async (options) => {
             if (tempFile) {
                 (0, promises_1.readFile)(tempFile)
                     .then((f) => {
-                    (0, fs_1.unlinkSync)(tempFile);
                     return resolve(f);
                 })
                     .catch((e) => reject(e));
@@ -193,6 +168,7 @@ const spawnFfmpeg = async (options) => {
                 resolve(null);
             }
         });
+        await (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
         return {
             getLogs: () => '',
             task: Promise.resolve(file),
@@ -280,12 +256,18 @@ const spawnFfmpeg = async (options) => {
     });
     return {
         task: task.then(() => {
+            (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.audioPreprocessing);
             if (tempFile === null) {
+                (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames);
                 return null;
             }
             return (0, promises_1.readFile)(tempFile)
                 .then((file) => {
-                return Promise.all([file, (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(tempFile))]);
+                return Promise.all([
+                    file,
+                    (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(tempFile)),
+                    (0, delete_directory_1.deleteDirectory)(options.assetsInfo.downloadMap.stitchFrames),
+                ]);
             })
                 .then(([file]) => file);
         }),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.1.7",
+	"version": "3.1.11",
 	"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.7",
+		"remotion": "3.1.11",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "599379fef6043a7125d1979766f915580ec1cf77"
+	"gitHead": "bc4184c9faf944a3bac2fd56bdf990cc74e3ec94"
 }

package/dist/assets/get-files-in-folder.d.ts

@@ -1,9 +0,0 @@
-export declare type FileNameAndSize = {
-    filename: string;
-    size: number;
-};
-export declare function getFolderFiles(folder: string): FileNameAndSize[];
-export declare const getTmpDirStateIfENoSp: () => {
-    files: FileNameAndSize[];
-    total: number;
-};

package/dist/assets/get-files-in-folder.js

@@ -1,50 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTmpDirStateIfENoSp = exports.getFolderFiles = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-function getFolderFiles(folder) {
-    const files = fs_1.default.readdirSync(folder);
-    const paths = [];
-    files.forEach((file) => {
-        const full = path_1.default.join(folder, file);
-        try {
-            const stat = fs_1.default.statSync(full);
-            if (stat.isDirectory()) {
-                paths.push(...getFolderFiles(full));
-            }
-            else {
-                paths.push({
-                    filename: full,
-                    size: stat.size,
-                });
-            }
-        }
-        catch (err) {
-            if (err.message.includes('ENOENT')) {
-                // Race condition: File was deleted in the meanwhile.
-                // Do nothing
-            }
-            else {
-                throw err;
-            }
-        }
-    });
-    return paths;
-}
-exports.getFolderFiles = getFolderFiles;
-const getTmpDirStateIfENoSp = () => {
-    const files = getFolderFiles('/tmp');
-    return {
-        files: files
-            .slice(0)
-            .sort((a, b) => a.size - b.size)
-            .reverse()
-            .slice(0, 100),
-        total: files.reduce((a, b) => a + b.size, 0),
-    };
-};
-exports.getTmpDirStateIfENoSp = getTmpDirStateIfENoSp;