@remotion/renderer 4.0.32 → 4.0.34

package/dist/client.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const BrowserSafeApis: {
     getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">(codec: T, audioCodec: "mp3" | "aac" | "pcm-16" | "opus" | null) => import("./file-extensions").FileExtension;
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];

package/dist/get-available-memory.d.ts

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

package/dist/get-available-memory.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAvailableMemory = void 0;
+const node_fs_1 = require("node:fs");
+const node_os_1 = require("node:os");
+const logger_1 = require("./logger");
+const getFreeMemoryFromProcMeminfo = () => {
+    const data = (0, node_fs_1.readFileSync)('/proc/meminfo', 'utf-8');
+    // Split the file by lines and find the line with MemFree
+    const lines = data.split('\n');
+    const memAvailableLine = lines.find((line) => line.startsWith('MemAvailable'));
+    // If we couldn't find MemAvailable, return an error
+    if (!memAvailableLine) {
+        throw new Error('MemAvailable not found in /proc/meminfo');
+    }
+    // Extract the value and unit from the line
+    const matches = memAvailableLine.match(/(\d+)\s+(\w+)/);
+    if (!matches || matches.length !== 3) {
+        throw new Error('Failed to parse MemAvailable value');
+    }
+    const value = parseInt(matches[1], 10);
+    const unit = matches[2].toLowerCase();
+    // Convert the value to bytes based on its unit
+    switch (unit) {
+        case 'kb':
+            return value * 1024;
+        case 'mb':
+            return value * 1024 * 1024;
+        case 'gb':
+            return value * 1024 * 1024 * 1024;
+        default:
+            throw new Error(`Unknown unit: ${unit}`);
+    }
+};
+const getAvailableMemory = () => {
+    if ((0, node_fs_1.existsSync)('/proc/meminfo')) {
+        try {
+            getFreeMemoryFromProcMeminfo();
+        }
+        catch (err) {
+            logger_1.Log.warn('Tried to get available memory from /proc/meminfo but failed. Falling back to os.freemem(). Error:');
+            logger_1.Log.warn(err);
+        }
+    }
+    return (0, node_os_1.freemem)();
+};
+exports.getAvailableMemory = getAvailableMemory;

package/dist/get-concurrency.js

