@remotion/renderer 4.0.0-offthread.9 → 4.0.0-prefetch.7

package/dist/index.js

@@ -1,35 +1,88 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderInternals = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.getCompositions = exports.ErrorWithStackFrame = exports.combineVideos = void 0;
+exports.RenderInternals = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.ErrorWithStackFrame = exports.combineVideos = void 0;
+const execa_1 = __importDefault(require("execa"));
 const download_file_1 = require("./assets/download-file");
+const download_map_1 = require("./assets/download-map");
+const browser_1 = require("./browser");
+const TimeoutSettings_1 = require("./browser/TimeoutSettings");
+const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
+const codec_1 = require("./codec");
+const crf_1 = require("./crf");
 const delete_directory_1 = require("./delete-directory");
 const ensure_output_directory_1 = require("./ensure-output-directory");
 const symbolicate_error_1 = require("./error-handling/symbolicate-error");
 const symbolicateable_error_1 = require("./error-handling/symbolicateable-error");
 const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const frame_range_1 = require("./frame-range");
 const get_concurrency_1 = require("./get-concurrency");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_extension_of_filename_1 = require("./get-extension-of-filename");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const get_local_browser_executable_1 = require("./get-local-browser-executable");
+const get_port_1 = require("./get-port");
+const image_format_1 = require("./image-format");
+const is_audio_codec_1 = require("./is-audio-codec");
 const is_serve_url_1 = require("./is-serve-url");
+const log_level_1 = require("./log-level");
+const mime_types_1 = require("./mime-types");
 const normalize_serve_url_1 = require("./normalize-serve-url");
 const open_browser_1 = require("./open-browser");
+const overwrite_1 = require("./overwrite");
 const parse_browser_error_stack_1 = require("./parse-browser-error-stack");
+const perf = __importStar(require("./perf"));
+const pixel_format_1 = require("./pixel-format");
+const prores_profile_1 = require("./prores-profile");
+const quality_1 = require("./quality");
+const is_path_inside_1 = require("./serve-handler/is-path-inside");
 const serve_static_1 = require("./serve-static");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
 const tmp_dir_1 = require("./tmp-dir");
+const validate_concurrency_1 = require("./validate-concurrency");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
+const validate_every_nth_frame_1 = require("./validate-every-nth-frame");
 const validate_ffmpeg_1 = require("./validate-ffmpeg");
+const validate_frame_1 = require("./validate-frame");
+const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_scale_1 = require("./validate-scale");
+const wait_for_symbolication_error_to_be_done_1 = require("./wait-for-symbolication-error-to-be-done");
 var combine_videos_1 = require("./combine-videos");
 Object.defineProperty(exports, "combineVideos", { enumerable: true, get: function () { return combine_videos_1.combineVideos; } });
 var handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
 Object.defineProperty(exports, "ErrorWithStackFrame", { enumerable: true, get: function () { return handle_javascript_exception_1.ErrorWithStackFrame; } });
 var get_compositions_1 = require("./get-compositions");
 Object.defineProperty(exports, "getCompositions", { enumerable: true, get: function () { return get_compositions_1.getCompositions; } });
+var image_format_2 = require("./image-format");
+Object.defineProperty(exports, "validateSelectedPixelFormatAndImageFormatCombination", { enumerable: true, get: function () { return image_format_2.validateSelectedPixelFormatAndImageFormatCombination; } });
+Object.defineProperty(exports, "validImageFormats", { enumerable: true, get: function () { return image_format_2.validImageFormats; } });
 var make_cancel_signal_1 = require("./make-cancel-signal");
 Object.defineProperty(exports, "makeCancelSignal", { enumerable: true, get: function () { return make_cancel_signal_1.makeCancelSignal; } });
 var open_browser_2 = require("./open-browser");
