@remotion/renderer 4.0.0-offthread.5 → 4.0.0-offthread.9

package/dist/extract-frame-from-video.js

@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractFrameFromVideo = exports.extractFrameFromVideoFn = exports.streamToString = void 0;
 const execa_1 = __importDefault(require("execa"));
+const remotion_1 = require("remotion");
 const frame_to_ffmpeg_timestamp_1 = require("./frame-to-ffmpeg-timestamp");
+const is_beyond_last_frame_1 = require("./is-beyond-last-frame");
 const last_frame_from_video_cache_1 = require("./last-frame-from-video-cache");
 const p_limit_1 = require("./p-limit");
 function streamToString(stream) {
@@ -17,7 +19,8 @@ function streamToString(stream) {
     });
 }
 exports.streamToString = streamToString;
-const limit = (0, p_limit_1.pLimit)(5);
+const lastFrameLimit = (0, p_limit_1.pLimit)(5);
+const mainLimit = (0, p_limit_1.pLimit)(5);
 const getLastFrameOfVideoUnlimited = async ({ ffmpegExecutable, offset, src, }) => {
     if (offset > 100) {
         throw new Error('could not get last frame of ' +
@@ -63,7 +66,11 @@ const getLastFrameOfVideoUnlimited = async ({ ffmpegExecutable, offset, src, })
     const [stdErr, stdoutBuffer] = await Promise.all([stdErrString, stdoutChunk]);
     const isEmpty = stdErr.includes('Output file is empty');
     if (isEmpty) {
-        return getLastFrameOfVideo({ ffmpegExecutable, offset: offset + 10, src });
+        return getLastFrameOfVideoUnlimited({
+            ffmpegExecutable,
+            offset: offset + 10,
+            src,
+        });
     }
     return stdoutBuffer;
 };
@@ -72,11 +79,18 @@ const getLastFrameOfVideo = async (options) => {
     if (fromCache) {
         return fromCache;
     }
-    const result = await limit(getLastFrameOfVideoUnlimited, options);
+    const result = await lastFrameLimit(getLastFrameOfVideoUnlimited, options);
     (0, last_frame_from_video_cache_1.setLastFrameInCache)(options, result);
     return result;
 };
 const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, }) => {
+    if ((0, is_beyond_last_frame_1.isBeyondLastFrame)(src, time)) {
+        return getLastFrameOfVideo({
+            ffmpegExecutable,
+            offset: 0,
+            src,
+        });
+    }
     const ffmpegTimestamp = (0, frame_to_ffmpeg_timestamp_1.frameToFfmpegTimestamp)(time);
     const { stdout, stderr } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
         '-ss',
@@ -126,6 +140,7 @@ const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, }) => {
         stdoutBuffer,
     ]);
     if (stderrStr.includes('Output file is empty')) {
+        (0, is_beyond_last_frame_1.markAsBeyondLastFrame)(src, time);
         return getLastFrameOfVideo({
             ffmpegExecutable,
             offset: 0,
@@ -135,7 +150,10 @@ const extractFrameFromVideoFn = async ({ time, src, ffmpegExecutable, }) => {
     return stdOut;
 };
 exports.extractFrameFromVideoFn = extractFrameFromVideoFn;
-const extractFrameFromVideo = (options) => {
-    return limit(exports.extractFrameFromVideoFn, options);
+const extractFrameFromVideo = async (options) => {
+    const perf = remotion_1.Internals.perf.startPerfMeasure('extract-frame');
+    const res = await mainLimit(exports.extractFrameFromVideoFn, options);
+    remotion_1.Internals.perf.stopPerfMeasure(perf);
+    return res;
 };
 exports.extractFrameFromVideo = extractFrameFromVideo;

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

@@ -0,0 +1,2 @@
+export declare const isBeyondLastFrame: (src: string, time: number) => boolean | 0;
+export declare const markAsBeyondLastFrame: (src: string, time: number) => void;

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

@@ -0,0 +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];
+};
+exports.isBeyondLastFrame = isBeyondLastFrame;
+const markAsBeyondLastFrame = (src, time) => {
+    map[src] = time;
+};
+exports.markAsBeyondLastFrame = markAsBeyondLastFrame;

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { FfmpegExecutable } from 'remotion';
 export declare type LastFrameOptions = {
     ffmpegExecutable: FfmpegExecutable;

package/dist/provide-screenshot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import puppeteer from 'puppeteer-core';
 import { ImageFormat } from 'remotion';
 export declare const provideScreenshot: ({ page, imageFormat, options, quality, }: {

package/dist/provide-screenshot.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.provideScreenshot = void 0;
 const screenshot_dom_element_1 = require("./screenshot-dom-element");
-const provideScreenshot = async ({ page, imageFormat, options, quality, }) => {
+const provideScreenshot = ({ page, imageFormat, options, quality, }) => {
     return (0, screenshot_dom_element_1.screenshotDOMElement)({
         page,
         opts: {

package/dist/render-frames.js

@@ -135,6 +135,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         await (0, seek_to_frame_1.seekToFrame)({ frame, page: freePage });
         if (imageFormat !== 'none') {
             if (onFrameBuffer) {
+                const id = remotion_1.Internals.perf.startPerfMeasure('save');
                 const buffer = await (0, provide_screenshot_1.provideScreenshot)({
                     page: freePage,
                     imageFormat,
@@ -144,6 +145,7 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
                         output: undefined,
                     },
                 });
+                remotion_1.Internals.perf.stopPerfMeasure(id);
                 onFrameBuffer(buffer, frame);
             }
             else {

package/dist/render-media.js

@@ -137,7 +137,9 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
                     if (cancelled) {
                         return;
                     }
+                    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(frame + 1);
                 }
                 : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "4.0.0-offthread.5+74268d3f1",
+	"version": "4.0.0-offthread.9+41e641761",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"puppeteer-core": "13.5.1",
-		"remotion": "4.0.0-offthread.5+74268d3f1",
+		"remotion": "4.0.0-offthread.9+41e641761",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "74268d3f1bd53f919fdef44575596b9005e112ab"
+	"gitHead": "41e641761b9df6c7c876fb8bbb5ca4e5a0fe6e2a"
 }