@@ -1,26 +1,23 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActualConcurrency = void 0;
-const node_os_1 = __importDefault(require("node:os"));
+const get_cpu_count_1 = require("./get-cpu-count");
 const getActualConcurrency = (userPreference) => {
+    const maxCpus = (0, get_cpu_count_1.getCpuCount)();
     if (userPreference === null) {
-        return Math.round(Math.min(8, Math.max(1, node_os_1.default.cpus().length / 2)));
+        return Math.round(Math.min(8, Math.max(1, maxCpus / 2)));
     }
-    const max = node_os_1.default.cpus().length;
     const min = 1;
     let rounded;
     if (typeof userPreference === 'string') {
         const percentage = parseInt(userPreference.slice(0, -1), 10);
-        rounded = Math.floor((percentage / 100) * max);
+        rounded = Math.floor((percentage / 100) * maxCpus);
     }
     else {
         rounded = Math.floor(userPreference);
     }
-    if (rounded > max) {
-        throw new Error(`Maximum for --concurrency is ${max} (number of cores on this system)`);
+    if (rounded > maxCpus) {
+        throw new Error(`Maximum for --concurrency is ${maxCpus} (number of cores on this system)`);
     }
     if (rounded < min) {
         throw new Error(`Minimum for concurrency is ${min}.`);

package/dist/get-cpu-count.d.ts

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

package/dist/get-cpu-count.js

@@ -0,0 +1,26 @@
+"use strict";
+// Kubernetes uses the following command to spawn Docker containers:
+// docker run --cpuset-cpus="0,1" to assign only 2 CPUs.
+// However, Node.js returns the core count of the host system (up to 96!)
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCpuCount = void 0;
+const node_child_process_1 = require("node:child_process");
+const node_os_1 = require("node:os");
+// We also get it from nproc and use the minimum of the two.
+const getConcurrencyFromNProc = () => {
+    try {
+        return parseInt((0, node_child_process_1.execSync)('nproc').toString().trim(), 10);
+    }
+    catch (error) {
+        return null;
+    }
+};
+const getCpuCount = () => {
+    const node = (0, node_os_1.cpus)().length;
+    const nproc = getConcurrencyFromNProc();
+    if (nproc === null) {
+        return node;
+    }
+    return Math.min(nproc, node);
+};
+exports.getCpuCount = getCpuCount;

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

@@ -1,6 +1,6 @@
 import type { AudioCodec } from './audio-codec';
 import type { Codec } from './codec';
 import type { FileExtension } from './file-extensions';
-export declare const getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "mp3" | "aac" | "wav" | "h264-mkv" | "gif">(codec: T, audioCodec: AudioCodec | null) => FileExtension;
-export declare const makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "prores" | "mp3" | "aac" | "wav" | "h264-mkv" | "gif")[]>;
+export declare const getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">(codec: T, audioCodec: AudioCodec | null) => FileExtension;
+export declare const makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif")[]>;
 export declare const defaultCodecsForFileExtension: Record<FileExtension, Codec>;

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

@@ -1,15 +1,13 @@
 "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 node_os_1 = __importDefault(require("node:os"));
+const get_available_memory_1 = require("./get-available-memory");
+const get_cpu_count_1 = require("./get-cpu-count");
 const MEMORY_USAGE_PER_THREAD = 400000000; // 400MB
 const RESERVED_MEMORY = 2000000000;
 const getIdealVideoThreadsFlag = () => {
-    const freeMemory = node_os_1.default.freemem();
-    const cpus = node_os_1.default.cpus().length;
+    const freeMemory = (0, get_available_memory_1.getAvailableMemory)();
+    const cpus = (0, get_cpu_count_1.getCpuCount)();
     const maxRecommendedBasedOnCpus = (cpus * 2) / 3;
     const maxRecommendedBasedOnMemory = (freeMemory - RESERVED_MEMORY) / MEMORY_USAGE_PER_THREAD;
     const maxRecommended = Math.min(maxRecommendedBasedOnCpus, maxRecommendedBasedOnMemory);

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="react" />
 import execa from 'execa';
 import { HeadlessBrowser } from './browser/Browser';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
@@ -151,7 +153,7 @@ export declare const RenderInternals: {
         audioCodec: "mp3" | "aac" | "pcm-16" | "opus" | null;
     }) => Promise<void>;
     getMinConcurrency: () => number;
-    getMaxConcurrency: () => any;
+    getMaxConcurrency: () => number;
     getDefaultAudioCodec: ({ codec, preferLossless, }: {
         codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
         preferLossless: boolean;

package/dist/options/color-space.d.ts

@@ -7,6 +7,6 @@ export declare const colorSpaceOption: {
     description: () => JSX.Element;
     docLink: string;
     ssrName: string;
-    type: "bt709" | "default";
+    type: "default" | "bt709";
 };
 export declare const validateColorSpace: (option: unknown) => void;

package/dist/options/delete-after.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const deleteAfterOption: {
     name: string;
     cliFlag: "delete-after";

package/dist/options/folder-expiry.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const folderExpiryOption: {
     name: string;
     cliFlag: "enable-folder-expiry";

package/dist/prestitcher-memory-usage.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldUseParallelEncoding = void 0;
-const node_os_1 = __importDefault(require("node:os"));
+const get_available_memory_1 = require("./get-available-memory");
 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.
@@ -13,7 +10,7 @@ const estimateMemoryUsageForPrestitcher = ({ width, height, }) => {
     return memoryUsageOfPixel * width * height;
 };
 const shouldUseParallelEncoding = ({ width, height, }) => {
-    const freeMemory = node_os_1.default.freemem();
+    const freeMemory = (0, get_available_memory_1.getAvailableMemory)();
     const estimatedUsage = estimateMemoryUsageForPrestitcher({
         height,
         width,

package/dist/render-media.js

@@ -98,6 +98,12 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
         logLevel,
         tag: 'renderMedia()',
     }, 'Free memory:', freeMemory, 'Estimated usage parallel encoding', estimatedUsage);
+    const actualConcurrency = (0, get_concurrency_1.getActualConcurrency)(concurrency);
+    logger_1.Log.verboseAdvanced({
+        indent,
+        logLevel,
+        tag: 'renderMedia()',
+    }, 'Using concurrency:', actualConcurrency);
     logger_1.Log.verboseAdvanced({
         indent,
         logLevel,
@@ -233,7 +239,7 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
         Promise.resolve(createPrestitcherIfNecessary())
             .then(() => {
             return (0, prepare_server_1.makeOrReuseServer)(reusedServer, {
-                concurrency: (0, get_concurrency_1.getActualConcurrency)(concurrency),
+                concurrency: actualConcurrency,
                 indent,
                 port,
                 remotionRoot: (0, find_closest_package_json_1.findRemotionRoot)(),

package/dist/validate-concurrency.d.ts

@@ -3,5 +3,5 @@ export declare const validateConcurrency: ({ setting, value, checkIfValidForCurr
     setting: string;
     checkIfValidForCurrentMachine: boolean;
 }) => void;
-export declare const getMaxConcurrency: () => any;
+export declare const getMaxConcurrency: () => number;
 export declare const getMinConcurrency: () => number;

package/dist/validate-concurrency.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMinConcurrency = exports.getMaxConcurrency = exports.validateConcurrency = void 0;
+const get_cpu_count_1 = require("./get-cpu-count");
 const validateConcurrency = ({ setting, value, checkIfValidForCurrentMachine, }) => {
     if (typeof value === 'undefined') {
         return;
@@ -30,7 +31,7 @@ const validateConcurrency = ({ setting, value, checkIfValidForCurrentMachine, })
 };
 exports.validateConcurrency = validateConcurrency;
 const getMaxConcurrency = () => {
-    return require('os').cpus().length;
+    return (0, get_cpu_count_1.getCpuCount)();
 };
 exports.getMaxConcurrency = getMaxConcurrency;
 const getMinConcurrency = () => 1;

package/dist/validate-output-filename.d.ts

@@ -1,5 +1,5 @@
 import type { AudioCodec } from './audio-codec';
-export declare const validateOutputFilename: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "mp3" | "aac" | "wav" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
+export declare const validateOutputFilename: <T extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
     codec: T;
     audioCodec: AudioCodec | null;
     extension: string;

package/package.json

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

package/dist/options/render-expiry-days.d.ts

@@ -1,8 +0,0 @@
-export declare const deleteAfterOption: {
-    name: string;
-    cliFlag: "delete-after";
-    description: () => JSX.Element;
-    ssrName: "deleteAfter";
-    docLink: string;
-    type: number | null;
-};

package/dist/options/render-expiry-days.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAfterOption = void 0;
-const jsx_runtime_1 = require("react/jsx-runtime");
-exports.deleteAfterOption = {
-    name: 'Render expiry days',
-    cliFlag: 'delete-after',
-    description: () => {
-        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Automatically delete the render after a certain period. Accepted values are ", (0, jsx_runtime_1.jsx)("code", { children: "1-day" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "3-days" }), ", ", (0, jsx_runtime_1.jsx)("code", { children: "7-days" }), " and", ' ', (0, jsx_runtime_1.jsx)("code", { children: "30-days" }), ".", (0, jsx_runtime_1.jsx)("br", {}), " For this to work, your bucket needs to have", ' ', (0, jsx_runtime_1.jsx)("a", { href: "/docs/lambda/autodelete", children: "lifecycles enabled" }), "."] }));
-    },
-    ssrName: 'deleteAfter',
-    docLink: 'https://www.remotion.dev/docs/autodelete',
-    type: 0,
-};

package/dist/presets-profile.d.ts

@@ -1,7 +0,0 @@
-import type { Codec } from './codec';
-export declare const x264PresetOptions: readonly ["ultrafast", "superfast", "veryfast", "faster", "fast", "medium", "slow", "slower", "veryslow", "placebo"];
-export type x264Preset = typeof x264PresetOptions[number];
-export declare const validateSelectedCodecAndPresetCombination: ({ codec, x264Preset, }: {
-    codec: Codec;
-    x264Preset: "ultrafast" | "superfast" | "veryfast" | "faster" | "fast" | "medium" | "slow" | "slower" | "veryslow" | "placebo" | undefined;
-}) => void;

package/dist/presets-profile.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateSelectedCodecAndPresetCombination = exports.x264PresetOptions = void 0;
-exports.x264PresetOptions = [
-    'ultrafast',
-    'superfast',
-    'veryfast',
-    'faster',
-    'fast',
-    'medium',
-    'slow',
-    'slower',
-    'veryslow',
-    'placebo',
-];
-const validateSelectedCodecAndPresetCombination = ({ codec, x264Preset, }) => {
-    if (typeof x264Preset !== 'undefined' && codec !== 'h264') {
-        throw new TypeError(`You have set a Preset profile but the codec is "${codec}". Set the codec to "h264" or remove the Preset profile.`);
-    }
-    if (x264Preset !== undefined &&
-        !exports.x264PresetOptions.includes(x264Preset)) {
-        throw new TypeError(`The Preset profile "${x264Preset}" is not valid. Valid options are ${exports.x264PresetOptions
-            .map((p) => `"${p}"`)
-            .join(', ')}`);
-    }
-};
-exports.validateSelectedCodecAndPresetCombination = validateSelectedCodecAndPresetCombination;