@remotion/renderer 3.3.28 → 3.3.32

package/dist/compositor/compositor.d.ts

@@ -1,9 +1,12 @@
-import type { CliInput } from './payloads';
+import type { CompositorCommand, CompositorInitiatePayload } from './payloads';
 export declare type Compositor = {
     finishCommands: () => void;
-    executeCommand: (payload: Omit<CliInput, 'nonce'>) => Promise<void>;
+    executeCommand: (payload: Omit<CompositorCommand, 'nonce'>) => Promise<void>;
     waitForDone: () => Promise<void>;
 };
-export declare const spawnCompositorOrReuse: (renderId: string) => Compositor;
+export declare const spawnCompositorOrReuse: ({ initiatePayload, renderId, }: {
+    initiatePayload: CompositorInitiatePayload;
+    renderId: string;
+}) => Compositor;
 export declare const releaseCompositorWithId: (renderId: string) => void;
 export declare const waitForCompositorWithIdToQuit: (renderId: string) => Promise<void>;

package/dist/compositor/compositor.js

@@ -5,9 +5,9 @@ const child_process_1 = require("child_process");
 const truthy_1 = require("../truthy");
 const get_executable_path_1 = require("./get-executable-path");
 const compositorMap = {};
-const spawnCompositorOrReuse = (renderId) => {
+const spawnCompositorOrReuse = ({ initiatePayload, renderId, }) => {
     if (!compositorMap[renderId]) {
-        compositorMap[renderId] = startCompositor();
+        compositorMap[renderId] = startCompositor(initiatePayload);
     }
     return compositorMap[renderId];
 };
@@ -25,28 +25,31 @@ const waitForCompositorWithIdToQuit = (renderId) => {
     return compositorMap[renderId].waitForDone();
 };
 exports.waitForCompositorWithIdToQuit = waitForCompositorWithIdToQuit;
-const startCompositor = () => {
+const startCompositor = (compositorInitiatePayload) => {
     const bin = (0, get_executable_path_1.getExecutablePath)();
-    const child = (0, child_process_1.spawn)(bin);
-    const _stderrChunks = [];
-    const stdoutChunks = [];
+    const child = (0, child_process_1.spawn)(`${bin}`, [JSON.stringify(compositorInitiatePayload)]);
+    const stderrChunks = [];
+    let stdoutListeners = [];
+    let stderrListeners = [];
     child.stderr.on('data', (d) => {
-        _stderrChunks.push(d);
+        stderrChunks.push(d);
+        const str = d.toString('utf-8');
+        stderrListeners.forEach((s) => s(str));
     });
     child.stdout.on('data', (d) => {
-        stdoutChunks.push(d);
+        const str = d.toString('utf-8');
+        stdoutListeners.forEach((s) => s(str));
     });
     let nonce = 0;
     return {
         waitForDone: () => {
             return new Promise((resolve, reject) => {
                 child.on('exit', (code) => {
-                    console.log({ code });
                     if (code === 0) {
                         resolve();
                     }
                     else {
-                        reject(Buffer.concat(_stderrChunks).toString('utf-8'));
+                        reject(Buffer.concat(stderrChunks).toString('utf-8'));
                     }
                 });
             });
@@ -62,10 +65,7 @@ const startCompositor = () => {
             nonce++;
             return new Promise((resolve, reject) => {
                 child.stdin.write(JSON.stringify(actualPayload) + '\n');
-                const stderrChunks = [];
-                const onStderr = (d) => {
-                    stderrChunks.push(d);
-                    const message = Buffer.concat(stderrChunks).toString('utf-8');
+                const onStderr = (message) => {
                     let parsed = null;
                     try {
                         const content = JSON.parse(message);
@@ -81,12 +81,11 @@ const startCompositor = () => {
                         const err = new Error(parsed.error);
                         err.stack = parsed.error + '\n' + parsed.backtrace;
                         reject(err);
-                        child.stderr.off('data', onStderr);
-                        child.stdout.off('data', onStdout);
+                        stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
+                        stderrListeners = stderrListeners.filter((s) => s !== onStderr);
                     }
                 };
-                const onStdout = (d) => {
-                    const str = d.toString('utf-8');
+                const onStdout = (str) => {
                     const lineSplit = str.split('\n');
                     for (const line of lineSplit.filter(truthy_1.truthy)) {
                         let parsed = null;
@@ -99,13 +98,13 @@ const startCompositor = () => {
                         catch (e) { }
                         if (parsed && parsed.nonce === actualPayload.nonce) {
                             resolve();
-                            child.stderr.off('data', onStderr);
-                            child.stdout.off('data', onStdout);
+                            stdoutListeners = stdoutListeners.filter((s) => s !== onStdout);
+                            stderrListeners = stderrListeners.filter((s) => s !== onStderr);
                         }
                     }
                 };
-                child.stderr.on('data', onStderr);
-                child.stdout.on('data', onStdout);
+                stdoutListeners.push(onStdout);
+                stderrListeners.push(onStderr);
             });
         },
     };

package/dist/create-ffmpeg-complex-filter.d.ts

@@ -1,8 +1,5 @@
 import type { DownloadMap } from './assets/download-map';
 export declare const createFfmpegComplexFilter: (filters: number, downloadMap: DownloadMap) => Promise<{
-    complexFilterFlag: [
-        string,
-        string
-    ] | null;
+    complexFilterFlag: [string, string] | null;
     cleanup: () => void;
 }>;

package/dist/determine-resize-params.d.ts

@@ -1,4 +1 @@
-export declare const determineResizeParams: (needsResize: [
-    number,
-    number
-] | null) => string[];
+export declare const determineResizeParams: (needsResize: [number, number] | null) => string[];

package/dist/get-compositions-from-bundle.d.ts

@@ -1,2 +1,7 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
 import type { GetCompositionsConfig } from './get-compositions';
-export declare const getCompositionsFromBundle: (bundle: string, options: GetCompositionsConfig) => import("remotion/src").TCompMetadata[];
+export declare const getCompositionsFromBundle: (bundle: string, options: GetCompositionsConfig) => {
+    compositions: TCompMetadata[];
+    root: ComponentType;
+};

package/dist/get-compositions-from-bundle.js

@@ -48,8 +48,8 @@ const getCompositionsFromBundle = (bundle, options) => {
         throw new Error('Did not call getRoot() in the bundle. Delaying the calling of getRoot() is not supported in server-side-rendering.');
     }
     const Comp = theRoot;
-    console.log({ Comp1: Comp });
     const comps = (0, remotion_1.getCompositionsFromMarkup)(Comp);
-    return comps;
+    remotion_1.Internals.clearRoot();
+    return { compositions: comps, root: Comp };
 };
 exports.getCompositionsFromBundle = getCompositionsFromBundle;

package/dist/get-compositions-from-markup.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
+export declare const getCompositionsFromMarkup: (Comp: ComponentType) => TCompMetadata[];

package/dist/get-compositions-from-markup.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCompositionsFromMarkup = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const server_1 = require("react-dom/server");
+const getCompositionsFromMarkup = (Comp) => {
+    process.env.REMOTION_SERVER_RENDERING = 'true';
+    const str = (0, server_1.renderToString)((0, jsx_runtime_1.jsx)(Comp, {}));
+    const matches = str.matchAll(/<div>(.*?)<\/div>/g);
+    const metadata = [];
+    for (const match of matches) {
+        const json = JSON.parse(match[1]);
+        metadata.push(json);
+    }
+    return metadata;
+};
+exports.getCompositionsFromMarkup = getCompositionsFromMarkup;

package/dist/get-compositions.js

@@ -89,13 +89,20 @@ const getCompositions = async (serveUrlOrWebpackUrl, config) => {
             close = closeServer;
             return innerGetCompositions(serveUrl, page, config !== null && config !== void 0 ? config : {}, offthreadPort);
         })
-            .then((comp) => resolve(comp))
+            .then((comp) => {
+            if (close) {
+                return Promise.all([comp, close(true)]);
+            }
+            return Promise.resolve([comp, null]);
+        })
+            .then(([comp]) => {
+            return resolve(comp);
+        })
             .catch((err) => {
             reject(err);
         })
             .finally(() => {
             cleanup();
-            close === null || close === void 0 ? void 0 : close();
             cleanupPageError();
             // Clean download map if it was not passed in
             if (!(config === null || config === void 0 ? void 0 : config.downloadMap)) {

package/dist/get-concurrency.d.ts

@@ -1 +1 @@
-export declare const getActualConcurrency: (userPreference: number | null) => number;
+export declare const getActualConcurrency: (userPreference: number | string | null) => number;

package/dist/get-concurrency.js

@@ -9,9 +9,16 @@ const getActualConcurrency = (userPreference) => {
     if (userPreference === null) {
         return Math.round(Math.min(8, Math.max(1, os_1.default.cpus().length / 2)));
     }
-    const rounded = Math.floor(userPreference);
     const max = os_1.default.cpus().length;
     const min = 1;
+    let rounded;
+    if (typeof userPreference === 'string') {
+        const percentage = parseInt(userPreference.slice(0, -1), 10);
+        rounded = Math.floor((percentage / 100) * max);
+    }
+    else {
+        rounded = Math.floor(userPreference);
+    }
     if (rounded > max) {
         throw new Error(`Maximum for --concurrency is ${max} (number of cores on this system)`);
     }

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

@@ -0,0 +1,2 @@
+import type { CompositorLayer } from './compositor/payloads';
+export declare const getNativeVideoSignals: (layers: CompositorLayer[]) => Record<string, Record<number, number>>;

package/dist/get-video-signals.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNativeVideoSignals = void 0;
+const getNativeVideoSignals = (layers) => {
+    const videoSignals = layers
+        .filter((l) => {
+        return l.type === 'VideoFrame';
+    })
+        .map((l) => {
+        if (l.type !== 'VideoFrame') {
+            throw new Error('Expected VideoFrame');
+        }
+        return { frame: l.params.frame, src: l.params.src };
+    });
+    const map = {};
+    // Return a map for each video source and the number of times each frame is expected to be used
+    for (const { src, frame } of videoSignals) {
+        if (!map[src]) {
+            map[src] = {};
+        }
+        if (!map[src][frame]) {
+            map[src][frame] = 0;
+        }
+        map[src][frame]++;
+    }
+    return map;
+};
+exports.getNativeVideoSignals = getNativeVideoSignals;

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';
@@ -8,7 +9,6 @@ export { Browser } from './browser';
 export { BrowserExecutable } from './browser-executable';
 export { BrowserLog } from './browser-log';
 export { Codec, CodecOrUndefined } from './codec';
-export { combineVideos } from './combine-videos';
 export { Crf } from './crf';
 export { ensureFfmpeg, EnsureFfmpegOptions, ensureFfprobe, } from './ensure-ffmpeg';
 export { ErrorWithStackFrame } from './error-handling/handle-javascript-exception';
@@ -40,7 +40,7 @@ export declare const RenderInternals: {
         feature: "enable-gpl" | "enable-libx265" | "enable-libvpx";
         remotionRoot: string;
     }) => Promise<boolean>;
-    getActualConcurrency: (userPreference: number | null) => number;
+    getActualConcurrency: (userPreference: string | number | null) => number;
     validateFfmpeg: (customFfmpegBinary: string | null, remotionRoot: string, binary: "ffmpeg" | "ffprobe") => Promise<void>;
     serveStatic: (path: string | null, options: {
         port: number | null;
@@ -114,8 +114,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: "angle" | "swangle" | "egl" | "swiftshader" | null;
-    validateOpenGlRenderer: (option: "angle" | "swangle" | "egl" | "swiftshader" | null) => "angle" | "swangle" | "egl" | "swiftshader" | null;
+    DEFAULT_OPENGL_RENDERER: "swangle" | "angle" | "egl" | "swiftshader" | null;
+    validateOpenGlRenderer: (option: "swangle" | "angle" | "egl" | "swiftshader" | null) => "swangle" | "angle" | "egl" | "swiftshader" | null;
     validImageFormats: readonly ["png", "jpeg", "none"];
     validCodecs: readonly ["h264", "h265", "vp8", "vp9", "mp3", "aac", "wav", "prores", "h264-mkv", "gif"];
     DEFAULT_PIXEL_FORMAT: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le";
@@ -125,7 +125,7 @@ export declare const RenderInternals: {
     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" | "verbose" | "info" | "warn", level: "error" | "verbose" | "info" | "warn") => boolean;
+    isEqualOrBelowLogLevel: (currentLevel: "verbose" | "error" | "info" | "warn", level: "verbose" | "error" | "info" | "warn") => boolean;
     isValidLogLevel: (level: string) => boolean;
     perf: typeof perf;
     makeDownloadMap: () => import("./assets/download-map").DownloadMap;
@@ -141,4 +141,16 @@ export declare const RenderInternals: {
         ffmpegExecutable: string | null;
         remotionRoot: string;
     }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
+    combineVideos: (options: {
+        files: string[];
+        filelistDir: string;
+        output: string;
+        onProgress: (p: number) => void;
+        numberOfFrames: number;
+        codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
+        fps: number;
+        numberOfGifLoops: number | null;
+        remotionRoot: string;
+        ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable;
+    }) => Promise<void>;
 };

package/dist/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.getCanExtractFramesFast = exports.ErrorWithStackFrame = exports.ensureFfprobe = exports.ensureFfmpeg = exports.combineVideos = void 0;
+exports.RenderInternals = exports.validateOutputFilename = exports.stitchFramesToVideo = exports.renderStill = exports.renderMedia = exports.renderFrames = exports.openBrowser = exports.makeCancelSignal = exports.validImageFormats = exports.validateSelectedPixelFormatAndImageFormatCombination = exports.getCompositions = exports.getCanExtractFramesFast = exports.ErrorWithStackFrame = exports.ensureFfprobe = exports.ensureFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
 const download_file_1 = require("./assets/download-file");
 const download_map_1 = require("./assets/download-map");
@@ -35,6 +35,7 @@ const TimeoutSettings_1 = require("./browser/TimeoutSettings");
 const can_use_parallel_encoding_1 = require("./can-use-parallel-encoding");
 const check_apple_silicon_1 = require("./check-apple-silicon");
 const codec_1 = require("./codec");
+const combine_videos_1 = require("./combine-videos");
 const convert_to_positive_frame_index_1 = require("./convert-to-positive-frame-index");
 const delete_directory_1 = require("./delete-directory");
 const ensure_output_directory_1 = require("./ensure-output-directory");
@@ -71,8 +72,6 @@ const validate_opengl_renderer_1 = require("./validate-opengl-renderer");
 const validate_puppeteer_timeout_1 = require("./validate-puppeteer-timeout");
 const validate_videobitrate_1 = require("./validate-videobitrate");
 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 ensure_ffmpeg_1 = require("./ensure-ffmpeg");
 Object.defineProperty(exports, "ensureFfmpeg", { enumerable: true, get: function () { return ensure_ffmpeg_1.ensureFfmpeg; } });
 Object.defineProperty(exports, "ensureFfprobe", { enumerable: true, get: function () { return ensure_ffmpeg_1.ensureFfprobe; } });
@@ -153,6 +152,7 @@ exports.RenderInternals = {
     getExecutableBinary: ffmpeg_flags_1.getExecutableBinary,
     validateBitrate: validate_videobitrate_1.validateBitrate,
     getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
+    combineVideos: combine_videos_1.combineVideos,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
 (0, check_apple_silicon_1.checkNodeVersionAndWarnAboutRosetta)();

package/dist/make-comp-manager-context.d.ts

@@ -0,0 +1,2 @@
+import type { CompositionManagerContext, TCompMetadata } from 'remotion';
+export declare const makeCompManagerContext: (composition: TCompMetadata) => CompositionManagerContext;

package/dist/make-comp-manager-context.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeCompManagerContext = void 0;
+const makeCompManagerContext = (composition) => {
+    const memo = {
+        assets: [],
+        compositions: [composition],
+        currentComposition: composition.id,
+        currentCompositionMetadata: composition,
+        folders: [],
+        registerAsset: () => {
+            throw new Error('Not implemented');
+        },
+        registerComposition: () => {
+            throw new Error('Not implemented');
+        },
+        registerFolder: () => {
+            throw new Error('Not implemented');
+        },
+        setCurrentComposition: () => {
+            throw new Error('Not implemented');
+        },
+        registerSequence() {
+            throw new Error('Not implemented');
+        },
+        sequences: [],
+        setCurrentCompositionMetadata: () => {
+            throw new Error('Not implemented');
+        },
+        unregisterAsset: () => {
+            throw new Error('Not implemented');
+        },
+        unregisterComposition: () => {
+            throw new Error('Not implemented');
+        },
+        unregisterFolder: () => {
+            throw new Error('Not implemented');
+        },
+        unregisterSequence: () => {
+            throw new Error('Not implemented');
+        },
+    };
+    return memo;
+};
+exports.makeCompManagerContext = makeCompManagerContext;

package/dist/make-timeline-context-value.d.ts

@@ -0,0 +1,2 @@
+import type { SmallTCompMetadata, TimelineContextValue } from 'remotion';
+export declare const makeTimelineContextValue: (composition: SmallTCompMetadata, frame: number) => TimelineContextValue;

package/dist/make-timeline-context-value.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeTimelineContextValue = void 0;
+const makeTimelineContextValue = (composition, frame) => {
+    const value = {
+        audioAndVideoTags: { current: [] },
+        rootId: composition.id,
+        playing: false,
+        playbackRate: 1,
+        imperativePlaying: {
+            current: false,
+        },
+        frame,
+        setPlaybackRate: () => {
+            throw new Error('Not implemented');
+        },
+    };
+    return value;
+};
+exports.makeTimelineContextValue = makeTimelineContextValue;

package/dist/prepare-server.d.ts

@@ -12,6 +12,6 @@ export declare const prepareServer: ({ ffmpegExecutable, ffprobeExecutable, onDo
     remotionRoot: string;
 }) => Promise<{
     serveUrl: string;
-    closeServer: () => Promise<unknown>;
+    closeServer: (force: boolean) => Promise<unknown>;
     offthreadPort: number;
 }>;

package/dist/prepare-server.js

@@ -44,8 +44,11 @@ const prepareServer = async ({ ffmpegExecutable, ffprobeExecutable, onDownload,
         remotionRoot,
     });
     return Promise.resolve({
-        closeServer: () => {
-            return (0, wait_for_symbolication_error_to_be_done_1.waitForSymbolicationToBeDone)().then(() => close());
+        closeServer: async (force) => {
+            if (!force) {
+                await (0, wait_for_symbolication_error_to_be_done_1.waitForSymbolicationToBeDone)();
+            }
+            return close();
         },
         serveUrl: `http://localhost:${serverPort}`,
         offthreadPort: serverPort,

package/dist/render-frames.d.ts

@@ -21,7 +21,7 @@ declare type ConfigOrComposition = {
     composition: SmallTCompMetadata;
 };
 declare type ConcurrencyOrParallelism = {
-    concurrency?: number | null;
+    concurrency?: number | string | null;
 } | {
     /**
      * @deprecated This field has been renamed to `concurrency`

package/dist/render-frames.js

@@ -343,7 +343,7 @@ const renderFrames = (options) => {
                 const browserReplacer = (0, replace_browser_1.handleBrowserCrash)(puppeteerInstance);
                 const { stopCycling } = (0, cycle_browser_tabs_1.cycleBrowserTabs)(browserReplacer, actualConcurrency);
                 cleanup.push(stopCycling);
-                cleanup.push(closeServer);
+                cleanup.push(() => closeServer(false));
                 return innerRenderFrames({
                     ...options,
                     puppeteerInstance,

package/dist/render-media.d.ts

@@ -71,7 +71,7 @@ export declare type RenderMediaOptions = {
     disallowParallelEncoding?: boolean;
 } & ServeUrlOrWebpackBundle & ConcurrencyOrParallelism;
 declare type ConcurrencyOrParallelism = {
-    concurrency?: number | null;
+    concurrency?: number | string | null;
 } | {
     /**
      * @deprecated This field has been renamed to `concurrency`

package/dist/render-on-server.js

@@ -13,51 +13,14 @@ const download_map_1 = require("./assets/download-map");
 const compose_1 = require("./compositor/compose");
 const compositor_1 = require("./compositor/compositor");
 const get_frame_padded_index_1 = require("./get-frame-padded-index");
+const make_comp_manager_context_1 = require("./make-comp-manager-context");
 const pool_1 = require("./pool");
 const renderOnServer = async (Comp, composition) => {
     console.time('total');
     console.time('frames');
     process.env.REMOTION_SERVER_RENDERING = 'true';
-    process.env.SELECT_COMP_ID = composition.id;
     // eslint-disable-next-line react/jsx-no-constructed-context-values
-    const memo = {
-        assets: [],
-        compositions: [composition],
-        currentComposition: composition.id,
-        currentCompositionMetadata: composition,
-        folders: [],
-        registerAsset: () => {
-            throw new Error('Not implemented');
-        },
-        registerComposition: () => {
-            throw new Error('Not implemented');
-        },
-        registerFolder: () => {
-            throw new Error('Not implemented');
-        },
-        setCurrentComposition: () => {
-            throw new Error('Not implemented');
-        },
-        registerSequence() {
-            throw new Error('Not implemented');
-        },
-        sequences: [],
-        setCurrentCompositionMetadata: () => {
-            throw new Error('Not implemented');
-        },
-        unregisterAsset: () => {
-            throw new Error('Not implemented');
-        },
-        unregisterComposition: () => {
-            throw new Error('Not implemented');
-        },
-        unregisterFolder: () => {
-            throw new Error('Not implemented');
-        },
-        unregisterSequence: () => {
-            throw new Error('Not implemented');
-        },
-    };
+    const memo = (0, make_comp_manager_context_1.makeCompManagerContext)(composition);
     const pool = new pool_1.Pool(new Array(4).fill(true).map((_, i) => i));
     const downloadMap = (0, download_map_1.makeDownloadMap)();
     const renderId = 'abc';
@@ -77,7 +40,7 @@ const renderOnServer = async (Comp, composition) => {
                 throw new Error('Not implemented');
             },
         };
-        const svg = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: value, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: memo, children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }));
+        const svg = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.SelectCompositionMode, { layer: 0, id: composition.id, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: value, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: memo, children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }) }));
         const out = path_1.default.join(downloadMap.compositingDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
             frame: i,
             imageFormat: 'tiff',
@@ -105,6 +68,14 @@ const renderOnServer = async (Comp, composition) => {
             ],
             output: out,
             renderId,
+            compositorInitiatePayload: {
+                create_h264_queue: true,
+                duration_in_frames: 300,
+                fps: 30,
+                video_signals: {},
+                height: composition.height,
+                width: composition.width,
+            },
         });
         pool.release(frame);
     }));

package/dist/render-still.js

@@ -208,7 +208,7 @@ const renderStill = (options) => {
             if (!(options === null || options === void 0 ? void 0 : options.downloadMap)) {
                 (0, download_map_1.cleanDownloadMap)(downloadMap);
             }
-            return close === null || close === void 0 ? void 0 : close();
+            return close === null || close === void 0 ? void 0 : close(false);
         });
     });
     return Promise.race([

package/dist/render-svg.d.ts

@@ -0,0 +1,8 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
+export declare const renderSvg: ({ composition, Comp, frame, layer, }: {
+    composition: TCompMetadata;
+    Comp: ComponentType;
+    frame: number;
+    layer: number;
+}) => string;

package/dist/render-svg.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderSvg = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const server_1 = require("react-dom/server");
+const remotion_1 = require("remotion");
+const make_comp_manager_context_1 = require("./make-comp-manager-context");
+const make_timeline_context_value_1 = require("./make-timeline-context-value");
+const renderSvg = ({ composition, Comp, frame, layer, }) => {
+    const svg = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.SelectCompositionMode, { layer: layer, id: composition.id, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: (0, make_timeline_context_value_1.makeTimelineContextValue)(composition, frame), children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: (0, make_comp_manager_context_1.makeCompManagerContext)(composition), children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }) }));
+    return svg;
+};
+exports.renderSvg = renderSvg;

package/dist/render-video-layer.d.ts

@@ -0,0 +1,9 @@
+import type { ComponentType } from 'react';
+import type { TCompMetadata } from 'remotion';
+import type { NativeVideoLayerInfo } from 'remotion/src/video/NativeVideoForRendering';
+export declare const renderVideoLayer: ({ composition, Comp, frame, layer, }: {
+    composition: TCompMetadata;
+    Comp: ComponentType;
+    frame: number;
+    layer: number;
+}) => NativeVideoLayerInfo | null;

package/dist/render-video-layer.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderVideoLayer = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const server_1 = require("react-dom/server");
+const remotion_1 = require("remotion");
+const make_comp_manager_context_1 = require("./make-comp-manager-context");
+const make_timeline_context_value_1 = require("./make-timeline-context-value");
+const renderVideoLayer = ({ composition, Comp, frame, layer, }) => {
+    process.env.REMOTION_SERVER_RENDERING = 'true';
+    const markup = (0, server_1.renderToStaticMarkup)((0, jsx_runtime_1.jsx)(remotion_1.Internals.SelectCompositionMode, { layer: layer, id: composition.id, children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.Timeline.TimelineContext.Provider, { value: (0, make_timeline_context_value_1.makeTimelineContextValue)(composition, frame), children: (0, jsx_runtime_1.jsx)(remotion_1.Internals.CompositionManager.Provider, { value: (0, make_comp_manager_context_1.makeCompManagerContext)(composition), children: (0, jsx_runtime_1.jsx)(Comp, {}) }) }) }));
+    const matches = markup.matchAll(/<div>(.*?)<\/div>/g);
+    let parsed = null;
+    for (const match of matches) {
+        if (parsed) {
+            throw new Error('cannot have more than one video layer');
+        }
+        const json = JSON.parse(match[1]);
+        parsed = json;
+    }
+    return parsed;
+};
+exports.renderVideoLayer = renderVideoLayer;

package/dist/render-web-frame.d.ts

@@ -1,15 +1,16 @@
-import type { SmallTCompMetadata, TAsset } from 'remotion/src';
-import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+/// <reference types="node" />
+import type { SmallTCompMetadata, TAsset } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { BrowserExecutable } from './browser-executable';
 import type { BrowserLog } from './browser-log';
 import type { Page } from './browser/BrowserPage';
+import type { CompositorLayer } from './compositor/payloads';
 import type { CountType } from './get-frame-padded-index';
 import type { ServeUrl } from './legacy-webpack-config';
 import type { ChromiumOptions } from './open-browser';
 import type { Pool } from './pool';
 import type { BrowserReplacer } from './replace-browser';
-export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, onFrameUpdate, outputDir, stopState, assets, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, onDownload, onError, }: {
+export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, outputDir, stopState, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, }: {
     frame: number;
     index: number;
     retriesLeft: number;
@@ -21,12 +22,10 @@ export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retries
     downloadMap: DownloadMap;
     imageFormat: 'png' | 'jpeg' | 'none';
     onFrameBuffer: ((buffer: Buffer, frame: number) => void) | undefined;
-    onFrameUpdate: (framesRendered: number, frameIndex: number, timeToRenderInMilliseconds: number) => void;
     outputDir: string | null;
     stopState: {
         isStopped: boolean;
     };
-    assets: TAsset[][];
     countType: CountType;
     scale: number;
     quality: number | undefined;
@@ -47,9 +46,11 @@ export declare const renderWebFrameAndRetryTargetClose: ({ frame, index, retries
     realFrameRange: [number, number];
     serveUrl: ServeUrl;
     timeoutInMilliseconds: number;
-    onDownload: RenderMediaOnDownload;
-    onError: (err: Error) => void;
-}) => Promise<void>;
+}) => Promise<{
+    layer: CompositorLayer | null;
+    buffer: Buffer | null;
+    assets: TAsset[];
+}>;
 export declare const makePage: ({ browserReplacer, pagesArray, composition, scale, onBrowserLog, inputProps, envVariables, serveUrl, realFrameRange, timeoutInMilliseconds, proxyPort, imageFormat, muted, }: {
     browserReplacer: BrowserReplacer;
     pagesArray: Page[];

package/dist/render-web-frame.js

@@ -5,11 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeBrowser = exports.makePage = exports.renderWebFrameAndRetryTargetClose = void 0;
 const path_1 = __importDefault(require("path"));
-const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
 const browser_1 = require("./browser");
-const compress_assets_1 = require("./compress-assets");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
-const get_frame_padded_index_1 = require("./get-frame-padded-index");
 const make_cancel_signal_1 = require("./make-cancel-signal");
 const open_browser_1 = require("./open-browser");
 const perf_1 = require("./perf");
@@ -17,14 +14,13 @@ const puppeteer_evaluate_1 = require("./puppeteer-evaluate");
 const seek_to_frame_1 = require("./seek-to-frame");
 const set_props_and_env_1 = require("./set-props-and-env");
 const take_frame_and_compose_1 = require("./take-frame-and-compose");
-const truthy_1 = require("./truthy");
-const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, poolPromise, stopState, outputDir, onFrameBuffer, imageFormat, downloadMap, onFrameUpdate, scale, assets, countType, quality, framesToRender, lastFrame, framesRendered, onDownload, onError, }) => {
+const renderFrameWithOptionToReject = async ({ frame, index, reject, width, height, poolPromise, stopState, imageFormat, downloadMap, scale, quality, }) => {
     const pool = await poolPromise;
     const freePage = await pool.acquire();
     if (stopState.isStopped) {
-        return reject(new Error('Render was stopped'));
+        reject(new Error('Render was stopped'));
+        throw new Error('stopped');
     }
-    const startTime = performance.now();
     const errorCallbackOnFrame = (err) => {
         reject(err);
     };
@@ -35,58 +31,45 @@ const renderFrameWithOptionToReject = async ({ frame, index, reject, width, heig
     });
     freePage.on('error', errorCallbackOnFrame);
     await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
-    if (!outputDir && !onFrameBuffer && imageFormat !== 'none') {
-        throw new Error('Called renderFrames() without specifying either `outputDir` or `onFrameBuffer`');
-    }
-    if (outputDir && onFrameBuffer && imageFormat !== 'none') {
-        throw new Error('Pass either `outputDir` or `onFrameBuffer` to renderFrames(), not both.');
-    }
     const id = (0, perf_1.startPerfMeasure)('save');
-    const frameDir = outputDir !== null && outputDir !== void 0 ? outputDir : downloadMap.compositingDir;
-    const { buffer, collectedAssets } = await (0, take_frame_and_compose_1.takeFrameAndCompose)({
+    const output = path_1.default.join(downloadMap.compositingDir, `preframe-${index}.${imageFormat}`);
+    const { buffer, collectedAssets, clipRegion } = await (0, take_frame_and_compose_1.takeFrame)({
         frame,
         freePage,
         height,
         imageFormat,
-        output: path_1.default.join(frameDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
-            frame,
-            imageFormat,
-            index,
-            countType,
-            lastFrame,
-            totalFrames: framesToRender.length,
-        })),
         quality,
         width,
-        scale,
-        downloadMap,
-        wantsBuffer: Boolean(onFrameBuffer),
     });
-    if (onFrameBuffer) {
-        if (!buffer) {
-            throw new Error('unexpected null buffer');
-        }
-        onFrameBuffer(buffer, frame);
-    }
+    const needsComposing = clipRegion === null
+        ? null
+        : {
+            tmpFile: path_1.default.join(downloadMap.compositingDir, `${frame}.${imageFormat}`),
+            finalOutfie: output !== null && output !== void 0 ? output : path_1.default.join(downloadMap.compositingDir, `${frame}-final.${imageFormat}`),
+            clipRegion: clipRegion,
+        };
+    const compositionLayer = !needsComposing || needsComposing.clipRegion === 'hide'
+        ? null
+        : {
+            type: imageFormat === 'jpeg'
+                ? 'JpgImage'
+                : 'PngImage',
+            params: {
+                height: needsComposing.clipRegion.height * scale,
+                width: needsComposing.clipRegion.width * scale,
+                src: needsComposing.tmpFile,
+                x: needsComposing.clipRegion.x * scale,
+                y: needsComposing.clipRegion.y * scale,
+            },
+        };
+    // TODO: Always return buffer
     (0, perf_1.stopPerfMeasure)(id);
-    const compressedAssets = collectedAssets.map((asset) => (0, compress_assets_1.compressAsset)(assets.filter(truthy_1.truthy).flat(1), asset));
-    assets[index] = compressedAssets;
-    compressedAssets.forEach((asset) => {
-        (0, download_and_map_assets_to_file_1.downloadAndMapAssetsToFileUrl)({
-            asset,
-            onDownload,
-            downloadMap,
-        }).catch((err) => {
-            onError(new Error(`Error while downloading asset: ${err.stack}`));
-        });
-    });
-    framesRendered.frames++;
-    onFrameUpdate(framesRendered.frames, frame, performance.now() - startTime);
     cleanupPageError();
     freePage.off('error', errorCallbackOnFrame);
     pool.release(freePage);
+    return { layer: compositionLayer, buffer, assets: collectedAssets };
 };
-const renderWebFrame = ({ frame, index, downloadMap, imageFormat, onFrameBuffer, onFrameUpdate, outputDir, poolPromise, stopState, composition, assets, countType, scale, quality, lastFrame, framesToRender, framesRendered, onDownload, onError, }) => {
+const renderWebFrame = ({ frame, index, downloadMap, imageFormat, poolPromise, stopState, composition, scale, quality, }) => {
     return new Promise((resolve, reject) => {
         renderFrameWithOptionToReject({
             frame,
@@ -96,53 +79,34 @@ const renderWebFrame = ({ frame, index, downloadMap, imageFormat, onFrameBuffer,
             height: composition.height,
             downloadMap,
             imageFormat,
-            onFrameBuffer,
-            onFrameUpdate,
-            outputDir,
             poolPromise,
             stopState,
-            assets,
-            countType,
             scale,
             quality,
-            framesToRender,
-            lastFrame,
-            framesRendered,
-            onDownload,
-            onError,
         })
-            .then(() => {
-            resolve();
+            .then((res) => {
+            resolve(res);
         })
             .catch((err) => {
             reject(err);
         });
     });
 };
-const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, onFrameUpdate, outputDir, stopState, assets, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, onDownload, onError, }) => {
+const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, attempt, actualConcurrency, browserReplacer, poolPromise, composition, downloadMap, imageFormat, onFrameBuffer, outputDir, stopState, countType, scale, quality, framesToRender, lastFrame, framesRendered, browserExecutable, chromiumOptions, dumpBrowserLogs, pagesArray, onBrowserLog, inputProps, envVariables, muted, proxyPort, realFrameRange, serveUrl, timeoutInMilliseconds, }) => {
     var _a, _b;
     try {
-        await renderWebFrame({
+        const returnval = await renderWebFrame({
             frame,
             index,
             poolPromise,
             composition,
             downloadMap,
             imageFormat,
-            onFrameBuffer,
-            onFrameUpdate,
-            outputDir,
             stopState,
-            assets,
-            countType,
             scale,
             quality,
-            framesToRender,
-            lastFrame,
-            framesRendered,
-            onDownload,
-            onError,
         });
+        return returnval;
     }
     catch (err) {
         if (!((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Target closed')) &&
@@ -187,7 +151,7 @@ const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, at
                 pool.release(newPage);
             }
         });
-        await (0, exports.renderWebFrameAndRetryTargetClose)({
+        const fram = await (0, exports.renderWebFrameAndRetryTargetClose)({
             frame,
             index,
             retriesLeft: retriesLeft - 1,
@@ -198,11 +162,9 @@ const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, at
             downloadMap,
             imageFormat,
             onFrameBuffer,
-            onFrameUpdate,
             outputDir,
             poolPromise,
             stopState,
-            assets,
             countType,
             scale,
             quality,
@@ -221,9 +183,8 @@ const renderWebFrameAndRetryTargetClose = async ({ frame, index, retriesLeft, at
             realFrameRange,
             serveUrl,
             timeoutInMilliseconds,
-            onDownload,
-            onError,
         });
+        return fram;
     }
 };
 exports.renderWebFrameAndRetryTargetClose = renderWebFrameAndRetryTargetClose;

package/dist/validate-concurrency.js

@@ -8,17 +8,22 @@ const validateConcurrency = (value, setting) => {
     if (value === null) {
         return;
     }
-    if (typeof value !== 'number') {
-        throw new Error(setting + ' must be a number but is ' + value);
+    if (typeof value !== 'number' && typeof value !== 'string') {
+        throw new Error(setting + ' must a number or a string but is ' + value);
     }
-    if (value % 1 !== 0) {
-        throw new Error(setting + ' must be an integer, but is ' + value);
+    if (typeof value === 'number') {
+        if (value % 1 !== 0) {
+            throw new Error(setting + ' must be an integer, but is ' + value);
+        }
+        if (value < 1) {
+            throw new Error(setting + ' must be at least 1, but is ' + value);
+        }
+        if (value > require('os').cpus().length) {
+            throw new Error(`${setting} is set higher than the amount of CPU cores available. Available CPU cores: ${require('os').cpus().length}, value set: ${value}`);
+        }
     }
-    if (value < 1) {
-        throw new Error(setting + ' must be at least 1, but is ' + value);
-    }
-    if (value > require('os').cpus().length) {
-        throw new Error(`${setting} is set higher than the amount of CPU cores available. Available CPU cores: ${require('os').cpus().length}, value set: ${value}`);
+    else if (!/^\d+(\.\d+)?%$/.test(value)) {
+        throw new Error(`${setting} must be a number or percentage, but is ${JSON.stringify(value)}`);
     }
 };
 exports.validateConcurrency = validateConcurrency;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.3.28",
+	"version": "3.3.32",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.3.28",
+		"remotion": "3.3.32",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -49,13 +49,13 @@
 		"vitest": "0.24.3"
 	},
 	"optionalDependencies": {
-		"@remotion/compositor-darwin-arm64": "3.3.28",
-		"@remotion/compositor-darwin-x64": "3.3.28",
-		"@remotion/compositor-linux-arm64-gnu": "3.3.28",
-		"@remotion/compositor-linux-arm64-musl": "3.3.28",
-		"@remotion/compositor-linux-x64-gnu": "3.3.28",
-		"@remotion/compositor-linux-x64-musl": "3.3.28",
-		"@remotion/compositor-win32-x64-msvc": "3.3.28"
+		"@remotion/compositor-darwin-arm64": "3.3.32",
+		"@remotion/compositor-darwin-x64": "3.3.32",
+		"@remotion/compositor-linux-arm64-gnu": "3.3.32",
+		"@remotion/compositor-linux-arm64-musl": "3.3.32",
+		"@remotion/compositor-linux-x64-gnu": "3.3.32",
+		"@remotion/compositor-linux-x64-musl": "3.3.32",
+		"@remotion/compositor-win32-x64-msvc": "3.3.32"
 	},
 	"keywords": [
 		"remotion",
@@ -67,5 +67,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0caa0bec583b5e4c2b12b7375c365e02c2378eeb"
+	"gitHead": "6b4f3514c801ddf2e7f957dd2e633271fbbc75f6"
 }