@remotion/renderer 3.1.4 → 3.1.7

package/dist/screenshot-task.js

@@ -5,35 +5,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._screenshotTask = void 0;
 const fs_1 = __importDefault(require("fs"));
-const remotion_1 = require("remotion");
+const perf_1 = require("./perf");
 const _screenshotTask = async (page, format, options) => {
     const client = page._client();
     const target = page.target();
-    const perfTarget = remotion_1.Internals.perf.startPerfMeasure('activate-target');
+    const perfTarget = (0, perf_1.startPerfMeasure)('activate-target');
     await client.send('Target.activateTarget', {
         targetId: target._targetId,
     });
-    remotion_1.Internals.perf.stopPerfMeasure(perfTarget);
+    (0, perf_1.stopPerfMeasure)(perfTarget);
     const shouldSetDefaultBackground = options.omitBackground && format === 'png';
     if (shouldSetDefaultBackground)
         await client.send('Emulation.setDefaultBackgroundColorOverride', {
             color: { r: 0, g: 0, b: 0, a: 0 },
         });
-    const cap = remotion_1.Internals.perf.startPerfMeasure('capture');
+    const cap = (0, perf_1.startPerfMeasure)('capture');
     const result = await client.send('Page.captureScreenshot', {
         format,
         quality: options.quality,
         clip: undefined,
         captureBeyondViewport: true,
     });
-    remotion_1.Internals.perf.stopPerfMeasure(cap);
+    (0, perf_1.stopPerfMeasure)(cap);
     if (shouldSetDefaultBackground)
         await client.send('Emulation.setDefaultBackgroundColorOverride');
-    const saveMarker = remotion_1.Internals.perf.startPerfMeasure('save');
+    const saveMarker = (0, perf_1.startPerfMeasure)('save');
     const buffer = Buffer.from(result.data, 'base64');
     if (options.path)
         await fs_1.default.promises.writeFile(options.path, buffer);
-    remotion_1.Internals.perf.stopPerfMeasure(saveMarker);
+    (0, perf_1.stopPerfMeasure)(saveMarker);
     return buffer;
 };
 exports._screenshotTask = _screenshotTask;

package/dist/serve-static.d.ts

