@remotion/renderer 3.2.21 → 3.2.23

package/dist/browser/BrowserFetcher.js

@@ -60,10 +60,10 @@ const http = __importStar(require("http"));
 const https = __importStar(require("https"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
-const util = __importStar(require("util"));
+const util_1 = __importDefault(require("util"));
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const URL = __importStar(require("url"));
-const util_1 = require("util");
+const util_2 = require("util");
 const assert_1 = require("./assert");
 const delete_directory_1 = require("../delete-directory");
 const get_download_destination_1 = require("./get-download-destination");
@@ -106,7 +106,7 @@ function archiveName(product, platform, revision) {
                 case 'win64':
                     // Windows archive name changed at r591479.
                     return parseInt(revision, 10) > 591479
-                        ? 'chrome-win'
+                        ? 'Thorium_107.0.5271.0\\BIN'
                         : 'chrome-win32';
                 default:
                     throw new Error('unknown browser');
@@ -118,8 +118,10 @@ function archiveName(product, platform, revision) {
     }
 }
 function _downloadURL(product, platform, host, revision) {
-    const url = util.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
-    return url;
+    if (platform === 'win64' || platform === 'win32') {
+        return 'https://remotionchromium-binaries.s3.eu-central-1.amazonaws.com/thorium-107.zip';
+    }
+    return util_1.default.format(downloadURLs[product][platform], host, revision, archiveName(product, platform, revision));
 }
 function handleArm64() {
     let exists = fs.existsSync('/usr/bin/chromium-browser');
@@ -136,10 +138,10 @@ function handleArm64() {
         '\n\n sudo apt install chromium-browser\n');
     throw new Error();
 }
-const readdirAsync = (0, util_1.promisify)(fs.readdir.bind(fs));
-const mkdirAsync = (0, util_1.promisify)(fs.mkdir.bind(fs));
-const unlinkAsync = (0, util_1.promisify)(fs.unlink.bind(fs));
-const chmodAsync = (0, util_1.promisify)(fs.chmod.bind(fs));
+const readdirAsync = (0, util_2.promisify)(fs.readdir.bind(fs));
+const mkdirAsync = (0, util_2.promisify)(fs.mkdir.bind(fs));
+const unlinkAsync = (0, util_2.promisify)(fs.unlink.bind(fs));
+const chmodAsync = (0, util_2.promisify)(fs.chmod.bind(fs));
 function existsAsync(filePath) {
     return new Promise((resolve) => {
         fs.access(filePath, (err) => {
@@ -325,7 +327,7 @@ class BrowserFetcher {
                 executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'chrome');
             }
             else if (__classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win32' || __classPrivateFieldGet(this, _BrowserFetcher_platform, "f") === 'win64') {
-                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'chrome.exe');
+                executablePath = path.join(folderPath, archiveName(__classPrivateFieldGet(this, _BrowserFetcher_product, "f"), __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"), revision), 'thorium.exe');
             }
             else {
                 throw new Error('Unsupported platform: ' + __classPrivateFieldGet(this, _BrowserFetcher_platform, "f"));

package/dist/ffmpeg-override.d.ts

@@ -0,0 +1,4 @@
+export declare type FfmpegOverrideFn = (info: {
+    type: 'pre-stitcher' | 'stitcher';
+    args: string[];
+}) => string[];

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';
@@ -13,6 +14,7 @@ export { Crf } from './crf';
 export { ErrorWithStackFrame } from './error-handling/handle-javascript-exception';
 export { FfmpegExecutable } from './ffmpeg-executable';
 export { FfmpegVersion } from './ffmpeg-flags';
+export type { FfmpegOverrideFn } from './ffmpeg-override';
 export { FrameRange } from './frame-range';
 export { getCompositions } from './get-compositions';
 export { ImageFormat, StillImageFormat, validateSelectedPixelFormatAndImageFormatCombination, validImageFormats, } from './image-format';
@@ -67,7 +69,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" | "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;
@@ -122,8 +124,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: "swangle" | "angle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
+    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"];
@@ -135,12 +137,12 @@ 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: "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";
+    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: "error" | "info" | "verbose" | "warn", level: "error" | "info" | "verbose" | "warn") => 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/prespawn-ffmpeg.d.ts

@@ -1,6 +1,7 @@
 import execa from 'execa';
 import type { Codec } from './codec';
 import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { FfmpegOverrideFn } from './ffmpeg-override';
 import type { ImageFormat } from './image-format';
 import type { CancelSignal } from './make-cancel-signal';
 import type { PixelFormat } from './pixel-format';
@@ -18,6 +19,7 @@ declare type PreSticherOptions = {
     verbose: boolean;
     ffmpegExecutable: FfmpegExecutable | undefined;
     imageFormat: ImageFormat;
+    ffmpegOverride?: FfmpegOverrideFn;
     signal: CancelSignal;
 };
 export declare const prespawnFfmpeg: (options: PreSticherOptions) => Promise<{

package/dist/prespawn-ffmpeg.js

@@ -75,7 +75,10 @@ const prespawnFfmpeg = async (options) => {
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', ffmpegString);
+    const finalFfmpegString = options.ffmpegOverride
+        ? options.ffmpegOverride({ type: 'pre-stitcher', args: ffmpegString })
+        : ffmpegString;
+    const task = (0, execa_1.default)((_f = options.ffmpegExecutable) !== null && _f !== void 0 ? _f : 'ffmpeg', finalFfmpegString);
     options.signal(() => {
         task.kill();
     });

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';
@@ -6,6 +7,7 @@ import type { BrowserLog } from './browser-log';
 import type { Browser as PuppeteerBrowser } from './browser/Browser';
 import type { Codec } from './codec';
 import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { FfmpegOverrideFn } from './ffmpeg-override';
 import type { FrameRange } from './frame-range';
 import type { ServeUrlOrWebpackBundle } from './legacy-webpack-config';
 import type { CancelSignal } from './make-cancel-signal';
@@ -58,6 +60,7 @@ export declare type RenderMediaOptions = {
     downloadMap?: DownloadMap;
     muted?: boolean;
     enforceAudioTrack?: boolean;
+    ffmpegOverride?: FfmpegOverrideFn;
 } & ServeUrlOrWebpackBundle & ConcurrencyOrParallelism;
 declare type ConcurrencyOrParallelism = {
     concurrency?: number | null;
@@ -72,5 +75,5 @@ declare type ConcurrencyOrParallelism = {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-export declare const renderMedia: ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
+export declare const renderMedia: ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
 export {};

package/dist/render-media.js

@@ -30,6 +30,7 @@ const quality_1 = require("./quality");
 const render_frames_1 = require("./render-frames");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
+const validate_ffmpeg_override_1 = require("./validate-ffmpeg-override");
 const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
 const getConcurrency = (others) => {
@@ -46,7 +47,7 @@ const getConcurrency = (others) => {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ...options }) => {
+const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, ...options }) => {
     var _a, _b, _c, _d;
     (0, quality_1.validateQuality)(options.quality);
     if (typeof crf !== 'undefined' && crf !== null) {
@@ -60,6 +61,7 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
         : null;
     (0, validate_scale_1.validateScale)(scale);
     const concurrency = getConcurrency(options);
+    (0, validate_ffmpeg_override_1.validateFfmpegOverride)(ffmpegOverride);
     const everyNthFrame = (_a = options.everyNthFrame) !== null && _a !== void 0 ? _a : 1;
     const numberOfGifLoops = (_b = options.numberOfGifLoops) !== null && _b !== void 0 ? _b : null;
     const serveUrl = (0, legacy_webpack_config_1.getServeUrlWithFallback)(options);
@@ -146,6 +148,7 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
                 ffmpegExecutable,
                 imageFormat,
                 signal: cancelPrestitcher.cancelSignal,
+                ffmpegOverride,
             });
             stitcherFfmpeg = preStitcher.task;
         }
@@ -257,6 +260,7 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
                 cancelSignal: cancelStitcher.cancelSignal,
                 muted: disableAudio,
                 enforceAudioTrack,
+                ffmpegOverride,
             }),
             stitchStart,
         ]);

package/dist/stitch-frames-to-video.d.ts

@@ -3,6 +3,7 @@ import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-
 import type { RenderAssetInfo } from './assets/download-map';
 import type { Codec } from './codec';
 import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { FfmpegOverrideFn } from './ffmpeg-override';
 import type { ImageFormat } from './image-format';
 import type { CancelSignal } from './make-cancel-signal';
 import type { PixelFormat } from './pixel-format';
@@ -32,6 +33,7 @@ export declare type StitcherOptions = {
     };
     muted?: boolean;
     enforceAudioTrack?: boolean;
+    ffmpegOverride?: FfmpegOverrideFn;
 };
 declare type ReturnType = {
     task: Promise<Buffer | null>;

package/dist/stitch-frames-to-video.js

@@ -116,6 +116,9 @@ const spawnFfmpeg = async (options) => {
         if (supportsCrf) {
             console.log('[verbose] crf', crf);
         }
+        if (options.ffmpegOverride) {
+            console.log('[verbose] ffmpegOverride', options.ffmpegOverride);
+        }
         console.log('[verbose] codec', codec);
         console.log('[verbose] shouldRenderAudio', shouldRenderAudio);
         console.log('[verbose] shouldRenderVideo', shouldRenderVideo);
@@ -233,7 +236,14 @@ const spawnFfmpeg = async (options) => {
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_t = options.ffmpegExecutable) !== null && _t !== void 0 ? _t : 'ffmpeg', ffmpegString, {
+    const finalFfmpegString = options.ffmpegOverride
+        ? options.ffmpegOverride({ type: 'stitcher', args: ffmpegString })
+        : ffmpegString;
+    if (options.verbose && options.ffmpegOverride) {
+        console.log('Generated final FFMPEG command:');
+        console.log(finalFfmpegString);
+    }
+    const task = (0, execa_1.default)((_t = options.ffmpegExecutable) !== null && _t !== void 0 ? _t : 'ffmpeg', finalFfmpegString, {
         cwd: options.dir,
     });
     (_u = options.cancelSignal) === null || _u === void 0 ? void 0 : _u.call(options, () => {

package/dist/validate-ffmpeg-override.d.ts

@@ -0,0 +1,2 @@
+import type { FfmpegOverrideFn } from './ffmpeg-override';
+export declare const validateFfmpegOverride: (ffmpegArgsHook?: FfmpegOverrideFn) => void;

package/dist/{validate-ffmpeg-args-hook.js → validate-ffmpeg-override.js}

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFfmpegArgsHook = void 0;
-const validateFfmpegArgsHook = (ffmpegArgsHook) => {
+exports.validateFfmpegOverride = void 0;
+const validateFfmpegOverride = (ffmpegArgsHook) => {
+    if (typeof ffmpegArgsHook === 'undefined') {
+        return;
+    }
     if (ffmpegArgsHook && typeof ffmpegArgsHook !== 'function') {
         throw new TypeError(`Argument passed for "ffmpegArgsHook" is not a function: ${ffmpegArgsHook}`);
     }
 };
-exports.validateFfmpegArgsHook = validateFfmpegArgsHook;
+exports.validateFfmpegOverride = validateFfmpegOverride;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.21",
+	"version": "3.2.23",
 	"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.2.21",
+		"remotion": "3.2.23",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "7236c416c1efcc6079ad262d6d5afa10e6775b81"
+	"gitHead": "34a407a825ded88c9058bcf0e9ec4fe04024b7ce"
 }

package/dist/ffmpeg-args-hook.d.ts

@@ -1 +0,0 @@
-export declare type FfmpegArgsHook = (args: string[]) => string[];

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;

package/dist/validate-ffmpeg-args-hook.d.ts

@@ -1,2 +0,0 @@
-import type { FfmpegArgsHook } from './ffmpeg-args-hook';
-export declare const validateFfmpegArgsHook: (ffmpegArgsHook?: FfmpegArgsHook) => void;