@remotion/renderer 3.1.0 → 3.1.3

package/dist/assets/download-and-map-assets-to-file.js

@@ -96,7 +96,18 @@ const downloadAsset = async ({ src, onDownload, downloadDir, }) => {
         return src;
     }
     if ((_a = hasBeenDownloadedMap[src]) === null || _a === void 0 ? void 0 : _a[downloadDir]) {
-        return (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
+        const claimedDownloadLocation = (_b = hasBeenDownloadedMap[src]) === null || _b === void 0 ? void 0 : _b[downloadDir];
+        // The OS might have deleted the file since even though we marked it as downloaded. In that case we reset the state and download it again
+        if (!fs_1.default.existsSync(claimedDownloadLocation)) {
+            return claimedDownloadLocation;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        hasBeenDownloadedMap[src][downloadDir] = null;
+        if (!isDownloadingMap[src]) {
+            isDownloadingMap[src] = {};
+        }
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        isDownloadingMap[src][downloadDir] = false;
     }
     if ((_c = isDownloadingMap[src]) === null || _c === void 0 ? void 0 : _c[downloadDir]) {
         return waitForAssetToBeDownloaded({ src, downloadDir });

package/dist/get-frame-padded-index.d.ts

@@ -0,0 +1,14 @@
+export declare type CountType = 'from-zero' | 'actual-frames';
+export declare const getFrameOutputFileName: ({ index, frame, imageFormat, countType, lastFrame, totalFrames, }: {
+    index: number;
+    frame: number;
+    imageFormat: 'png' | 'jpeg';
+    countType: CountType;
+    lastFrame: number;
+    totalFrames: number;
+}) => string;
+export declare const getFilePadLength: ({ lastFrame, totalFrames, countType, }: {
+    lastFrame: number;
+    totalFrames: number;
+    countType: CountType;
+}) => number;

package/dist/get-frame-padded-index.js

@@ -0,0 +1,33 @@
+"use strict";
+// Determines the filenames for frames that get rendered.
+// - If passed to FFMPEG, they should be consecutive: element-000.jpg, element-001.jpg, element-002.jpg
+// - If `--every-nth-frame` is passed, only frames 0, 2, 4 are rendered
+// - If an image sequence is created, the filenames should correspond to the frame numbers: element-099.jpg, element-100.jpg
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFilePadLength = exports.getFrameOutputFileName = void 0;
+const padIndex = ({ num, filePadLength, }) => {
+    return String(num).padStart(filePadLength, '0');
+};
+const getFrameOutputFileName = ({ index, frame, imageFormat, countType, lastFrame, totalFrames, }) => {
+    const filePadLength = (0, exports.getFilePadLength)({ lastFrame, countType, totalFrames });
+    if (countType === 'actual-frames') {
+        const paddedIndex = padIndex({ filePadLength, num: frame });
+        return `element-${paddedIndex}.${imageFormat}`;
+    }
+    if (countType === 'from-zero') {
+        const paddedIndex = padIndex({ filePadLength, num: index });
+        return `element-${paddedIndex}.${imageFormat}`;
+    }
+    throw new TypeError('Unknown count type');
+};
+exports.getFrameOutputFileName = getFrameOutputFileName;
+const getFilePadLength = ({ lastFrame, totalFrames, countType, }) => {
+    if (countType === 'actual-frames') {
+        return String(lastFrame).length;
+    }
+    if (countType === 'from-zero') {
+        return String(totalFrames - 1).length;
+    }
+    throw new Error('Unknown file type');
+};
+exports.getFilePadLength = getFilePadLength;

package/dist/merge-audio-track.js

@@ -11,6 +11,7 @@ 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, }) => {
@@ -44,12 +45,14 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
             });
             return chunkOutname;
         }));
