@remotion/renderer 4.0.0-webhook.27 → 4.1.0-alpha2

package/dist/wait-for-symbolication-error-to-be-done.js

@@ -1,34 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForSymbolicationToBeDone = exports.unlockErrorSymbolicationLock = exports.registerErrorSymbolicationLock = void 0;
-let locks = [];
-const waiters = [];
-const registerErrorSymbolicationLock = () => {
-    const id = Math.random();
-    locks.push(id);
-    return id;
-};
-exports.registerErrorSymbolicationLock = registerErrorSymbolicationLock;
-const unlockErrorSymbolicationLock = (id) => {
-    locks = locks.filter((l) => l !== id);
-    resolveWaiters();
-};
-exports.unlockErrorSymbolicationLock = unlockErrorSymbolicationLock;
-const resolveWaiters = () => {
-    if (locks.length === 0) {
-        waiters.forEach((w) => w());
-    }
-};
-const waitForSymbolicationToBeDone = () => {
-    const success = new Promise((resolve) => {
-        waiters.push(() => {
-            resolve();
-        });
-    });
-    const timeout = new Promise((resolve) => {
-        setTimeout(() => resolve(), 5000);
-    });
-    resolveWaiters();
-    return Promise.all([success, timeout]);
-};
-exports.waitForSymbolicationToBeDone = waitForSymbolicationToBeDone;
+const locks_1 = require("./locks");
+const { lock, unlock, waitForAllToBeDone } = (0, locks_1.createLock)({ timeout: 50000 });
+exports.registerErrorSymbolicationLock = lock;
+exports.unlockErrorSymbolicationLock = unlock;
+exports.waitForSymbolicationToBeDone = waitForAllToBeDone;

package/dist/ws/ws-types.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ws = void 0;
 /* eslint-disable @typescript-eslint/no-unused-vars */
-// @ts-expect-error
+// eslint-disable-next-line @typescript-eslint/prefer-ts-expect-error
+// @ts-ignore
 const ws_1 = __importDefault(require("ws"));
 exports.ws = ws_1.default;

package/install-toolchain.mjs

@@ -0,0 +1,36 @@
+import {execSync} from 'node:child_process';
+import {existsSync, mkdirSync, unlinkSync} from 'node:fs';
+import {toolchains} from './toolchains.mjs';
+
+const unpatched = [
+	'x86_64-apple-darwin',
+	'aarch64-apple-darwin',
+	'x86_64-pc-windows-gnu',
+];
+
+for (const toolchain of toolchains) {
+	process.stdout.write(toolchain + '...');
+
+	execSync(
+		`curl https://remotion-ffmpeg-binaries.s3.eu-central-1.amazonaws.com/${toolchain}.zip -o ${toolchain}.zip`
+	);
+
+	if (!existsSync('toolchains')) {
+		mkdirSync('toolchains');
+	}
+
+	if (!existsSync('toolchains/' + toolchain)) {
+		mkdirSync('toolchains/' + toolchain);
+	}
+
+	execSync(`tar -xzf ../../${toolchain}.zip`, {
+		cwd: `toolchains/${toolchain}`,
+	});
+
+	unlinkSync(`${toolchain}.zip`);
+	process.stdout.write('Done.\n');
+}
+
+for (const target of unpatched) {
+	execSync(`rustup target add ${target}`);
+}

package/package.json

