@remotion/renderer 4.0.0-offthread.21 → 4.0.0-offthread.27

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

@@ -1,7 +1,17 @@
 /// <reference types="node" />
 import { FfmpegExecutable } from 'remotion';
-export declare const extractFrameFromVideo: ({ time, src, ffmpegExecutable, }: {
+import { Readable } from 'stream';
+export declare function streamToString(stream: Readable): Promise<string>;
+export declare const getLastFrameOfVideo: ({ ffmpegExecutable, offset, src, }: {
+    ffmpegExecutable: FfmpegExecutable;
+    offset: number;
+    src: string;
+}) => Promise<Buffer>;
+declare type Options = {
     time: number;
     src: string;
     ffmpegExecutable: FfmpegExecutable;
-}) => import("stream").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,12 +3,72 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractFrameFromVideo = 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 extractFrameFromVideo = ({ time, src, ffmpegExecutable, }) => {
+const p_limit_1 = require("./p-limit");
+function streamToString(stream) {
+    const chunks = [];
+    return new Promise((resolve, reject) => {
+        stream.on('data', (chunk) => chunks.push(Buffer.from(chunk)));
+        stream.on('error', (err) => reject(err));
+        stream.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
+    });
+}
+exports.streamToString = streamToString;
+const getLastFrameOfVideo = ({ ffmpegExecutable, offset, src, }) => {
+    if (offset > 100) {
+        throw new Error('could not get last frame of ' +
+            src +
+            '. Tried to seek 100ms before the end of the video and no frame was found. The video container has a duration that is longer than it contains video.');
+    }
+    const actualOffset = `-${offset + 10}ms`;
+    const { stdout, stderr } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
+        '-sseof',
+        actualOffset,
+        '-i',
+        src,
+        '-frames:v',
+        '1',
+        '-f',
+        'image2pipe',
+        '-',
+    ]);
+    if (!stderr) {
+        throw new Error('unexpectedly did not get stderr');
+    }
+    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 limit = (0, p_limit_1.pLimit)(5);
+const extractFrameFromVideoFn = ({ time, src, ffmpegExecutable, }) => {
     const ffmpegTimestamp = (0, frame_to_ffmpeg_timestamp_1.frameToFfmpegTimestamp)(time);
-    const { stdout } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
+    const { stdout, stderr } = (0, execa_1.default)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : 'ffmpeg', [
         '-ss',
         ffmpegTimestamp,
         '-i',
@@ -18,7 +78,41 @@ const extractFrameFromVideo = ({ time, src, ffmpegExecutable, }) => {
         '-f',
         'image2pipe',
         '-',
-    ]);
-    return stdout;
+    ], {
+        buffer: false,
+    });
+    if (!stderr) {
+        throw new Error('unexpectedly did not get stderr');
+    }
+    if (!stdout) {
+        throw new Error('unexpectedly did not get 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.21+1965d2596",
+	"version": "4.0.0-offthread.27+32abe2e78",
 	"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.21+1965d2596",
+		"remotion": "4.0.0-offthread.27+32abe2e78",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "1965d2596493ada30f25a823ee3d85de7325c341"
+	"gitHead": "32abe2e782eb088fe72b1093f0ee35b1dd16ac8e"
 }