@@ -67,6 +120,42 @@ exports.RenderInternals = {
     parseStack: parse_browser_error_stack_1.parseStack,
     symbolicateError: symbolicate_error_1.symbolicateError,
     SymbolicateableError: symbolicateable_error_1.SymbolicateableError,
-    getDurationFromFrameRange: get_duration_from_frame_range_1.getDurationFromFrameRange,
+    getFramesToRender: get_duration_from_frame_range_1.getFramesToRender,
     getExtensionOfFilename: get_extension_of_filename_1.getExtensionOfFilename,
+    getDesiredPort: get_port_1.getDesiredPort,
+    isPathInside: is_path_inside_1.isPathInside,
+    execa: execa_1.default,
+    registerErrorSymbolicationLock: wait_for_symbolication_error_to_be_done_1.registerErrorSymbolicationLock,
+    unlockErrorSymbolicationLock: wait_for_symbolication_error_to_be_done_1.unlockErrorSymbolicationLock,
+    canUseParallelEncoding: can_use_parallel_encoding_1.canUseParallelEncoding,
+    mimeContentType: mime_types_1.mimeContentType,
+    mimeLookup: mime_types_1.mimeLookup,
+    validateConcurrency: validate_concurrency_1.validateConcurrency,
+    validPixelFormats: pixel_format_1.validPixelFormats,
+    DEFAULT_BROWSER: browser_1.DEFAULT_BROWSER,
+    validateFrameRange: frame_range_1.validateFrameRange,
+    DEFAULT_OPENGL_RENDERER: validate_opengl_renderer_1.DEFAULT_OPENGL_RENDERER,
+    validateOpenGlRenderer: validate_opengl_renderer_1.validateOpenGlRenderer,
+    getDefaultCrfForCodec: crf_1.getDefaultCrfForCodec,
+    validateSelectedCrfAndCodecCombination: crf_1.validateSelectedCrfAndCodecCombination,
+    validImageFormats: image_format_1.validImageFormats,
+    validCodecs: codec_1.validCodecs,
+    DEFAULT_OVERWRITE: overwrite_1.DEFAULT_OVERWRITE,
+    DEFAULT_PIXEL_FORMAT: pixel_format_1.DEFAULT_PIXEL_FORMAT,
+    validateQuality: quality_1.validateQuality,
+    validateFrame: validate_frame_1.validateFrame,
+    DEFAULT_TIMEOUT: TimeoutSettings_1.DEFAULT_TIMEOUT,
+    getValidCrfRanges: crf_1.getValidCrfRanges,
+    validateSelectedPixelFormatAndCodecCombination: pixel_format_1.validateSelectedPixelFormatAndCodecCombination,
+    validateSelectedCodecAndProResCombination: prores_profile_1.validateSelectedCodecAndProResCombination,
+    validateSelectedPixelFormatAndImageFormatCombination: image_format_1.validateSelectedPixelFormatAndImageFormatCombination,
+    DEFAULT_CODEC: codec_1.DEFAULT_CODEC,
+    isAudioCodec: is_audio_codec_1.isAudioCodec,
+    logLevels: log_level_1.logLevels,
+    isEqualOrBelowLogLevel: log_level_1.isEqualOrBelowLogLevel,
+    isValidLogLevel: log_level_1.isValidLogLevel,
+    validateEveryNthFrame: validate_every_nth_frame_1.validateEveryNthFrame,
+    perf,
+    makeDownloadMap: download_map_1.makeDownloadMap,
+    cleanDownloadMap: download_map_1.cleanDownloadMap,
 };

package/dist/is-audio-codec.d.ts

@@ -0,0 +1,2 @@
+import type { Codec } from './codec';
+export declare const isAudioCodec: (codec: Codec | undefined) => boolean;

package/dist/is-audio-codec.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAudioCodec = void 0;
+const isAudioCodec = (codec) => {
+    return codec === 'mp3' || codec === 'aac' || codec === 'wav';
+};
+exports.isAudioCodec = isAudioCodec;

package/dist/is-beyond-last-frame.d.ts

@@ -1,2 +1,3 @@
-export declare const isBeyondLastFrame: (src: string, time: number) => boolean | 0;
-export declare const markAsBeyondLastFrame: (src: string, time: number) => void;
+import type { DownloadMap } from './assets/download-map';
+export declare const isBeyondLastFrame: (downloadMap: DownloadMap, src: string, time: number) => boolean | 0;
+export declare const markAsBeyondLastFrame: (downloadMap: DownloadMap, src: string, time: number) => void;