@@ -1,61 +1,71 @@
 {
-	"name": "@remotion/renderer",
-	"version": "4.0.0-webhook.27+eb81308ee",
-	"description": "Renderer for Remotion",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"sideEffects": false,
-	"scripts": {
-		"lint": "eslint src --ext ts,tsx",
-		"test": "vitest --run",
-		"watch": "tsc -w",
-		"build": "tsc -d"
-	},
-	"author": "",
-	"license": "SEE LICENSE IN LICENSE.md",
-	"repository": {
-		"url": "https://github.com/remotion-dev/remotion"
-	},
-	"bugs": {
-		"url": "https://github.com/remotion-dev/remotion/issues"
-	},
-	"dependencies": {
-		"execa": "5.1.1",
-		"extract-zip": "2.0.1",
-		"remotion": "4.0.0-webhook.27+eb81308ee",
-		"source-map": "^0.8.0-beta.0",
-		"ws": "8.7.0"
-	},
-	"peerDependencies": {
-		"react": ">=16.8.0",
-		"react-dom": ">=16.8.0"
-	},
-	"devDependencies": {
-		"@jonny/eslint-config": "3.0.266",
-		"@testing-library/dom": "^8.16.0",
-		"@testing-library/react": "13.3.0",
-		"@types/node": "^16.7.5",
-		"@types/progress": "2.0.5",
-		"@types/react": "18.0.1",
-		"@types/react-dom": "18.0.0",
-		"eslint": "8.13.0",
-		"prettier": "^2.0.5",
-		"prettier-plugin-organize-imports": "^2.3.4",
-		"react": "18.0.0",
-		"react-dom": "18.0.0",
-		"typescript": "^4.7.0",
-		"vitest": "^0.18.0"
-	},
-	"keywords": [
-		"remotion",
-		"ffmpeg",
-		"video",
-		"react",
-		"puppeteer",
-		"player"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"gitHead": "eb81308ee07a402f4a8dd9ff24306bb07dd78175"
-}
+  "name": "@remotion/renderer",
+  "version": "4.1.0-alpha2",
+  "description": "Renderer for Remotion",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "sideEffects": false,
+  "author": "Jonny Burger <jonny@remotion.dev>",
+  "license": "SEE LICENSE IN LICENSE.md",
+  "repository": {
+    "url": "https://github.com/remotion-dev/remotion"
+  },
+  "bugs": {
+    "url": "https://github.com/remotion-dev/remotion/issues"
+  },
+  "dependencies": {
+    "execa": "5.1.1",
+    "extract-zip": "2.0.1",
+    "source-map": "^0.8.0-beta.0",
+    "ws": "8.7.0",
+    "remotion": "4.1.0-alpha2"
+  },
+  "peerDependencies": {
+    "react": ">=16.8.0",
+    "react-dom": ">=16.8.0"
+  },
+  "devDependencies": {
+    "@jonny/eslint-config": "3.0.266",
+    "@testing-library/dom": "^8.16.0",
+    "@testing-library/react": "13.3.0",
+    "@types/node": "18.14.6",
+    "@types/progress": "2.0.5",
+    "@types/react": "18.0.26",
+    "@types/react-dom": "18.0.10",
+    "eslint": "8.42.0",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^2.3.4",
+    "react": "18.0.0",
+    "react-dom": "18.0.0",
+    "typescript": "4.9.5",
+    "vitest": "0.31.1",
+    "zod": "^3.21.4"
+  },
+  "optionalDependencies": {
+    "@remotion/compositor-darwin-x64": "4.1.0-alpha2",
+    "@remotion/compositor-darwin-arm64": "4.1.0-alpha2",
+    "@remotion/compositor-linux-arm64-musl": "4.1.0-alpha2",
+    "@remotion/compositor-linux-x64-gnu": "4.1.0-alpha2",
+    "@remotion/compositor-linux-arm64-gnu": "4.1.0-alpha2",
+    "@remotion/compositor-win32-x64-msvc": "4.1.0-alpha2",
+    "@remotion/compositor-linux-x64-musl": "4.1.0-alpha2"
+  },
+  "keywords": [
+    "remotion",
+    "ffmpeg",
+    "video",
+    "react",
+    "player"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "formatting": "prettier src --check",
+    "lint": "eslint src --ext ts,tsx",
+    "test": "vitest --run",
+    "watch": "tsc -w",
+    "build": "node build.mjs && tsc -d",
+    "build-all": "node build.mjs --all"
+  }
+}

package/types/ws/index.d.ts

@@ -6,7 +6,8 @@
 /* eslint-disable no-dupe-class-members */
 /// <reference types="node" />
 
-import {EventEmitter} from 'events';
+import type {Server as HTTPSServer} from 'https';
+import {EventEmitter} from 'node:events';
 import type {
 	Agent,
 	ClientRequest,
@@ -14,12 +15,11 @@ import type {
 	IncomingMessage,
 	OutgoingHttpHeaders,
 	Server as HTTPServer,
-} from 'http';
-import type {Server as HTTPSServer} from 'https';
+} from 'node:http';
+import type {URL} from 'node:url';
+import type {ZlibOptions} from 'node:zlib';
 import type {Duplex, DuplexOptions} from 'stream';
 import type {SecureContextOptions} from 'tls';
