@remotion/renderer 4.0.97 → 4.0.100

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/client.d.ts

@@ -316,7 +316,7 @@ export declare const BrowserSafeApis: {
             cliFlag: "gl";
             docLink: string;
             name: string;
-            type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+            type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
             ssrName: string;
             description: () => import("react/jsx-runtime").JSX.Element;
         };

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

@@ -3,4 +3,5 @@ export declare function isMusl({ indent, logLevel, }: {
     indent: boolean;
     logLevel: LogLevel;
 }): boolean;
-export declare const getExecutablePath: (type: 'compositor' | 'ffmpeg' | 'ffprobe' | 'ffmpeg-cwd', indent: boolean, logLevel: LogLevel) => string;
+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,7 +1,11 @@
 "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 = exports.isMusl = 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, }) {
@@ -19,30 +23,50 @@ function isMusl({ indent, logLevel, }) {
 }
 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.resolve(base, 'compositor.exe');
+            }
+            return path_1.default.resolve(base, 'compositor');
+        case 'ffmpeg':
+            if (process.platform === 'win32') {
+                return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffmpeg.exe');
+            }
+            return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffmpeg');
+        case 'ffprobe':
+            if (process.platform === 'win32') {
+                return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffprobe.exe');
+            }
+            return path_1.default.resolve(base, 'ffmpeg', 'remotion', 'bin', 'ffprobe');
+        case 'lib': {
+            const dir = path_1.default.resolve(base, 'ffmpeg', 'remotion', 'lib');
+            return dir;
+        }
+        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}`);
             }
@@ -51,14 +75,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}`);
             }
