@remotion/renderer 4.0.0-alpha.4 → 4.0.0-alpha10

package/dist/get-frame-to-render.js

@@ -12,7 +12,7 @@ const getRealFrameRange = (durationInFrames, frameRange) => {
         return [frameRange, frameRange];
     }
     if (frameRange[1] >= durationInFrames || frameRange[0] < 0) {
-        throw new Error(`Frame range ${frameRange.join('-')} is not in between 0-${durationInFrames - 1}`);
+        throw new Error(`Frame range ${frameRange.join('-')} is not inbetween 0-${durationInFrames - 1}`);
     }
     return frameRange;
 };

package/dist/get-local-browser-executable.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalBrowserExecutable = exports.ensureLocalBrowser = void 0;
-const fs_1 = __importDefault(require("fs"));
+const node_fs_1 = __importDefault(require("node:fs"));
+const BrowserFetcher_1 = require("./browser/BrowserFetcher");
 const create_browser_fetcher_1 = require("./browser/create-browser-fetcher");
-const node_1 = require("./browser/node");
 const revisions_1 = require("./browser/revisions");
 const getSearchPathsForProduct = (product) => {
     var _a;
@@ -18,6 +18,7 @@ const getSearchPathsForProduct = (product) => {
                 : null,
             process.platform === 'linux' ? '/usr/bin/google-chrome' : null,
             process.platform === 'linux' ? '/usr/bin/chromium-browser' : null,
+            process.platform === 'linux' ? '/usr/bin/chromium' : null,
             process.platform === 'linux'
                 ? '/app/.apt/usr/bin/google-chrome-stable'
                 : null,
@@ -37,26 +38,15 @@ const getSearchPathsForProduct = (product) => {
 const mapBrowserToProduct = (browser) => browser;
 const getLocalBrowser = (product) => {
     for (const p of getSearchPathsForProduct(product)) {
-        if (fs_1.default.existsSync(p)) {
+        if (node_fs_1.default.existsSync(p)) {
             return p;
         }
     }
     return null;
 };
-const getBrowserRevision = (product) => {
-    const browserFetcher = node_1.puppeteer.createBrowserFetcher({
-        product,
-        path: null,
-        platform: null,
-    });
-    const revisionInfo = browserFetcher.revisionInfo(product === 'firefox'
-        ? revisions_1.PUPPETEER_REVISIONS.firefox
-        : revisions_1.PUPPETEER_REVISIONS.chromium);
-    return revisionInfo;
-};
 const getBrowserStatus = (product, browserExecutablePath) => {
     if (browserExecutablePath) {
-        if (!fs_1.default.existsSync(browserExecutablePath)) {
+        if (!node_fs_1.default.existsSync(browserExecutablePath)) {
             console.warn(`Browser executable was specified as '${browserExecutablePath}' but the path doesn't exist.`);
         }
         return { path: browserExecutablePath, type: 'user-defined-path' };
@@ -65,8 +55,8 @@ const getBrowserStatus = (product, browserExecutablePath) => {
     if (localBrowser !== null) {
         return { path: localBrowser, type: 'local-browser' };
     }
-    const revision = getBrowserRevision(product);
-    if (revision.local !== null && fs_1.default.existsSync(revision.executablePath)) {
+    const revision = (0, BrowserFetcher_1.getRevisionInfo)(revisions_1.PUPPETEER_REVISIONS.chromium, product);
+    if (revision.local && node_fs_1.default.existsSync(revision.executablePath)) {
         return { path: revision.executablePath, type: 'local-puppeteer-browser' };
     }
     return { type: 'no-browser' };

package/dist/get-port.d.ts

@@ -1 +1,4 @@
-export declare const getDesiredPort: (desiredPort: number | undefined, from: number, to: number) => Promise<number>;
+export declare const getDesiredPort: (desiredPort: number | undefined, from: number, to: number) => Promise<{
+    port: number;
+    didUsePort: () => void;
+}>;

package/dist/get-port.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDesiredPort = void 0;
 const net_1 = __importDefault(require("net"));
-const p_limit_1 = require("./p-limit");
+const locks_1 = require("./locks");
 const getAvailablePort = (portToTry) => new Promise((resolve) => {
     let status = 'unavailable';
     const host = '127.0.0.1';
@@ -35,21 +35,21 @@ const getPort = async (from, to) => {
     }
     throw new Error('No available ports found');
 };
-const getDesiredPortUnlimited = async (desiredPort, from, to) => {
+const portLocks = (0, locks_1.createLock)({ timeout: 10000 });
+const getDesiredPort = async (desiredPort, from, to) => {
+    await portLocks.waitForAllToBeDone();
+    const lockPortSelection = portLocks.lock();
+    const didUsePort = () => portLocks.unlock(lockPortSelection);
     if (typeof desiredPort !== 'undefined' &&
         (await getAvailablePort(desiredPort)) === 'available') {
-        return desiredPort;
+        return { port: desiredPort, didUsePort };
     }
     const actualPort = await getPort(from, to);
     // If did specify a port but did not get that one, fail hard.
     if (desiredPort && desiredPort !== actualPort) {
         throw new Error(`You specified port ${desiredPort} to be used for the HTTP server, but it is not available. Choose a different port or remove the setting to let Remotion automatically select a free port.`);
     }
-    return actualPort;
-};
-const limit = (0, p_limit_1.pLimit)(1);
-const getDesiredPort = (desiredPort, from, to) => {
-    return limit(() => getDesiredPortUnlimited(desiredPort, from, to));
+    return { port: actualPort, didUsePort };
 };
 exports.getDesiredPort = getDesiredPort;
 const makeRange = (from, to) => {

package/dist/get-video-info.d.ts

@@ -1,3 +1,8 @@
 import type { DownloadMap, Vp9Result } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';
-export declare const getVideoInfo: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<Vp9Result>;
+export declare function getVideoInfoUncached({ src, ffprobeExecutable, remotionRoot, }: {
+    src: string;
+    ffprobeExecutable: FfmpegExecutable;
+    remotionRoot: string;
+}): Promise<Vp9Result>;
+export declare const getVideoInfo: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable, remotionRoot: string) => Promise<Vp9Result>;

package/dist/get-video-info.js

@@ -3,17 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVideoInfo = void 0;
+exports.getVideoInfo = exports.getVideoInfoUncached = void 0;
 const execa_1 = __importDefault(require("execa"));
 const calculate_sar_dar_pixels_1 = require("./calculate-sar-dar-pixels");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
 const p_limit_1 = require("./p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
-async function getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable) {
+async function getVideoInfoUncached({ src, ffprobeExecutable, remotionRoot, }) {
     var _a;
-    if (typeof downloadMap.isVp9VideoCache[src] !== 'undefined') {
-        return downloadMap.isVp9VideoCache[src];
-    }
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', [src]);
+    const task = await (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffprobeExecutable, remotionRoot, 'ffprobe'), [src]);
     const isVp9 = task.stderr.includes('Video: vp9');
     const isVp8 = task.stderr.includes('Video: vp8');
     const dimensions = (_a = task.stderr
@@ -37,13 +35,25 @@ async function getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable) {
         }
     }
     const result = {
-        specialVcodec: isVp9 ? 'vp9' : isVp8 ? 'vp8' : 'none',
+        specialVcodecForTransparency: isVp9 ? 'vp9' : isVp8 ? 'vp8' : 'none',
         needsResize,
     };
+    return result;
+}
+exports.getVideoInfoUncached = getVideoInfoUncached;
+async function getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot) {
+    if (typeof downloadMap.isVp9VideoCache[src] !== 'undefined') {
+        return downloadMap.isVp9VideoCache[src];
+    }
+    const result = await getVideoInfoUncached({
+        ffprobeExecutable,
+        remotionRoot,
+        src,
+    });
     downloadMap.isVp9VideoCache[src] = result;
     return downloadMap.isVp9VideoCache[src];
 }
-const getVideoInfo = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable));
+const getVideoInfo = (downloadMap, src, ffprobeExecutable, remotionRoot) => {
+    return limit(() => getVideoInfoUnlimited(downloadMap, src, ffprobeExecutable, remotionRoot));
 };
 exports.getVideoInfo = getVideoInfo;

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

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIdealVideoThreadsFlag = void 0;
-const os_1 = __importDefault(require("os"));
+const node_os_1 = __importDefault(require("node: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 freeMemory = node_os_1.default.freemem();
+    const cpus = node_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);

package/dist/guess-extension-for-media.d.ts

@@ -1 +1,3 @@
-export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "webm" | "mp4">;
+export declare const guessExtensionForVideo: ({ src }: {
+    src: string;
+}) => Promise<"mp3" | "wav" | "mp4" | "webm">;

package/dist/guess-extension-for-media.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.guessExtensionForVideo = void 0;
-const execa_1 = __importDefault(require("execa"));
-const guessExtensionForVideo = async (src) => {
-    const { stderr } = await (0, execa_1.default)('ffprobe', [src]);
-    if (stderr.includes('mp3,')) {
+const call_ffmpeg_1 = require("./call-ffmpeg");
+const guessExtensionForVideo = async ({ src }) => {
+    const { stderr } = await (0, call_ffmpeg_1.callFf)('ffprobe', [src]);
+    if (stderr.includes('Audio: mp3,')) {
         return 'mp3';
     }
     if (stderr.includes('Video: vp9')) {
@@ -22,6 +19,6 @@ const guessExtensionForVideo = async (src) => {
     if (stderr.includes('Video: h264')) {
         return 'mp4';
     }
-    throw new Error(`A media file ${src} which has no file extension and whose format could not be guessed. Is this a valid media file?`);
+    throw new Error(`The media file "${src}" has no file extension and the format could not be guessed. Tips: a) Ensure this is a valid video or audio file b) Add a file extension to the URL like ".mp4" c) Set a "Content-Type" or "Content-Disposition" header if possible.`);
 };
 exports.guessExtensionForVideo = guessExtensionForVideo;

package/dist/image-format.d.ts

@@ -1,7 +1,13 @@
 import type { PixelFormat } from './pixel-format';
-export declare const validImageFormats: readonly ["png", "jpeg", "none"];
-export declare type ImageFormat = typeof validImageFormats[number];
-export declare type StillImageFormat = 'png' | 'jpeg';
-export declare const DEFAULT_IMAGE_FORMAT: ImageFormat;
-export declare const validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: PixelFormat, imageFormat: ImageFormat) => 'none' | 'valid';
-export declare const validateNonNullImageFormat: (imageFormat: ImageFormat) => void;
+export declare const validVideoImageFormats: readonly ["png", "jpeg", "none"];
+export declare const validStillImageFormats: readonly ["png", "jpeg", "pdf", "webp"];
+export declare type VideoImageFormat = typeof validVideoImageFormats[number];
+export declare type StillImageFormat = typeof validStillImageFormats[number];
+/**
+ * @deprecated Use VideoImageFormat or StillImageFormat instead
+ */
+export declare type ImageFormat = 'This type is deprecated, use VideoImageFormat or StillImageFormat instead';
+export declare const DEFAULT_VIDEO_IMAGE_FORMAT: VideoImageFormat;
+export declare const DEFAULT_STILL_IMAGE_FORMAT: StillImageFormat;
+export declare const validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: PixelFormat | undefined, videoImageFormat: VideoImageFormat) => 'none' | 'valid';
+export declare const validateStillImageFormat: (imageFormat: StillImageFormat) => void;

package/dist/image-format.js

@@ -2,30 +2,36 @@
 // Keeping the default image format PNG if you don't pass a
 // value to the renderer for backwards compatibility.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateNonNullImageFormat = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.DEFAULT_IMAGE_FORMAT = exports.validImageFormats = void 0;
-exports.validImageFormats = ['png', 'jpeg', 'none'];
-// However, the CLI will override it and use JPEG if suitable.
-exports.DEFAULT_IMAGE_FORMAT = 'png';
+exports.validateStillImageFormat = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.DEFAULT_STILL_IMAGE_FORMAT = exports.DEFAULT_VIDEO_IMAGE_FORMAT = exports.validStillImageFormats = exports.validVideoImageFormats = void 0;
+exports.validVideoImageFormats = ['png', 'jpeg', 'none'];
+exports.validStillImageFormats = ['png', 'jpeg', 'pdf', 'webp'];
+exports.DEFAULT_VIDEO_IMAGE_FORMAT = 'jpeg';
+exports.DEFAULT_STILL_IMAGE_FORMAT = 'png';
 // By returning a value, we improve testability as we can specifically test certain branches
-const validateSelectedPixelFormatAndImageFormatCombination = (pixelFormat, imageFormat) => {
-    if (imageFormat === 'none') {
+const validateSelectedPixelFormatAndImageFormatCombination = (pixelFormat, videoImageFormat) => {
+    if (videoImageFormat === 'none') {
         return 'none';
     }
-    if (!exports.validImageFormats.includes(imageFormat)) {
-        throw new TypeError(`Value ${imageFormat} is not valid as an image format.`);
+    if (typeof pixelFormat === 'undefined') {
+        return 'valid';
+    }
+    if (!exports.validVideoImageFormats.includes(videoImageFormat)) {
+        throw new TypeError(`Value ${videoImageFormat} is not valid as an image format.`);
     }
     if (pixelFormat !== 'yuva420p' && pixelFormat !== 'yuva444p10le') {
         return 'valid';
     }
-    if (imageFormat !== 'png') {
+    if (videoImageFormat !== 'png') {
         throw new TypeError(`Pixel format was set to '${pixelFormat}' but the image format is not PNG. To render transparent videos, you need to set PNG as the image format.`);
     }
     return 'valid';
 };
 exports.validateSelectedPixelFormatAndImageFormatCombination = validateSelectedPixelFormatAndImageFormatCombination;
-const validateNonNullImageFormat = (imageFormat) => {
-    if (imageFormat !== 'jpeg' && imageFormat !== 'png') {
-        throw new TypeError('Image format should be either "png" or "jpeg"');
+const validateStillImageFormat = (imageFormat) => {
+    if (!exports.validStillImageFormats.includes(imageFormat)) {
+        throw new TypeError(String(`Image format should be one of: ${exports.validStillImageFormats
+            .map((v) => `"${v}"`)
+            .join(', ')}`));
     }
 };
-exports.validateNonNullImageFormat = validateNonNullImageFormat;
+exports.validateStillImageFormat = validateStillImageFormat;