-import type {URL} from 'url';
-import type {ZlibOptions} from 'zlib';
 declare class WebSocket extends EventEmitter {
 	/** The connection is not yet open. */
 	static readonly CONNECTING: 0;

package/.prettierrc.js

@@ -1,14 +0,0 @@
-module.exports = {
-	singleQuote: true,
-	bracketSpacing: false,
-	useTabs: true,
-	overrides: [
-		{
-			files: ['*.yml'],
-			options: {
-				singleQuote: false,
-			},
-		},
-	],
-	plugins: [require.resolve('prettier-plugin-organize-imports')],
-};

package/dist/assets/dl-browser.d.ts

@@ -1 +0,0 @@
-export declare const downloadBrowser: (url: string) => Promise<void>;

package/dist/assets/dl-browser.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadBrowser = void 0;
-const listeners = {};
-const isDownloading = {};
-const waitForFfmpegToBeDownloaded = (url) => {
-    return new Promise((resolve) => {
-        if (!listeners[url]) {
-            listeners[url] = [];
-        }
-        listeners[url].push(resolve);
-    });
-};
-const downloadBrowser = async (url) => {
-    if (isDownloading[url]) {
-        console.log('WAITING');
-        return waitForFfmpegToBeDownloaded(url);
-    }
-    isDownloading[url] = true;
-    await new Promise((resolve) => {
-        console.log('DOWNLOADING BROWSER');
-        setTimeout(resolve, 20000);
-    });
-    isDownloading[url] = false;
-    if (!listeners[url]) {
-        listeners[url] = [];
-    }
-    listeners[url].forEach((listener) => listener());
-    listeners[url] = [];
-};
-exports.downloadBrowser = downloadBrowser;
-(0, exports.downloadBrowser)('https://remotion.dev').then(() => {
-    (0, exports.downloadBrowser)('https://remotion.dev').then(() => {
-        (0, exports.downloadBrowser)('https://remotion.dev').then(() => console.log('FINISHED DOWNLOADING'));
-        (0, exports.downloadBrowser)('https://remotion.dev').then(() => console.log('FINISHED DOWNLOADING'));
-        (0, exports.downloadBrowser)('https://remotion.dev').then(() => console.log('FINISHED DOWNLOADING'));
-    });
-});

package/dist/assets/get-video-stream-duration.d.ts

@@ -1,4 +0,0 @@
-import type { FfmpegExecutable } from '../ffmpeg-executable';
-import type { DownloadMap, VideoDurationResult } from './download-map';
-export declare const parseVideoStreamDuration: (stdout: string) => VideoDurationResult;
-export declare const getVideoStreamDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<VideoDurationResult>;

package/dist/assets/get-video-stream-duration.js

@@ -1,59 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVideoStreamDuration = exports.parseVideoStreamDuration = void 0;
-const execa_1 = __importDefault(require("execa"));
-const p_limit_1 = require("../p-limit");
-const limit = (0, p_limit_1.pLimit)(1);
-const parseAlternativeDuration = (stdout) => {
-    const webmDuration = stdout.match(/TAG:DURATION=([0-9.]+):([0-9.]+):([0-9.]+)/);
-    if (!webmDuration) {
-        return null;
-    }
-    const [, hours, minutes, seconds] = webmDuration;
-    const hoursAsNumber = Number(hours);
-    if (Number.isNaN(hoursAsNumber)) {
-        return null;
-    }
-    const minutesAsNumber = Number(minutes);
-    if (Number.isNaN(minutesAsNumber)) {
-        return null;
-    }
-    const secondsAsNumber = Number(seconds);
-    if (Number.isNaN(secondsAsNumber)) {
-        return null;
-    }
-    return secondsAsNumber + minutesAsNumber * 60 + hoursAsNumber * 3600;
-};
-const parseVideoStreamDuration = (stdout) => {
-    const duration = stdout.match(/duration=([0-9.]+)/);
-    const alternativeDuration = parseAlternativeDuration(stdout);
-    const fps = stdout.match(/r_frame_rate=([0-9.]+)\/([0-9.]+)/);
-    const result = {
-        duration: duration ? parseFloat(duration[1]) : alternativeDuration,
-        fps: fps ? parseInt(fps[1], 10) / parseInt(fps[2], 10) : null,
-    };
-    return result;
-};
-exports.parseVideoStreamDuration = parseVideoStreamDuration;
-async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable) {
-    if (downloadMap.videoDurationResultCache[src]) {
-        return downloadMap.videoDurationResultCache[src];
-    }
-    const args = [
-        ['-v', 'error'],
-        ['-select_streams', 'v:0'],
-        ['-show_entries', 'stream'],
-        [src],
-    ]
-        .reduce((acc, val) => acc.concat(val), [])
-        .filter(Boolean);
-    const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
-    return (0, exports.parseVideoStreamDuration)(task.stdout);
-}
-const getVideoStreamDuration = (downloadMap, src, ffprobeExecutable) => {
-    return limit(() => getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable));
-};
-exports.getVideoStreamDuration = getVideoStreamDuration;

package/dist/calculate-sar-dar-pixels.d.ts

@@ -1,9 +0,0 @@
-export declare const calculateDisplayVideoSize: ({ darX, darY, x, y, }: {
-    x: number;
-    y: number;
-    darX: number;
-    darY: number;
-}) => {
-    width: number;
-    height: number;
-};

package/dist/calculate-sar-dar-pixels.js

