@remotion/renderer 3.2.28 → 3.2.30

package/dist/combine-videos.js

@@ -37,7 +37,7 @@ const combineVideos = async ({ files, filelistDir, output, onProgress, numberOfF
             (0, is_audio_codec_1.isAudioCodec)(codec) ? null : codec === 'gif' ? 'gif' : 'copy',
             '-c:a',
             (0, get_audio_codec_name_1.getAudioCodecName)(codec),
-            // Set max bitrate up to 1024kbps, will choose lower if that's too much
+            // Set max bitrate up to 512kbps, will choose lower if that's too much
             '-b:a',
             '512K',
             codec === 'h264' ? '-movflags' : null,

package/dist/index.d.ts

@@ -25,7 +25,7 @@ export type { ChromiumOptions } from './open-browser';
 export { PixelFormat } from './pixel-format';
 export { ProResProfile } from './prores-profile';
 export { renderFrames } from './render-frames';
-export { renderMedia, RenderMediaOnProgress, RenderMediaOptions, StitchingState, } from './render-media';
+export { OnSlowestFrames, renderMedia, RenderMediaOnProgress, RenderMediaOptions, SlowFrame, StitchingState, } from './render-media';
 export { renderStill, RenderStillOptions } from './render-still';
 export { StitcherOptions, stitchFramesToVideo } from './stitch-frames-to-video';
 export { SymbolicatedStackFrame } from './symbolicate-stacktrace';

package/dist/render-frames.d.ts

@@ -30,7 +30,7 @@ declare type ConcurrencyOrParallelism = {
 };
 declare type RenderFramesOptions = {
     onStart: (data: OnStartData) => void;
-    onFrameUpdate: (framesRendered: number, frameIndex: number) => void;
+    onFrameUpdate: (framesRendered: number, frameIndex: number, timeToRenderInMilliseconds: number) => void;
     outputDir: string | null;
     inputProps: unknown;
     envVariables?: Record<string, string>;

package/dist/render-frames.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderFrames = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const perf_hooks_1 = require("perf_hooks");
 const remotion_1 = require("remotion");
 const download_and_map_assets_to_file_1 = require("./assets/download-and-map-assets-to-file");
 const download_map_1 = require("./assets/download-map");
@@ -150,6 +151,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         if (stopped) {
             throw new Error('Render was stopped');
         }
+        const startTime = perf_hooks_1.performance.now();
         const errorCallbackOnFrame = (err) => {
             onError(err);
         };
@@ -219,7 +221,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         });
         pool.release(freePage);
         framesRendered++;
-        onFrameUpdate(framesRendered, frame);
+        onFrameUpdate(framesRendered, frame, perf_hooks_1.performance.now() - startTime);
         cleanupPageError();
         freePage.off('error', errorCallbackOnFrame);
         return compressedAssets;

package/dist/render-media.d.ts

@@ -16,6 +16,11 @@ import type { PixelFormat } from './pixel-format';
 import type { ProResProfile } from './prores-profile';
 import type { OnStartData } from './types';
 export declare type StitchingState = 'encoding' | 'muxing';
+export declare type SlowFrame = {
+    frame: number;
+    time: number;
+};
+export declare type OnSlowestFrames = (frames: SlowFrame[]) => void;
 export declare type RenderMediaOnProgress = (progress: {
     renderedFrames: number;
     encodedFrames: number;
@@ -61,6 +66,8 @@ export declare type RenderMediaOptions = {
     muted?: boolean;
     enforceAudioTrack?: boolean;
     ffmpegOverride?: FfmpegOverrideFn;
+    onSlowestFrames?: OnSlowestFrames;
+    disallowParallelEncoding?: boolean;
 } & ServeUrlOrWebpackBundle & ConcurrencyOrParallelism;
 declare type ConcurrencyOrParallelism = {
     concurrency?: number | null;
@@ -75,5 +82,5 @@ declare type ConcurrencyOrParallelism = {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-export declare const renderMedia: ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
+export declare const renderMedia: ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, onSlowestFrames, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
 export {};

package/dist/render-media.js

@@ -33,6 +33,7 @@ const validate_even_dimensions_with_codec_1 = require("./validate-even-dimension
 const validate_ffmpeg_override_1 = require("./validate-ffmpeg-override");
 const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
+const SLOWEST_FRAME_COUNT = 10;
 const getConcurrency = (others) => {
     if ('concurrency' in others) {
         return others.concurrency;
@@ -47,7 +48,7 @@ const getConcurrency = (others) => {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, ...options }) => {
+const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ffmpegOverride, onSlowestFrames, ...options }) => {
     var _a, _b, _c, _d;
     (0, quality_1.validateQuality)(options.quality);
     if (typeof crf !== 'undefined' && crf !== null) {
@@ -79,10 +80,13 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
         height: composition.height,
         width: composition.width,
     });
-    const parallelEncoding = hasEnoughMemory && (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
+    const parallelEncoding = !options.disallowParallelEncoding &&
+        hasEnoughMemory &&
+        (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec);
     if (options.verbose) {
         console.log('[PRESTITCHER] Free memory:', freeMemory, 'Estimated usage parallel encoding', estimatedUsage);
-        console.log('[PRESTICHER]: Codec supports parallel rendering:', (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec));
+        console.log('[PRESTITCHER]: Codec supports parallel rendering:', (0, can_use_parallel_encoding_1.canUseParallelEncoding)(codec));
+        console.log('[PRESTITCHER]: User disallowed parallel encoding:', Boolean(options.disallowParallelEncoding));
         if (parallelEncoding) {
             console.log('[PRESTITCHER] Parallel encoding is enabled.');
         }
@@ -168,13 +172,38 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
     };
     const mediaSupport = (0, codec_supports_media_1.codecSupportsMedia)(codec);
     const disableAudio = !mediaSupport.audio || muted;
+    const slowestFrames = [];
+    let maxTime = 0;
+    let minTime = 0;
+    const recordFrameTime = (frameIndex, time) => {
+        var _a, _b;
+        const frameTime = { frame: frameIndex, time };
+        if (time < minTime && slowestFrames.length === SLOWEST_FRAME_COUNT) {
+            return;
+        }
+        if (time > maxTime) {
+            // add at starting;
+            slowestFrames.unshift(frameTime);
+            maxTime = time;
+        }
+        else {
+            // add frame at appropriate position
+            const index = slowestFrames.findIndex(({ time: indexTime }) => indexTime < time);
+            slowestFrames.splice(index, 0, frameTime);
+        }
+        if (slowestFrames.length > SLOWEST_FRAME_COUNT) {
+            slowestFrames.pop();
+        }
+        minTime = (_b = (_a = slowestFrames[slowestFrames.length - 1]) === null || _a === void 0 ? void 0 : _a.time) !== null && _b !== void 0 ? _b : minTime;
+    };
     const happyPath = createPrestitcherIfNecessary()
         .then(() => {
         const renderFramesProc = (0, render_frames_1.renderFrames)({
             config: composition,
-            onFrameUpdate: (frame) => {
+            onFrameUpdate: (frame, frameIndex, timeToRenderInMilliseconds) => {
                 renderedFrames = frame;
                 callUpdate();
+                recordFrameTime(frameIndex, timeToRenderInMilliseconds);
             },
             concurrency,
             outputDir,
@@ -269,6 +298,8 @@ const renderMedia = ({ proResProfile, crf, composition, ffmpegExecutable, ffprob
         encodedFrames = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame).length;
         encodedDoneIn = Date.now() - stitchStart;
         callUpdate();
+        slowestFrames.sort((a, b) => b.time - a.time);
+        onSlowestFrames === null || onSlowestFrames === void 0 ? void 0 : onSlowestFrames(slowestFrames);
         return buffer;
     })
         .catch((err) => {

package/dist/validate-puppeteer-timeout.js

@@ -8,7 +8,7 @@ const validatePuppeteerTimeout = (timeoutInMilliseconds) => {
     if (typeof timeoutInMilliseconds !== 'number') {
         throw new TypeError(`'timeoutInMilliseconds' should be a number, but is: ${JSON.stringify(timeoutInMilliseconds)}`);
     }
-    if (timeoutInMilliseconds < 7000) {
+    if (timeoutInMilliseconds < 7000 && process.env.NODE_ENV !== 'test') {
         throw new TypeError(`'timeoutInMilliseconds' should be bigger or equal than 7000, but is ${timeoutInMilliseconds}`);
     }
     if (Number.isNaN(timeoutInMilliseconds)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.28",
+	"version": "3.2.30",
 	"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.2.28",
+		"remotion": "3.2.30",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "49bb70afa503bfb0c89ee51d8bf3386ad1b91ac4"
+	"gitHead": "5dc5f4c010c47186c7911b575998296d6a65f7cb"
 }