-        return (0, exports.mergeAudioTrack)({
+        await (0, exports.mergeAudioTrack)({
             ffmpegExecutable,
             files: chunkNames,
             numberOfSeconds,
             outName,
         });
+        await (0, delete_directory_1.deleteDirectory)(tempPath);
+        return;
     }
     const { complexFilterFlag: mergeFilter, cleanup } = await (0, create_ffmpeg_complex_filter_1.createFfmpegComplexFilter)(files.length);
     const args = [

package/dist/render-frames.js

@@ -12,6 +12,7 @@ const cycle_browser_tabs_1 = require("./cycle-browser-tabs");
 const handle_javascript_exception_1 = require("./error-handling/handle-javascript-exception");
 const get_concurrency_1 = require("./get-concurrency");
 const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range");
+const get_frame_padded_index_1 = require("./get-frame-padded-index");
 const get_frame_to_render_1 = require("./get-frame-to-render");
 const image_format_1 = require("./image-format");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
@@ -71,11 +72,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         if (onBrowserLog) {
             page.on('console', logCallback);
         }
-        const initialFrame = typeof frameRange === 'number'
-            ? frameRange
-            : frameRange === null || frameRange === undefined
-                ? 0
-                : frameRange[0];
+        const initialFrame = realFrameRange[0];
         await (0, set_props_and_env_1.setPropsAndEnv)({
             inputProps,
             envVariables,
@@ -100,9 +97,14 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         page.off('console', logCallback);
         return page;
     });
-    // Substract one because 100 frames will be 00-99
-    // --> 2 digits
-    const filePadLength = String(lastFrame).length;
+    // If rendering a GIF and skipping frames, we must ensure it starts from 0
+    // and then is consecutive so FFMPEG recognizes the sequence
+    const countType = everyNthFrame === 1 ? 'actual-frames' : 'from-zero';
+    const filePadLength = (0, get_frame_padded_index_1.getFilePadLength)({
+        lastFrame,
+        totalFrames: framesToRender.length,
+        countType,
+    });
     let framesRendered = 0;
     const poolPromise = getPool(pages);
     onStart({
@@ -119,7 +121,6 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         if (stopped) {
             throw new Error('Render was stopped');
         }
-        const paddedIndex = String(frame).padStart(filePadLength, '0');
         const errorCallbackOnFrame = (err) => {
             onError(err);
         };
@@ -149,7 +150,14 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
                 if (!outputDir) {
                     throw new Error('Called renderFrames() without specifying either `outputDir` or `onFrameBuffer`');
                 }
-                const output = path_1.default.join(outputDir, `element-${paddedIndex}.${imageFormat}`);
+                const output = path_1.default.join(outputDir, (0, get_frame_padded_index_1.getFrameOutputFileName)({
+                    frame,
+                    imageFormat,
+                    index,
+                    countType,
+                    lastFrame,
+                    totalFrames: framesToRender.length,
+                }));
                 await (0, provide_screenshot_1.provideScreenshot)({
                     page: freePage,
                     imageFormat,

package/dist/render-media.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { BrowserExecutable, Codec, FfmpegExecutable, FrameRange, PixelFormat, ProResProfile, SmallTCompMetadata } from 'remotion';
 import type { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
 import type { BrowserLog } from './browser-log';

package/dist/render-media.js

@@ -153,7 +153,7 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
                     const id = remotion_1.Internals.perf.startPerfMeasure('piping');
                     (_a = stitcherFfmpeg === null || stitcherFfmpeg === void 0 ? void 0 : stitcherFfmpeg.stdin) === null || _a === void 0 ? void 0 : _a.write(buffer);
                     remotion_1.Internals.perf.stopPerfMeasure(id);
-                    setFrameToStitch(Math.max(realFrameRange[1] + 1, frame + everyNthFrame));
+                    setFrameToStitch(Math.min(realFrameRange[1] + 1, frame + everyNthFrame));
                 }
                 : undefined,
             serveUrl,

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

@@ -1,11 +1,34 @@
 "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.stitchFramesToVideo = exports.spawnFfmpeg = void 0;
 const execa_1 = __importDefault(require("execa"));
-const fs_1 = __importDefault(require("fs"));
+const fs_1 = __importStar(require("fs"));
 const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const remotion_1 = require("remotion");
@@ -59,13 +82,14 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
         updateProgress();
         return result;
     }))).filter(remotion_1.Internals.truthy);
-    const outName = path_1.default.join(tempPath, `audio.wav`);
+    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,
         files: preprocessed,
         outName,
         numberOfSeconds: Number((expectedFrames / fps).toFixed(3)),
     });
+    (0, delete_directory_1.deleteDirectory)(tempPath);
     onProgress(1);
     preprocessed.forEach((p) => {
         (0, delete_directory_1.deleteDirectory)(p);
@@ -148,7 +172,22 @@ const spawnFfmpeg = async (options) => {
         });
         await ffmpegTask;
         (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, expectedFrames);
-        const file = tempFile ? await (0, promises_1.readFile)(tempFile) : null;
+        if (audio) {
+            await (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(audio));
+        }
+        const file = await new Promise((resolve, reject) => {
+            if (tempFile) {
+                (0, promises_1.readFile)(tempFile)
+                    .then((f) => {
+                    (0, fs_1.unlinkSync)(tempFile);
+                    return resolve(f);
+                })
+                    .catch((e) => reject(e));
+            }
+            else {
+                resolve(null);
+            }
+        });
         return {
             getLogs: () => '',
             task: Promise.resolve(file),
@@ -236,12 +275,12 @@ const spawnFfmpeg = async (options) => {
     });
     return {
         task: task.then(() => {
-            if (options.outputLocation) {
+            if (tempFile === null) {
                 return null;
             }
             return (0, promises_1.readFile)(tempFile)
                 .then((file) => {
-                return Promise.all([file, (0, promises_1.unlink)(tempFile)]);
+                return Promise.all([file, (0, delete_directory_1.deleteDirectory)(path_1.default.dirname(tempFile))]);
             })
                 .then(([file]) => file);
         }),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.1.0",
+	"version": "3.1.3",
 	"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.0",
+		"remotion": "3.1.3",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "482c66127662171577aa427f10fe265fa1bc933b"
+	"gitHead": "d57ec16eaf33280c89b0974997946ab9ea155372"
 }