@remotion/renderer 4.0.145 → 4.0.146

package/dist/render-frames.js

@@ -40,7 +40,7 @@ const validate_1 = require("./validate");
 const validate_scale_1 = require("./validate-scale");
 const wrap_with_error_handling_1 = require("./wrap-with-error-handling");
 const MAX_RETRIES_PER_FRAME = 1;
-const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, jpegQuality, imageFormat, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency, everyNthFrame, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, compositor, sourceMapGetter, logLevel, indent, parallelEncodingEnabled, compositionStart, forSeamlessAacConcatenation, }) => {
+const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serializedInputPropsWithCustomSchema, serializedResolvedPropsWithCustomSchema, jpegQuality, imageFormat, frameRange, onError, envVariables, onBrowserLog, onFrameBuffer, onDownload, pagesArray, serveUrl, composition, timeoutInMilliseconds, scale, actualConcurrency: concurrency, everyNthFrame, proxyPort, cancelSignal, downloadMap, muted, makeBrowser, browserReplacer, compositor, sourceMapGetter, logLevel, indent, parallelEncodingEnabled, compositionStart, forSeamlessAacConcatenation, }) => {
     if (outputDir) {
         if (!node_fs_1.default.existsSync(outputDir)) {
             node_fs_1.default.mkdirSync(outputDir, {
@@ -58,7 +58,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
     });
     const framesToRender = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame);
     const lastFrame = framesToRender[framesToRender.length - 1];
-    const makePage = async (context) => {
+    const makePage = async (context, initialFrame) => {
         const page = await browserReplacer
             .getBrowser()
             .newPage(context, logLevel, indent);
@@ -78,7 +78,6 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
         if (onBrowserLog) {
             page.on('console', logCallback);
         }
-        const initialFrame = realFrameRange[0];
         await (0, set_props_and_env_1.setPropsAndEnv)({
             serializedInputPropsWithCustomSchema,
             envVariables,
@@ -123,10 +122,11 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
         page.off('console', logCallback);
         return page;
     };
+    const concurrencyOrFramesToRender = Math.min(framesToRender.length, concurrency);
     const getPool = async (context) => {
-        const pages = new Array(actualConcurrency)
+        const pages = new Array(concurrencyOrFramesToRender)
             .fill(true)
-            .map(() => makePage(context));
+            .map((_, i) => makePage(context, realFrameRange[i]));
         const puppeteerPages = await Promise.all(pages);
         const pool = new pool_1.Pool(puppeteerPages);
         return pool;
@@ -299,7 +299,7 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             if (shouldRetryError) {
                 const pool = await poolPromise;
                 // Replace the closed page
-                const newPage = await makePage(sourceMapGetter);
+                const newPage = await makePage(sourceMapGetter, frame);
                 pool.release(newPage);
                 logger_1.Log.warn({ indent, logLevel }, `delayRender() timed out while rendering frame ${frame}: ${err.message}`);
                 const actualRetriesLeft = (0, is_delay_render_error_with_retry_1.getRetriesLeftFromError)(err);
@@ -314,9 +314,9 @@ const innerRenderFrames = async ({ onFrameUpdate, outputDir, onStart, serialized
             logger_1.Log.warn({ indent, logLevel }, `The browser crashed while rendering frame ${frame}, retrying ${retriesLeft} more times. Learn more about this error under https://www.remotion.dev/docs/target-closed`);
             // Replace the entire browser
             await browserReplacer.replaceBrowser(makeBrowser, async () => {
-                const pages = new Array(actualConcurrency)
+                const pages = new Array(concurrencyOrFramesToRender)
                     .fill(true)
-                    .map(() => makePage(sourceMapGetter));
+                    .map(() => makePage(sourceMapGetter, frame));
                 const puppeteerPages = await Promise.all(pages);
                 const pool = await poolPromise;
                 for (const newPage of puppeteerPages) {

package/dist/render-media.js

@@ -101,7 +101,6 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
     let encodedFrames = 0;
     let muxedFrames = 0;
     let renderedFrames = 0;
-    let totalFramesToRender = 0;
     let renderedDoneIn = null;
     let encodedDoneIn = null;
     let cancelled = false;
@@ -170,6 +169,7 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
         wantsImageSequence: false,
     });
     const realFrameRange = (0, get_frame_to_render_1.getRealFrameRange)(composition.durationInFrames, frameRange);
+    const totalFramesToRender = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame).length;
     logger_1.Log.verbose({ indent, logLevel, tag: 'renderMedia()' }, `Rendering frames ${realFrameRange.join('-')}`);
     const callUpdate = () => {
         const encoded = Math.round(0.8 * encodedFrames + 0.2 * muxedFrames);
@@ -293,7 +293,6 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
                 outputDir: parallelEncoding ? null : workingDir,
                 onStart: (data) => {
                     renderedFrames = 0;
-                    totalFramesToRender = data.frameCount;
                     callUpdate();
                     onStart === null || onStart === void 0 ? void 0 : onStart(data);
                 },
@@ -408,7 +407,7 @@ const internalRenderMediaRaw = ({ proResProfile, x264Preset, crf, composition, s
             ]);
         })
             .then(([buffer, stitchStart]) => {
-            encodedFrames = (0, get_duration_from_frame_range_1.getFramesToRender)(realFrameRange, everyNthFrame).length;
+            encodedFrames = totalFramesToRender;
             encodedDoneIn = Date.now() - stitchStart;
             callUpdate();
             logger_1.Log.verbose({ indent, logLevel }, 'Stitching done in', encodedDoneIn + 'ms');

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

@@ -30,7 +30,7 @@ const innerSetPropsAndEnv = async ({ serializedInputPropsWithCustomSchema, envVa
     }, initialFrame);
     await page.evaluateOnNewDocument(() => {
         window.remotion_attempt = 1;
-    }, initialFrame);
+    });
     await page.evaluateOnNewDocument((port) => {
         window.remotion_proxyPort = port;
     }, proxyPort);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.145",
+  "version": "4.0.146",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.145"
+    "remotion": "4.0.146"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -43,13 +43,13 @@
     "@types/ws": "8.5.10"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.145",
-    "@remotion/compositor-darwin-x64": "4.0.145",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.145",
-    "@remotion/compositor-linux-arm64-musl": "4.0.145",
-    "@remotion/compositor-linux-x64-musl": "4.0.145",
-    "@remotion/compositor-win32-x64-msvc": "4.0.145",
-    "@remotion/compositor-linux-x64-gnu": "4.0.145"
+    "@remotion/compositor-darwin-arm64": "4.0.146",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.146",
+    "@remotion/compositor-linux-x64-gnu": "4.0.146",
+    "@remotion/compositor-darwin-x64": "4.0.146",
+    "@remotion/compositor-linux-x64-musl": "4.0.146",
+    "@remotion/compositor-win32-x64-msvc": "4.0.146",
+    "@remotion/compositor-linux-arm64-musl": "4.0.146"
   },
   "keywords": [
     "remotion",