@@ -1,12 +1,13 @@
-import type { FfmpegExecutable } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { DownloadMap } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 export declare const serveStatic: (path: string | null, options: {
     port: number | null;
     ffmpegExecutable: FfmpegExecutable;
     ffprobeExecutable: FfmpegExecutable;
-    downloadDir: string;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;
+    downloadMap: DownloadMap;
 }) => Promise<{
     port: number;
     close: () => Promise<void>;

package/dist/serve-static.js

@@ -5,19 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveStatic = void 0;
 const http_1 = __importDefault(require("http"));
-const remotion_1 = require("remotion");
 const get_port_1 = require("./get-port");
 const offthread_video_server_1 = require("./offthread-video-server");
 const serve_handler_1 = require("./serve-handler");
 const serveStatic = async (path, options) => {
-    var _a, _b;
-    const port = await (0, get_port_1.getDesiredPort)((_b = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : remotion_1.Internals.getServerPort()) !== null && _b !== void 0 ? _b : undefined, 3000, 3100);
+    var _a;
+    const port = await (0, get_port_1.getDesiredPort)((_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : undefined, 3000, 3100);
     const offthreadRequest = (0, offthread_video_server_1.startOffthreadVideoServer)({
         ffmpegExecutable: options.ffmpegExecutable,
         ffprobeExecutable: options.ffprobeExecutable,
-        downloadDir: options.downloadDir,
         onDownload: options.onDownload,
         onError: options.onError,
+        downloadMap: options.downloadMap,
     });
     try {
         const server = http_1.default

package/dist/set-props-and-env.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setPropsAndEnv = void 0;
-const remotion_1 = require("remotion");
+const TimeoutSettings_1 = require("./browser/TimeoutSettings");
 const normalize_serve_url_1 = require("./normalize-serve-url");
 const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const setPropsAndEnv = async ({ inputProps, envVariables, page, serveUrl, initialFrame, timeoutInMilliseconds, proxyPort, retriesRemaining, }) => {
     (0, validate_puppeteer_timeout_1.validatePuppeteerTimeout)(timeoutInMilliseconds);
-    const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : remotion_1.Internals.DEFAULT_PUPPETEER_TIMEOUT;
+    const actualTimeout = timeoutInMilliseconds !== null && timeoutInMilliseconds !== void 0 ? timeoutInMilliseconds : TimeoutSettings_1.DEFAULT_TIMEOUT;
     page.setDefaultTimeout(actualTimeout);
     page.setDefaultNavigationTimeout(actualTimeout);
     const urlToVisit = (0, normalize_serve_url_1.normalizeServeUrl)(serveUrl);

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

@@ -1,7 +1,12 @@
 /// <reference types="node" />
-import type { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import type { RenderAssetInfo } from './assets/download-map';
+import type { Codec } from './codec';
+import type { FfmpegExecutable } from './ffmpeg-executable';
+import type { ImageFormat } from './image-format';
 import type { CancelSignal } from './make-cancel-signal';
+import type { PixelFormat } from './pixel-format';
+import type { ProResProfile } from './prores-profile';
 export declare type StitcherOptions = {
     fps: number;
     width: number;

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

@@ -35,8 +35,10 @@ const remotion_1 = require("remotion");
 const calculate_asset_positions_1 = require("./assets/calculate-asset-positions");
 const convert_assets_to_file_urls_1 = require("./assets/convert-assets-to-file-urls");
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
+const codec_1 = require("./codec");
 const codec_supports_media_1 = require("./codec-supports-media");
 const convert_number_of_gif_loops_to_ffmpeg_1 = require("./convert-number-of-gif-loops-to-ffmpeg");
+const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
 const get_audio_codec_name_1 = require("./get-audio-codec-name");
 const get_codec_name_1 = require("./get-codec-name");
@@ -44,21 +46,23 @@ const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_prores_profile_name_1 = require("./get-prores-profile-name");
 const merge_audio_track_1 = require("./merge-audio-track");
 const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
+const pixel_format_1 = require("./pixel-format");
 const preprocess_audio_track_1 = require("./preprocess-audio-track");
 const tmp_dir_1 = require("./tmp-dir");
+const truthy_1 = require("./truthy");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
 const packageJson = fs_1.default.existsSync(packageJsonPath)
     ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
-const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, downloadMap, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
-        downloadDir,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
+        downloadMap,
     });
-    (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)();
+    (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)(downloadMap);
     const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
     if (verbose) {
         console.log('asset positions', assetPositions);
@@ -77,11 +81,12 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
             asset,
             expectedFrames,
             fps,
+            downloadMap,
         });
         preprocessProgress[index] = 1;
         updateProgress();
         return result;
-    }))).filter(remotion_1.Internals.truthy);
+    }))).filter(truthy_1.truthy);
     const outName = path_1.default.join((0, tmp_dir_1.tmpDir)('remotion-audio-preprocessing'), `audio.wav`);
     await (0, merge_audio_track_1.mergeAudioTrack)({
         ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
@@ -100,16 +105,16 @@ const spawnFfmpeg = async (options) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
-    const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : remotion_1.Internals.DEFAULT_CODEC;
+    const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : codec_1.DEFAULT_CODEC;
     (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
         width: options.width,
         height: options.height,
         codec,
         scale: 1,
     });
-    remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', codec);
-    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
-    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
+    remotion_1.Internals.validateFps(options.fps, 'in `stitchFramesToVideo()`', false);
+    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : (0, crf_1.getDefaultCrfForCodec)(codec);
+    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : pixel_format_1.DEFAULT_PIXEL_FORMAT;
     await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
     const encoderName = (0, get_codec_name_1.getCodecName)(codec);
     const audioCodecName = (0, get_audio_codec_name_1.getAudioCodecName)(codec);
@@ -131,8 +136,8 @@ const spawnFfmpeg = async (options) => {
         console.log('[verbose] isAudioOnly', mediaSupport.audio && !mediaSupport.video);
         console.log('[verbose] proResProfileName', proResProfileName);
     }
-    remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
-    remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
+    (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
+    (0, pixel_format_1.validateSelectedPixelFormatAndCodecCombination)(pixelFormat, codec);
     const expectedFrames = options.assetsInfo.assets.length;
     const updateProgress = (preStitchProgress, muxProgress) => {
         var _a;
@@ -142,7 +147,6 @@ const spawnFfmpeg = async (options) => {
     const audio = mediaSupport.audio
         ? await getAssetsData({
             assets: options.assetsInfo.assets,
-            downloadDir: options.assetsInfo.downloadDir,
             onDownload: options.onDownload,
             fps: options.fps,
             expectedFrames,
@@ -150,6 +154,7 @@ const spawnFfmpeg = async (options) => {
             ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
             ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
             onProgress: (prog) => updateProgress(prog, 0),
+            downloadMap: options.assetsInfo.downloadMap,
         })
         : null;
     if (mediaSupport.audio && !mediaSupport.video) {

package/dist/stringify-ffmpeg-filter.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringifyFfmpegFilter = void 0;
-const remotion_1 = require("remotion");
 const calculate_atempo_1 = require("./assets/calculate-atempo");
 const ffmpeg_volume_expression_1 = require("./assets/ffmpeg-volume-expression");
 const sample_rate_1 = require("./sample-rate");
+const truthy_1 = require("./truthy");
 const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, volume, fps, playbackRate, durationInFrames, assetDuration, }) => {
     const startInVideoSeconds = startInVideo / fps;
     if (assetDuration && trimLeft >= assetDuration) {
@@ -50,7 +50,7 @@ const stringifyFfmpegFilter = ({ trimLeft, trimRight, channels, startInVideo, vo
                 ? 'apad=pad_len=' + Math.round(padAtEnd * sample_rate_1.DEFAULT_SAMPLE_RATE)
                 : null,
         ]
-            .filter(remotion_1.Internals.truthy)
+            .filter(truthy_1.truthy)
             .join(',') +
         `[a0]`);
 };

package/dist/symbolicate-stacktrace.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.symbolicateStackTrace = void 0;
-const remotion_1 = require("remotion");
 const source_map_1 = require("source-map");
 const read_file_1 = require("./assets/read-file");
+const truthy_1 = require("./truthy");
 function extractSourceMapUrl(fileContents) {
     const regex = /\/\/[#@] ?sourceMappingURL=([^\s'"]+)\s*$/gm;
     let match = null;
@@ -74,7 +74,7 @@ const symbolicateStackTrace = async (frames) => {
         ...new Set(frames
             .map((f) => f.fileName)
             .filter((f) => f.startsWith('http://') || f.startsWith('https://'))
-            .filter(remotion_1.Internals.truthy)),
+            .filter(truthy_1.truthy)),
     ];
     const maps = await Promise.all(uniqueFileNames.map(async (fileName) => {
         const fileContents = await fetchUrl(fileName);
@@ -105,6 +105,6 @@ const symbolicateStackTrace = async (frames) => {
             originalScriptCode: scriptCode,
         };
     })
-        .filter(remotion_1.Internals.truthy);
+        .filter(truthy_1.truthy);
 };
 exports.symbolicateStackTrace = symbolicateStackTrace;

package/dist/truthy.d.ts

@@ -0,0 +1,3 @@
+declare type Truthy<T> = T extends false | '' | 0 | null | undefined ? never : T;
+export declare function truthy<T>(value: T): value is Truthy<T>;
+export {};

package/dist/truthy.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.truthy = void 0;
+function truthy(value) {
+    return Boolean(value);
+}
+exports.truthy = truthy;

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { RenderAssetInfo } from 'remotion';
+import type { RenderAssetInfo } from './assets/download-map';
 export declare type RenderFramesOutput = {
     frameCount: number;
     assetsInfo: RenderAssetInfo;

package/dist/validate-even-dimensions-with-codec.d.ts

@@ -1,4 +1,4 @@
-import type { Codec } from 'remotion';
+import type { Codec } from './codec';
 export declare const validateEvenDimensionsWithCodec: ({ width, height, codec, scale, }: {
     width: number;
     height: number;

package/dist/validate-even-dimensions-with-codec.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateEvenDimensionsWithCodec = void 0;
-const remotion_1 = require("remotion");
+const truthy_1 = require("./truthy");
 const validateEvenDimensionsWithCodec = ({ width, height, codec, scale, }) => {
     if (codec !== 'h264-mkv' && codec !== 'h264' && codec !== 'h265') {
         return;
@@ -17,7 +17,7 @@ const validateEvenDimensionsWithCodec = ({ width, height, codec, scale, }) => {
                 ? `Change the width to ${Math.floor(width - 1)}px to fix this issue.`
                 : `You have used the "scale" option which might be the reason for the problem: The original width is ${width} and the scale is ${scale}x, which was multiplied to get the actual width.`,
         ]
-            .filter(remotion_1.Internals.truthy)
+            .filter(truthy_1.truthy)
             .join(' ');
         throw new Error(message);
     }

package/dist/validate-every-nth-frame.d.ts

@@ -0,0 +1 @@
+export declare const validateEveryNthFrame: (everyNthFrame: unknown) => void;

package/dist/validate-every-nth-frame.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateEveryNthFrame = void 0;
+const validateEveryNthFrame = (everyNthFrame) => {
+    if (typeof everyNthFrame === 'undefined') {
+        throw new TypeError(`Argument missing for parameter "everyNthFrame"`);
+    }
+    if (typeof everyNthFrame !== 'number') {
+        throw new TypeError(`Argument passed to "everyNthFrame" is not a number: ${everyNthFrame}`);
+    }
+    if (everyNthFrame < 1) {
+        throw new RangeError(`The value for "everyNthFrame" cannot be below 1, but is ${everyNthFrame}`);
+    }
+    if (!Number.isFinite(everyNthFrame)) {
+        throw new RangeError(`"everyNthFrame" ${everyNthFrame} is not finite`);
+    }
+    if (everyNthFrame % 1 !== 0) {
+        throw new RangeError(`Argument for everyNthFrame must be an integer, but got ${everyNthFrame}`);
+    }
+};
+exports.validateEveryNthFrame = validateEveryNthFrame;

package/dist/validate-ffmpeg.js

@@ -7,7 +7,6 @@ exports.validateFfmpeg = exports.binaryExists = void 0;
 const execa_1 = __importDefault(require("execa"));
 const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
-const remotion_1 = require("remotion");
 const existsMap = {};
 const binaryExists = async (name, localFFmpeg) => {
     if (typeof existsMap[name] !== 'undefined') {
@@ -42,9 +41,9 @@ const isHomebrewInstalled = () => {
 const validateFfmpeg = async (customFfmpegBinary) => {
     const ffmpegExists = await (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
     if (!ffmpegExists) {
-        if (remotion_1.Internals.getCustomFfmpegExecutable()) {
+        if (customFfmpegBinary) {
             console.error('FFmpeg executable not found:');
-            console.error(remotion_1.Internals.getCustomFfmpegExecutable());
+            console.error(customFfmpegBinary);
             process.exit(1);
         }
         console.error('It looks like FFMPEG is not installed');

package/dist/validate-frame.d.ts

@@ -0,0 +1 @@
+export declare const validateFrame: (frame: number, durationInFrames: number) => void;

package/dist/validate-frame.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFrame = void 0;
+const validateFrame = (frame, durationInFrames) => {
+    if (typeof frame === 'undefined') {
+        throw new TypeError(`Argument missing for parameter "frame"`);
+    }
+    if (typeof frame !== 'number') {
+        throw new TypeError(`Argument passed for "frame" is not a number: ${frame}`);
+    }
+    if (frame < 0) {
+        throw new RangeError(`Frame ${frame} cannot be negative`);
+    }
+    if (!Number.isFinite(frame)) {
+        throw new RangeError(`Frame ${frame} is not finite`);
+    }
+    if (frame % 1 !== 0) {
+        throw new RangeError(`Argument for frame must be an integer, but got ${frame}`);
+    }
+    if (frame > durationInFrames - 1) {
+        throw new RangeError(`Cannot use frame ${frame}: Duration of composition is ${durationInFrames}, therefore the highest frame that can be rendered is ${durationInFrames - 1}`);
+    }
+};
+exports.validateFrame = validateFrame;

package/dist/validate-opengl-renderer.d.ts

@@ -0,0 +1,5 @@
+declare const validRenderers: readonly ["swangle", "angle", "egl", "swiftshader"];
+export declare type OpenGlRenderer = typeof validRenderers[number];
+export declare const DEFAULT_OPENGL_RENDERER: OpenGlRenderer | null;
+export declare const validateOpenGlRenderer: (option: OpenGlRenderer | null) => OpenGlRenderer | null;
+export {};

package/dist/validate-opengl-renderer.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOpenGlRenderer = exports.DEFAULT_OPENGL_RENDERER = void 0;
+const validRenderers = ['swangle', 'angle', 'egl', 'swiftshader'];
+exports.DEFAULT_OPENGL_RENDERER = null;
+const validateOpenGlRenderer = (option) => {
+    if (option === null) {
+        return null;
+    }
+    if (!validRenderers.includes(option)) {
+        throw new TypeError(`${option} is not a valid GL backend. Accepted values: ${validRenderers.join(', ')}`);
+    }
+    return option;
+};
+exports.validateOpenGlRenderer = validateOpenGlRenderer;

package/dist/validate-output-filename.d.ts

@@ -1,2 +1,2 @@
-import type { Codec } from 'remotion';
+import type { Codec } from './codec';
 export declare const validateOutputFilename: (codec: Codec, extension: string | null) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.1.4",
+	"version": "3.1.7",
 	"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.1.4",
+		"remotion": "3.1.7",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "cb662e72c635e5e70c5541d85e276ce2f4075099"
+	"gitHead": "599379fef6043a7125d1979766f915580ec1cf77"
 }