@@ -67,4 +91,4 @@ const getExecutablePath = (type, indent, logLevel) => {
             throw new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`);
     }
 };
-exports.getExecutablePath = getExecutablePath;
+exports.getExecutableDir = getExecutableDir;

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" | "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 getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">(codec: T, audioCodec: AudioCodec | null) => FileExtension;
+export declare const makeFileExtensionMap: () => Record<string, ("h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif")[]>;
 export declare const defaultCodecsForFileExtension: Record<FileExtension, Codec>;

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import execa from 'execa';
 import { HeadlessBrowser } from './browser/Browser';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
@@ -135,8 +137,8 @@ export declare const RenderInternals: {
     validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
     DEFAULT_BROWSER: "chrome";
     validateFrameRange: (frameRange: import("./frame-range").FrameRange | null) => void;
-    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
-    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    DEFAULT_OPENGL_RENDERER: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
+    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null) => "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl" | null;
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
     validateJpegQuality: (q: number | undefined) => void;
@@ -311,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: {
@@ -327,8 +329,8 @@ export declare const RenderInternals: {
     };
     validStillImageFormats: readonly ["png", "jpeg", "pdf", "webp"];
     validVideoImageFormats: readonly ["png", "jpeg", "none"];
-    DEFAULT_STILL_IMAGE_FORMAT: "png" | "jpeg" | "pdf" | "webp";
-    DEFAULT_VIDEO_IMAGE_FORMAT: "png" | "jpeg" | "none";
+    DEFAULT_STILL_IMAGE_FORMAT: "jpeg" | "png" | "webp" | "pdf";
+    DEFAULT_VIDEO_IMAGE_FORMAT: "jpeg" | "png" | "none";
     DEFAULT_JPEG_QUALITY: number;
     chalk: {
         enabled: () => boolean;
@@ -427,7 +429,7 @@ export declare const RenderInternals: {
         frame: number;
         serializedInputPropsWithCustomSchema: string;
         serializedResolvedPropsWithCustomSchema: string;
-        imageFormat: "png" | "jpeg" | "pdf" | "webp";
+        imageFormat: "jpeg" | "png" | "webp" | "pdf";
         jpegQuality: number;
         puppeteerInstance: HeadlessBrowser | null;
         envVariables: Record<string, string>;

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

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

package/dist/options/gl.d.ts

@@ -3,7 +3,7 @@ export declare const glOption: {
     cliFlag: "gl";
     docLink: string;
     name: string;
-    type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+    type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
     ssrName: string;
     description: () => import("react/jsx-runtime").JSX.Element;
 };

package/dist/options/index.d.ts

@@ -115,7 +115,7 @@ export declare const allOptions: {
         cliFlag: "gl";
         docLink: string;
         name: string;
-        type: "swangle" | "angle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
+        type: "angle" | "swangle" | "egl" | "swiftshader" | "vulkan" | "angle-egl";
         ssrName: string;
         description: () => import("react/jsx-runtime").JSX.Element;
     };

package/dist/pixel-format.d.ts

@@ -2,5 +2,5 @@ import type { Codec } from './codec';
 export declare const validPixelFormats: readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"];
 export type PixelFormat = (typeof validPixelFormats)[number];
 export declare const DEFAULT_PIXEL_FORMAT: PixelFormat;
-export declare const validPixelFormatsForCodec: (codec: Codec) => readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"] | ("yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le")[];
+export declare const validPixelFormatsForCodec: (codec: Codec) => readonly ["yuv420p", "yuva420p", "yuv422p", "yuv444p", "yuv420p10le", "yuv422p10le", "yuv444p10le", "yuva444p10le"] | ("yuv420p" | "yuv422p" | "yuv444p" | "yuva420p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le")[];
 export declare const validateSelectedPixelFormatAndCodecCombination: (pixelFormat: PixelFormat | undefined, codec: Codec) => undefined;

package/dist/pure.d.ts

@@ -1,10 +1,10 @@
 export declare const NoReactAPIs: {
     wrapWithErrorHandling: <A extends unknown[], R>(fn: (...args: A) => Promise<R>) => (...args: A) => Promise<R>;
     getExtensionOfFilename: (filename: string | null) => string | null;
-    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;
-    validateOutputFilename: <T_1 extends "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
+    getFileExtensionFromCodec: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">(codec: T, audioCodec: "opus" | "aac" | "mp3" | "pcm-16" | null) => import("./file-extensions").FileExtension;
+    validateOutputFilename: <T_1 extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
         codec: T_1;
-        audioCodec: "mp3" | "aac" | "pcm-16" | "opus" | null;
+        audioCodec: "opus" | "aac" | "mp3" | "pcm-16" | null;
         extension: string;
         preferLossless: boolean;
     }) => void;

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" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif">({ codec, audioCodec, extension, preferLossless, }: {
+export declare const validateOutputFilename: <T extends "h264" | "h265" | "vp8" | "vp9" | "prores" | "aac" | "mp3" | "wav" | "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.97",
+  "version": "4.0.100",
   "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.97"
+    "remotion": "4.0.100"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.97",
-    "@remotion/compositor-darwin-x64": "4.0.97",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.97",
-    "@remotion/compositor-linux-x64-gnu": "4.0.97",
-    "@remotion/compositor-linux-x64-musl": "4.0.97",
-    "@remotion/compositor-linux-arm64-musl": "4.0.97",
-    "@remotion/compositor-win32-x64-msvc": "4.0.97"
+    "@remotion/compositor-darwin-arm64": "4.0.100",
+    "@remotion/compositor-darwin-x64": "4.0.100",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.100",
+    "@remotion/compositor-linux-arm64-musl": "4.0.100",
+    "@remotion/compositor-linux-x64-gnu": "4.0.100",
+    "@remotion/compositor-linux-x64-musl": "4.0.100",
+    "@remotion/compositor-win32-x64-msvc": "4.0.100"
   },
   "keywords": [
     "remotion",

package/dist/check-apple-silicon.d.ts

@@ -1,3 +0,0 @@
-import type { LogLevel } from './log-level';
-export declare const gLibCErrorMessage: (libCString: string) => string | null;
-export declare const checkNodeVersionAndWarnAboutRosetta: (logLevel: LogLevel, indent: boolean) => void;

package/dist/check-apple-silicon.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkNodeVersionAndWarnAboutRosetta = exports.gLibCErrorMessage = void 0;
-const logger_1 = require("./logger");
-const gLibCErrorMessage = (libCString) => {
-    const split = libCString.split('.');
-    if (split.length !== 2) {
-        return null;
-    }
-    if (split[0] === '2' && Number(split[1]) >= 35) {
-        return null;
-    }
-    if (Number(split[0]) > 2) {
-        return null;
-    }
-    return `Rendering videos requires glibc 2.35 or higher. Your system has glibc ${libCString}.`;
-};
-exports.gLibCErrorMessage = gLibCErrorMessage;
-const checkLibCRequirement = (logLevel, indent) => {
-    const { report } = process;
-    if (report) {
-        // @ts-expect-error no types
-        const { glibcVersionRuntime } = report.getReport().header;
-        if (!glibcVersionRuntime) {
-            return;
-        }
-        const error = (0, exports.gLibCErrorMessage)(glibcVersionRuntime);
-        if (error) {
-            logger_1.Log.warn({ logLevel, indent }, error);
-        }
-    }
-};
-const checkNodeVersionAndWarnAboutRosetta = (logLevel, indent) => {
-    const version = process.version.replace('v', '').split('.');
-    const majorVersion = Number(version[0]);
-    const requiredNodeVersion = 16;
-    if (majorVersion < 16) {
-        throw new Error(`Remotion requires at least Node ${requiredNodeVersion}. You currently have ${process.version}. Update your node version to ${requiredNodeVersion} to use Remotion.`);
-    }
-    checkLibCRequirement(logLevel, indent);
-};
-exports.checkNodeVersionAndWarnAboutRosetta = checkNodeVersionAndWarnAboutRosetta;