@remotion/renderer 4.0.96 → 4.0.98

package/dist/call-ffmpeg.js

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.callFf = exports.dynamicLibraryPathOptions = void 0;
 const execa_1 = __importDefault(require("execa"));
 const node_fs_1 = require("node:fs");
-const node_path_1 = __importDefault(require("node:path"));
 const get_executable_path_1 = require("./compositor/get-executable-path");
 const truthy_1 = require("./truthy");
 const dynamicLibraryPathOptions = (indent, logLevel) => {
-    const lib = node_path_1.default.join((0, get_executable_path_1.getExecutablePath)('ffmpeg-cwd', indent, logLevel), 'remotion', 'lib');
+    const lib = (0, get_executable_path_1.getExecutablePath)('lib', indent, logLevel);
     return {
         env: {
             RUST_BACKTRACE: 'full',

package/dist/{check-apple-silicon.js → check-version-requirements.js}

@@ -1,19 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkNodeVersionAndWarnAboutRosetta = exports.gLibCErrorMessage = void 0;
+const get_executable_path_1 = require("./compositor/get-executable-path");
 const logger_1 = require("./logger");
+const getRequiredLibCVersion = () => {
+    if (process.platform !== 'linux') {
+        return null;
+    }
+    if ((0, get_executable_path_1.isMusl)({ indent: false, logLevel: 'warn' })) {
+        return null;
+    }
+    // Uses Amazon Linux 2 to compile
+    if (process.arch === 'arm64') {
+        return [2, 26];
+    }
+    // Uses Ubuntu 20.04 to compile
+    return [2, 31];
+};
+const required = getRequiredLibCVersion();
 const gLibCErrorMessage = (libCString) => {
+    if (required === null) {
+        return null;
+    }
     const split = libCString.split('.');
     if (split.length !== 2) {
         return null;
     }
-    if (split[0] === '2' && Number(split[1]) >= 35) {
+    if (split[0] === String(required[0]) && Number(split[1]) >= required[1]) {
         return null;
     }
-    if (Number(split[0]) > 2) {
+    if (Number(split[0]) > required[0]) {
         return null;
     }
-    return `Rendering videos requires glibc 2.35 or higher. Your system has glibc ${libCString}.`;
+    return `Rendering videos requires glibc ${required.join('.')} on your or higher on your OS. Your system has glibc ${libCString}.`;
 };
 exports.gLibCErrorMessage = gLibCErrorMessage;
 const checkLibCRequirement = (logLevel, indent) => {

package/dist/compositor/get-executable-path.d.ts

@@ -1,2 +1,7 @@
 import type { LogLevel } from '../log-level';
-export declare const getExecutablePath: (type: 'compositor' | 'ffmpeg' | 'ffprobe' | 'ffmpeg-cwd', indent: boolean, logLevel: LogLevel) => string;
+export declare function isMusl({ indent, logLevel, }: {
+    indent: boolean;
+    logLevel: LogLevel;
+}): boolean;
+export declare const getExecutablePath: (type: 'compositor' | 'ffmpeg' | 'ffprobe' | 'lib', indent: boolean, logLevel: LogLevel) => string;
+export declare const getExecutableDir: (indent: boolean, logLevel: LogLevel) => string;

package/dist/compositor/get-executable-path.js

@@ -1,10 +1,14 @@
 "use strict";
 // Adapted from @swc/core package
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExecutablePath = void 0;
+exports.getExecutableDir = exports.getExecutablePath = exports.isMusl = void 0;
+const path_1 = __importDefault(require("path"));
 const logger_1 = require("../logger");
 let warned = false;
-function isMusl({ indent, logLevel }) {
+function isMusl({ indent, logLevel, }) {
     // @ts-expect-error bun no types
     if (!process.report && typeof Bun !== 'undefined') {
         if (!warned) {
@@ -17,31 +21,50 @@ function isMusl({ indent, logLevel }) {
     const { glibcVersionRuntime } = process.report.getReport().header;
     return !glibcVersionRuntime;
 }
+exports.isMusl = isMusl;
 const getExecutablePath = (type, indent, logLevel) => {
-    if (type === 'compositor' && process.env.COMPOSITOR_PATH) {
-        return process.env.COMPOSITOR_PATH;
+    const base = (0, exports.getExecutableDir)(indent, logLevel);
+    switch (type) {
+        case 'compositor':
+            if (process.platform === 'win32') {
+                return path_1.default.join(base, 'compositor.exe');
+            }
+            return path_1.default.join(base, 'compositor');
+        case 'ffmpeg':
+            if (process.platform === 'win32') {
+                return path_1.default.join(base, 'ffmpeg', 'remotion', 'bin', 'ffmpeg.exe');
+            }
+            return path_1.default.join(base, 'ffmpeg', 'remotion', 'bin', 'ffmpeg');
+        case 'ffprobe':
+            if (process.platform === 'win32') {
+                return path_1.default.join(base, 'ffmpeg', 'remotion', 'bin', 'ffprobe.exe');
+            }
+            return path_1.default.join(base, 'ffmpeg', 'remotion', 'bin', 'ffprobe');
+        case 'lib':
+            return path_1.default.join(base, 'ffmpeg', 'remotion', 'lib');
+        default:
+            throw new Error(`Unknown executable type: ${type}`);
+    }
+};
+exports.getExecutablePath = getExecutablePath;
+const getExecutableDir = (indent, logLevel) => {
+    if (process.env.COMPOSITOR_DIR) {
+        return process.env.COMPOSITOR_DIR;
     }
-    const key = type === 'compositor'
-        ? 'binaryPath'
-        : type === 'ffmpeg'
-            ? 'ffmpegPath'
-            : type === 'ffprobe'
-                ? 'ffprobePath'
-                : 'ffmpegCwd';
     switch (process.platform) {
         case 'win32':
             switch (process.arch) {
                 case 'x64':
-                    return require('@remotion/compositor-win32-x64-msvc')[key];
+                    return require('@remotion/compositor-win32-x64-msvc').dir;
                 default:
                     throw new Error(`Unsupported architecture on Windows: ${process.arch}`);
             }
         case 'darwin':
             switch (process.arch) {
                 case 'x64':
-                    return require('@remotion/compositor-darwin-x64')[key];
+                    return require('@remotion/compositor-darwin-x64').dir;
                 case 'arm64':
-                    return require('@remotion/compositor-darwin-arm64')[key];
+                    return require('@remotion/compositor-darwin-arm64').dir;
                 default:
                     throw new Error(`Unsupported architecture on macOS: ${process.arch}`);
             }
@@ -50,14 +73,14 @@ const getExecutablePath = (type, indent, logLevel) => {
             switch (process.arch) {
                 case 'x64':
                     if (musl) {
-                        return require('@remotion/compositor-linux-x64-musl')[key];
+                        return require('@remotion/compositor-linux-x64-musl').dir;
                     }
-                    return require('@remotion/compositor-linux-x64-gnu')[key];
+                    return require('@remotion/compositor-linux-x64-gnu').dir;
                 case 'arm64':
                     if (musl) {
-                        return require('@remotion/compositor-linux-arm64-musl')[key];
+                        return require('@remotion/compositor-linux-arm64-musl').dir;
                     }
-                    return require('@remotion/compositor-linux-arm64-gnu')[key];
+                    return require('@remotion/compositor-linux-arm64-gnu').dir;
                 default:
                     throw new Error(`Unsupported architecture on Linux: ${process.arch}`);
             }
@@ -66,4 +89,4 @@ const getExecutablePath = (type, indent, logLevel) => {
             throw new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`);
     }
 };
-exports.getExecutablePath = getExecutablePath;
+exports.getExecutableDir = getExecutableDir;

package/dist/index.d.ts

@@ -313,7 +313,7 @@ export declare const RenderInternals: {
     };
     makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif")[]>;
     defaultCodecsForFileExtension: Record<import("./file-extensions").FileExtension, "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">;
-    getExecutablePath: (type: "compositor" | "ffmpeg" | "ffprobe" | "ffmpeg-cwd", indent: boolean, logLevel: "verbose" | "info" | "warn" | "error") => string;
+    getExecutablePath: (type: "compositor" | "ffmpeg" | "ffprobe" | "lib", indent: boolean, logLevel: "verbose" | "info" | "warn" | "error") => string;
     callFf: (bin: "ffmpeg" | "ffprobe", args: (string | null)[], indent: boolean, logLevel: "verbose" | "info" | "warn" | "error", options?: execa.Options<string> | undefined) => execa.ExecaChildProcess<string>;
     dynamicLibraryPathOptions: (indent: boolean, logLevel: "verbose" | "info" | "warn" | "error") => {
         env: {

package/dist/index.js

@@ -37,7 +37,7 @@ const call_ffmpeg_1 = require("./call-ffmpeg");
 const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
 const chalk_1 = require("./chalk");
 const is_color_supported_1 = require("./chalk/is-color-supported");
-const check_apple_silicon_1 = require("./check-apple-silicon");
+const check_version_requirements_1 = require("./check-version-requirements");
 const codec_1 = require("./codec");
 const combine_videos_1 = require("./combine-videos");
 const get_executable_path_1 = require("./compositor/get-executable-path");
@@ -200,4 +200,4 @@ exports.RenderInternals = {
     makeDownloadMap: download_map_1.makeDownloadMap,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
-(0, check_apple_silicon_1.checkNodeVersionAndWarnAboutRosetta)('info', false);
+(0, check_version_requirements_1.checkNodeVersionAndWarnAboutRosetta)('info', false);

package/package.json

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