@remotion/renderer 4.0.0-offthread.22 → 4.0.0-offthread.28

package/dist/extract-frame-from-video.d.ts

@@ -6,9 +6,12 @@ export declare const getLastFrameOfVideo: ({ ffmpegExecutable, offset, src, }: {
     ffmpegExecutable: FfmpegExecutable;
     offset: number;
     src: string;
-}) => Promise<Readable>;
-export declare const extractFrameFromVideo: ({ time, src, ffmpegExecutable, }: {
+}) => Promise<Buffer>;
+declare type Options = {
     time: number;
     src: string;
     ffmpegExecutable: FfmpegExecutable;
-}) => Promise<Readable | null>;
+};
+export declare const extractFrameFromVideoFn: ({ time, src, ffmpegExecutable, }: Options) => Promise<Buffer>;
+export declare const extractFrameFromVideo: (options: Options) => Promise<Buffer>;
+export {};

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

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFrameFromVideo = exports.getLastFrameOfVideo = exports.streamToString = void 0;
+exports.extractFrameFromVideo = exports.extractFrameFromVideoFn = exports.getLastFrameOfVideo = exports.streamToString = void 0;
 const execa_1 = __importDefault(require("execa"));
 const frame_to_ffmpeg_timestamp_1 = require("./frame-to-ffmpeg-timestamp");
+const p_limit_1 = require("./p-limit");
 function streamToString(stream) {
     const chunks = [];
     return new Promise((resolve, reject) => {
@@ -15,7 +16,7 @@ function streamToString(stream) {
     });
 }
 exports.streamToString = streamToString;
-const getLastFrameOfVideo = async ({ ffmpegExecutable, offset, src, }) => {
+const getLastFrameOfVideo = ({ ffmpegExecutable, offset, src, }) => {
     if (offset > 100) {
         throw new Error('could not get last frame of ' +
             src +
@@ -33,14 +34,39 @@ const getLastFrameOfVideo = async ({ ffmpegExecutable, offset, src, }) => {
         'image2pipe',
         '-',
     ]);
-    const info = await streamToString(stderr);
-    if (info.includes('Output file is empty')) {
-        return (0, exports.getLastFrameOfVideo)({ ffmpegExecutable, offset: offset + 10, src });
+    if (!stderr) {
+        throw new Error('unexpectedly did not get stderr');
     }
-    return stdout;
+    if (!stdout) {
+        throw new Error('unexpectedly did not get stdout');
+    }
+    const chunks = [];
+    return new Promise((resolve, reject) => {
+        let isEmpty = false;
+        stderr.on('data', (d) => {
+            if (d.toString().includes('Output file is empty')) {
+                isEmpty = true;
+                (0, exports.getLastFrameOfVideo)({ ffmpegExecutable, offset: offset + 10, src })
+                    .then((frame) => resolve(frame))
+                    .catch((err) => reject(err));
+            }
+        });
+        stdout.on('data', (d) => {
+            chunks.push(d);
+        });
+        stdout.on('error', (err) => {
+            reject(err);
+        });
+        stdout.on('end', () => {
+            if (!isEmpty) {
+                resolve(Buffer.concat(chunks));
+            }
+        });
+    });
 };
 exports.getLastFrameOfVideo = getLastFrameOfVideo;
-const extractFrameFromVideo = async ({ time, src, ffmpegExecutable, }) => {
+const limit = (0, p_limit_1.pLimit)(5);
+const extractFrameFromVideoFn = ({ time, src, ffmpegExecutable, }) => {
     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',
@@ -52,15 +78,41 @@ const extractFrameFromVideo = async ({ time, src, ffmpegExecutable, }) => {
         '-f',
         'image2pipe',
         '-',
-    ]);
-    const info = await streamToString(stderr);
-    if (info.includes('Output file is empty')) {
-        return (0, exports.getLastFrameOfVideo)({
-            ffmpegExecutable,
-            offset: 0,
-            src,
-        });
+    ], {
+        buffer: false,
+    });
+    if (!stderr) {
+        throw new Error('unexpectedly did not get stderr');
+    }
+    if (!stdout) {
+        throw new Error('unexpectedly did not get stdout');
     }
-    return stdout;
+    const chunks = [];
+    return new Promise((resolve, reject) => {
+        let isEmpty = false;
+        stderr === null || stderr === void 0 ? void 0 : stderr.on('data', (d) => {
+            if (d.toString().includes('Output file is empty')) {
+                isEmpty = true;
+                (0, exports.getLastFrameOfVideo)({ ffmpegExecutable, offset: 0, src })
+                    .then((frame) => resolve(frame))
+                    .catch((err) => reject(err));
+            }
+        });
+        stdout === null || stdout === void 0 ? void 0 : stdout.on('data', (d) => {
+            chunks.push(d);
+        });
+        stdout === null || stdout === void 0 ? void 0 : stdout.on('error', (err) => {
+            reject(err);
+        });
+        stdout === null || stdout === void 0 ? void 0 : stdout.on('end', () => {
+            if (!isEmpty) {
+                resolve(Buffer.concat(chunks));
+            }
+        });
+    });
+};
+exports.extractFrameFromVideoFn = extractFrameFromVideoFn;
+const extractFrameFromVideo = (options) => {
+    return limit(exports.extractFrameFromVideoFn, options);
 };
 exports.extractFrameFromVideo = extractFrameFromVideo;

package/dist/offthread-video-server.js

@@ -50,14 +50,8 @@ const startOffthreadVideoServer = (ffmpegExecutable, downloadDir, onDownload, on
                 throw new Error('no readable from ffmpeg');
             }
             res.writeHead(200);
-            readable
-                .pipe(res)
-                .on('close', () => {
-                res.end();
-            })
-                .on('error', (err) => {
-                onError(err);
-            });
+            res.write(readable);
+            res.end();
         })
             .catch((err) => {
             res.writeHead(500);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "4.0.0-offthread.22+0c1f87dbc",
+	"version": "4.0.0-offthread.28+4c660b5d3",
 	"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.22+0c1f87dbc",
+		"remotion": "4.0.0-offthread.28+4c660b5d3",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0c1f87dbc03f756647d542172cbd3c067c19154a"
+	"gitHead": "4c660b5d347a5c6213abcc2021442f35d84af844"
 }