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

package/dist/stitch-frames-to-video.d.ts

@@ -1,5 +1,6 @@
 import { Codec, FfmpegExecutable, ImageFormat, PixelFormat, ProResProfile, RenderAssetInfo } from 'remotion';
 import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file';
+import { CancelSignal } from './make-cancel-signal';
 export declare type StitcherOptions = {
     fps: number;
     width: number;
@@ -16,13 +17,14 @@ export declare type StitcherOptions = {
     verbose?: boolean;
     ffmpegExecutable?: FfmpegExecutable;
     dir?: string;
+    cancelSignal?: CancelSignal;
     internalOptions?: {
         preEncodedFileLocation: string | null;
         imageFormat: ImageFormat;
     };
 };
 declare type ReturnType = {
-    task: Promise<unknown>;
+    task: Promise<void>;
     getLogs: () => string;
 };
 export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<ReturnType>;

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

@@ -68,7 +68,7 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
     return outName;
 };
 const spawnFfmpeg = async (options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     remotion_1.Internals.validateDimension(options.height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(options.width, 'width', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateFps(options.fps, 'passed to `stitchFramesToVideo()`');
@@ -121,7 +121,7 @@ const spawnFfmpeg = async (options) => {
         if (!audioCodecName) {
             throw new TypeError('exporting audio but has no audio codec name. Report this in the Remotion repo.');
         }
-        await (0, execa_1.default)('ffmpeg', [
+        const ffmpegTask = (0, execa_1.default)('ffmpeg', [
             '-i',
             audio,
             '-c:a',
@@ -129,7 +129,11 @@ const spawnFfmpeg = async (options) => {
             options.force ? '-y' : null,
             options.outputLocation,
         ].filter(remotion_1.Internals.truthy));
-        (_h = options.onProgress) === null || _h === void 0 ? void 0 : _h.call(options, expectedFrames);
+        (_h = options.cancelSignal) === null || _h === void 0 ? void 0 : _h.call(options, () => {
+            ffmpegTask.kill();
+        });
+        await ffmpegTask;
+        (_j = options.onProgress) === null || _j === void 0 ? void 0 : _j.call(options, expectedFrames);
         return {
             getLogs: () => '',
             task: Promise.resolve(),
@@ -137,8 +141,8 @@ const spawnFfmpeg = async (options) => {
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_j = options.internalOptions) === null || _j === void 0 ? void 0 : _j.preEncodedFileLocation)
-            ? [['-i', (_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.preEncodedFileLocation]]
+        ...(((_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.preEncodedFileLocation)
+            ? [['-i', (_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
@@ -149,7 +153,7 @@ const spawnFfmpeg = async (options) => {
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
+        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -177,12 +181,15 @@ const spawnFfmpeg = async (options) => {
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_m = options.ffmpegExecutable) !== null && _m !== void 0 ? _m : 'ffmpeg', ffmpegString, {
+    const task = (0, execa_1.default)((_o = options.ffmpegExecutable) !== null && _o !== void 0 ? _o : 'ffmpeg', ffmpegString, {
         cwd: options.dir,
     });
+    (_p = options.cancelSignal) === null || _p === void 0 ? void 0 : _p.call(options, () => {
+        task.kill();
+    });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_o = task.stderr) === null || _o === void 0 ? void 0 : _o.on('data', (data) => {
+    (_q = task.stderr) === null || _q === void 0 ? void 0 : _q.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;
@@ -204,16 +211,22 @@ const spawnFfmpeg = async (options) => {
             }
         }
     });
-    return { task, getLogs: () => ffmpegOutput };
+    return { task: task.then(() => undefined), getLogs: () => ffmpegOutput };
 };
 exports.spawnFfmpeg = spawnFfmpeg;
 const stitchFramesToVideo = async (options) => {
     const { task, getLogs } = await (0, exports.spawnFfmpeg)(options);
-    try {
-        await task;
-    }
-    catch (err) {
+    const happyPath = task.catch(() => {
         throw new Error(getLogs());
-    }
+    });
+    return Promise.race([
+        happyPath,
+        new Promise((_resolve, reject) => {
+            var _a;
+            (_a = options.cancelSignal) === null || _a === void 0 ? void 0 : _a.call(options, () => {
+                reject(new Error('stitchFramesToVideo() got cancelled'));
+            });
+        }),
+    ]);
 };
 exports.stitchFramesToVideo = stitchFramesToVideo;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "4.0.0-offthread.42+5cdecb6d7",
+	"version": "4.0.0-offthread.5+74268d3f1",
 	"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.42+5cdecb6d7",
+		"remotion": "4.0.0-offthread.5+74268d3f1",
 		"serve-handler": "6.1.3",
 		"source-map": "^0.8.0-beta.0"
 	},
@@ -46,7 +46,7 @@
 		"react": "18.0.0",
 		"react-dom": "18.0.0",
 		"ts-jest": "^27.0.5",
-		"typescript": "^4.5.5"
+		"typescript": "^4.7.0"
 	},
 	"keywords": [
 		"remotion",
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5cdecb6d7971afe3062521d319eb32aac96346f3"
+	"gitHead": "74268d3f1bd53f919fdef44575596b9005e112ab"
 }