@@ -1,19 +0,0 @@
-"use strict";
-// https://superuser.com/questions/907933/correct-aspect-ratio-without-re-encoding-video-file
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateDisplayVideoSize = void 0;
-const calculateDisplayVideoSize = ({ darX, darY, x, y, }) => {
-    // We know two equations:
-    //   newWidth / newHeight = darX / darY
-    // and:
-    //   x * y = (newWidth * newHeight)
-    // I solved it then on pen and paper and simplified the formula:
-    const dimensions = x * y;
-    const newWidth = Math.sqrt(dimensions * (darX / darY));
-    const newHeight = dimensions / newWidth;
-    return {
-        height: Math.round(newHeight),
-        width: Math.round(newWidth),
-    };
-};
-exports.calculateDisplayVideoSize = calculateDisplayVideoSize;

package/dist/convert-to-pcm.d.ts

@@ -1,6 +0,0 @@
-import type { FfmpegExecutable } from './ffmpeg-executable';
-export declare const convertToPcm: ({ ffmpegExecutable, input, outName, }: {
-    ffmpegExecutable: FfmpegExecutable;
-    input: string;
-    outName: string;
-}) => Promise<void>;

package/dist/convert-to-pcm.js

@@ -1,20 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToPcm = void 0;
-const execa_1 = __importDefault(require("execa"));
-const sample_rate_1 = require("./sample-rate");
-const convertToPcm = async ({ ffmpegExecutable, input, outName, }) => {
-    await (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
-        '-i',
-        input,
-        '-c:a',
-        'pcm_s16le',
-        '-ar',
-        String(sample_rate_1.DEFAULT_SAMPLE_RATE),
-        outName,
-    ]);
-};
-exports.convertToPcm = convertToPcm;

package/dist/ensure-presentation-timestamp.d.ts

@@ -1,2 +0,0 @@
-import type { DownloadMap } from './assets/download-map';
-export declare const ensurePresentationTimestamps: (downloadMap: DownloadMap, src: string) => Promise<string>;

package/dist/ensure-presentation-timestamp.js

@@ -1,69 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensurePresentationTimestamps = void 0;
-const execa_1 = __importDefault(require("execa"));
-const path_1 = __importDefault(require("path"));
-const guess_extension_for_media_1 = require("./guess-extension-for-media");
-const truthy_1 = require("./truthy");
-let callbacks = [];
-const getTemporaryOutputName = async (src) => {
-    const parts = src.split(path_1.default.sep);
-    // If there is no file extension for the video, then we need to temporarily add an extension
-    const lastPart = parts[parts.length - 1];
-    const extraExtension = lastPart.includes('.')
-        ? null
-        : await (0, guess_extension_for_media_1.guessExtensionForVideo)(src);
-    return parts
-        .map((p, i) => {
-        if (i === parts.length - 1) {
-            return [`pts-${p}`, extraExtension].filter(truthy_1.truthy).join('.');
-        }
-        return p;
-    })
-        .join(path_1.default.sep);
-};
-const ensurePresentationTimestamps = async (downloadMap, src) => {
-    const elem = downloadMap.ensureFileHasPresentationTimestamp[src];
-    if ((elem === null || elem === void 0 ? void 0 : elem.type) === 'encoding') {
-        return new Promise((resolve) => {
-            callbacks.push({
-                src,
-                fn: (newSrc) => resolve(newSrc),
-            });
-        });
-    }
-    if ((elem === null || elem === void 0 ? void 0 : elem.type) === 'done') {
-        return elem.src;
-    }
-    downloadMap.ensureFileHasPresentationTimestamp[src] = { type: 'encoding' };
-    // If there is no file extension for the video, then we need to tempoa
-    const output = await getTemporaryOutputName(src);
-    await (0, execa_1.default)('ffmpeg', [
-        '-i',
-        src,
-        '-fflags',
-        '+genpts+igndts',
-        '-vcodec',
-        'copy',
-        '-acodec',
-        'copy',
-        output,
-        '-y',
-    ]);
-    callbacks = callbacks.filter((c) => {
-        if (c.src === src) {
-            c.fn(output);
-            return false;
-        }
-        return true;
-    });
-    downloadMap.ensureFileHasPresentationTimestamp[src] = {
-        type: 'done',
-        src: output,
-    };
-    return output;
-};
-exports.ensurePresentationTimestamps = ensurePresentationTimestamps;

package/dist/extract-frame-from-video.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="node" />
-import type { OffthreadVideoImageFormat } from 'remotion';
-import type { DownloadMap } from './assets/download-map';
-import type { FfmpegExecutable } from './ffmpeg-executable';
-import type { LastFrameOptions } from './last-frame-from-video-cache';
-export declare const getLastFrameOfVideo: (options: LastFrameOptions) => Promise<Buffer>;
-declare type Options = {
-    time: number;
-    src: string;
-    ffmpegExecutable: FfmpegExecutable;
-    ffprobeExecutable: FfmpegExecutable;
-    imageFormat: OffthreadVideoImageFormat;
-    downloadMap: DownloadMap;
-};
-export declare const extractFrameFromVideo: (options: Options) => Promise<Buffer>;
-export {};