package/dist/is-beyond-last-frame.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.markAsBeyondLastFrame = exports.isBeyondLastFrame = void 0;
-const map = {};
-const isBeyondLastFrame = (src, time) => {
-    return map[src] && time >= map[src];
+const isBeyondLastFrame = (downloadMap, src, time) => {
+    return (downloadMap.isBeyondLastFrameMap[src] &&
+        time >= downloadMap.isBeyondLastFrameMap[src]);
 };
 exports.isBeyondLastFrame = isBeyondLastFrame;
-const markAsBeyondLastFrame = (src, time) => {
-    map[src] = time;
+const markAsBeyondLastFrame = (downloadMap, src, time) => {
+    downloadMap.isBeyondLastFrameMap[src] = time;
 };
 exports.markAsBeyondLastFrame = markAsBeyondLastFrame;

package/dist/last-frame-from-video-cache.d.ts

@@ -1,12 +1,16 @@
-/// <reference types="node" />
-import { FfmpegExecutable } from 'remotion';
+import type { OffthreadVideoImageFormat } from 'remotion';
+import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 export declare type LastFrameOptions = {
     ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     offset: number;
     src: string;
+    specialVCodecForTransparency: SpecialVCodecForTransparency;
+    imageFormat: OffthreadVideoImageFormat;
+    needsResize: [number, number] | null;
+    downloadMap: DownloadMap;
 };
 export declare const setLastFrameInCache: (options: LastFrameOptions, data: Buffer) => void;
 export declare const getLastFrameFromCache: (options: LastFrameOptions) => Buffer | null;
-export declare const removedLastFrameFromCache: (key: string) => void;
-export declare const ensureMaxSize: () => void;
-export declare const clearLastFileCache: () => void;
+export declare const clearLastFileCache: (downloadMap: DownloadMap) => void;

package/dist/last-frame-from-video-cache.js

@@ -1,52 +1,55 @@
 "use strict";
 // OffthreadVideo requires sometimes that the last frame of a video gets extracted, however, this can be slow. We allocate a cache for it but that can be garbage collected
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearLastFileCache = exports.ensureMaxSize = exports.removedLastFrameFromCache = exports.getLastFrameFromCache = exports.setLastFrameInCache = void 0;
-let map = {};
+exports.clearLastFileCache = exports.getLastFrameFromCache = exports.setLastFrameInCache = void 0;
 const MAX_CACHE_SIZE = 50 * 1024 * 1024; // 50MB
 let bufferSize = 0;
 const makeLastFrameCacheKey = (options) => {
-    return [options.ffmpegExecutable, options.offset, options.src].join('-');
+    return [
+        options.ffmpegExecutable,
+        options.offset,
+        options.src,
+        options.imageFormat,
+        options.downloadMap.id,
+    ].join('-');
 };
 const setLastFrameInCache = (options, data) => {
     const key = makeLastFrameCacheKey(options);
-    if (map[key]) {
-        bufferSize -= map[key].data.byteLength;
+    if (options.downloadMap.lastFrameMap[key]) {
+        bufferSize -= options.downloadMap.lastFrameMap[key].data.byteLength;
     }
-    map[key] = { data, lastAccessed: Date.now() };
+    options.downloadMap.lastFrameMap[key] = { data, lastAccessed: Date.now() };
     bufferSize += data.byteLength;
-    (0, exports.ensureMaxSize)();
+    ensureMaxSize(options.downloadMap);
 };
 exports.setLastFrameInCache = setLastFrameInCache;
 const getLastFrameFromCache = (options) => {
     var _a;
     const key = makeLastFrameCacheKey(options);
-    if (!map[key]) {
+    if (!options.downloadMap.lastFrameMap[key]) {
         return null;
     }
-    map[key].lastAccessed = Date.now();
-    return (_a = map[key].data) !== null && _a !== void 0 ? _a : null;
+    options.downloadMap.lastFrameMap[key].lastAccessed = Date.now();
+    return (_a = options.downloadMap.lastFrameMap[key].data) !== null && _a !== void 0 ? _a : null;
 };
 exports.getLastFrameFromCache = getLastFrameFromCache;
-const removedLastFrameFromCache = (key) => {
-    if (!map[key]) {
+const removedLastFrameFromCache = (key, downloadMap) => {
+    if (!downloadMap.lastFrameMap[key]) {
         return;
     }
-    bufferSize -= map[key].data.byteLength;
-    delete map[key];
+    bufferSize -= downloadMap.lastFrameMap[key].data.byteLength;
+    delete downloadMap.lastFrameMap[key];
 };
-exports.removedLastFrameFromCache = removedLastFrameFromCache;
-const ensureMaxSize = () => {
+const ensureMaxSize = (downloadMap) => {
     // eslint-disable-next-line no-unmodified-loop-condition
     while (bufferSize > MAX_CACHE_SIZE) {
-        const earliest = Object.entries(map).sort((a, b) => {
+        const earliest = Object.entries(downloadMap.lastFrameMap).sort((a, b) => {
             return a[1].lastAccessed - b[1].lastAccessed;
         })[0];
-        (0, exports.removedLastFrameFromCache)(earliest[0]);
+        removedLastFrameFromCache(earliest[0], downloadMap);
     }
 };
-exports.ensureMaxSize = ensureMaxSize;
-const clearLastFileCache = () => {
-    map = {};
+const clearLastFileCache = (downloadMap) => {
+    downloadMap.lastFrameMap = {};
 };
 exports.clearLastFileCache = clearLastFileCache;

package/dist/log-level.d.ts

@@ -0,0 +1,4 @@
+export declare const logLevels: readonly ["verbose", "info", "warn", "error"];
+export declare type LogLevel = typeof logLevels[number];
+export declare const isValidLogLevel: (level: string) => boolean;
+export declare const isEqualOrBelowLogLevel: (currentLevel: LogLevel, level: LogLevel) => boolean;

package/dist/log-level.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isEqualOrBelowLogLevel = exports.isValidLogLevel = exports.logLevels = void 0;
+exports.logLevels = ['verbose', 'info', 'warn', 'error'];
+const getNumberForLogLevel = (level) => {
+    return exports.logLevels.indexOf(level);
+};
+const isValidLogLevel = (level) => {
+    return getNumberForLogLevel(level) > -1;
+};
+exports.isValidLogLevel = isValidLogLevel;
+const isEqualOrBelowLogLevel = (currentLevel, level) => {
+    return getNumberForLogLevel(currentLevel) <= getNumberForLogLevel(level);
+};
+exports.isEqualOrBelowLogLevel = isEqualOrBelowLogLevel;

package/dist/merge-audio-track.d.ts

@@ -1,9 +1,11 @@
-import { FfmpegExecutable } from 'remotion';
+import type { DownloadMap } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
 declare type Options = {
     ffmpegExecutable: FfmpegExecutable;
     files: string[];
     outName: string;
     numberOfSeconds: number;
+    downloadMap: DownloadMap;
 };
 export declare const mergeAudioTrack: (options: Options) => Promise<void>;
 export {};

package/dist/merge-audio-track.js

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeAudioTrack = void 0;
 const execa_1 = __importDefault(require("execa"));
 const path_1 = __importDefault(require("path"));
-const remotion_1 = require("remotion");
 const chunk_1 = require("./chunk");
 const convert_to_pcm_1 = require("./convert-to-pcm");
 const create_ffmpeg_complex_filter_1 = require("./create-ffmpeg-complex-filter");
 const create_silent_audio_1 = require("./create-silent-audio");
+const delete_directory_1 = require("./delete-directory");
 const p_limit_1 = require("./p-limit");
 const tmp_dir_1 = require("./tmp-dir");
-const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, }) => {
+const truthy_1 = require("./truthy");
+const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numberOfSeconds, downloadMap, }) => {
     if (files.length === 0) {
         await (0, create_silent_audio_1.createSilentAudio)({
             outName,
@@ -41,17 +42,21 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
                 files: chunkFiles,
                 numberOfSeconds,
                 outName: chunkOutname,
+                downloadMap,
             });
             return chunkOutname;
         }));
-        return (0, exports.mergeAudioTrack)({
+        await (0, exports.mergeAudioTrack)({
             ffmpegExecutable,
             files: chunkNames,
             numberOfSeconds,
             outName,
+            downloadMap,
         });
+        await (0, delete_directory_1.deleteDirectory)(tempPath);
+        return;
     }
-    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length);
+    const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length, downloadMap);
     const args = [
         ...files.map((f) => ['-i', f]),
         mergeFilter,
@@ -59,13 +64,14 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
         ['-map', '[a]'],
         ['-y', outName],
     ]
-        .filter(remotion_1.Internals.truthy)
+        .filter(truthy_1.truthy)
         .flat(2);
     const task = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', args);
     await task;
     cleanup();
 };
-const limit = (0, p_limit_1.pLimit)(2);
+// Must be at least 3 because recursively called twice in mergeAudioTrack
+const limit = (0, p_limit_1.pLimit)(3);
 const mergeAudioTrack = (options) => {
     return limit(mergeAudioTrackUnlimited, options);
 };

package/dist/mime-db.d.ts

@@ -0,0 +1,6 @@
+export declare const mimeDb: Record<string, {
+    source?: string;
+    charset?: string;
+    compressible?: boolean;
+    extensions?: string[];
+}>;