@remotion/renderer 3.0.16 → 3.0.19

package/dist/serve-handler/range-parser.js

@@ -0,0 +1,57 @@
+"use strict";
+/*!
+ * range-parser
+ * Copyright(c) 2012-2014 TJ Holowaychuk
+ * Copyright(c) 2015-2016 Douglas Christopher Wilson
+ * MIT Licensed
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rangeParser = void 0;
+const rangeParser = (size, str) => {
+    if (typeof str !== 'string') {
+        throw new TypeError('argument str must be a string');
+    }
+    const index = str.indexOf('=');
+    if (index === -1) {
+        return -2;
+    }
+    // split the range string
+    const arr = str.slice(index + 1).split(',');
+    const ranges = [];
+    // add ranges type
+    const type = str.slice(0, index);
+    // parse all ranges
+    for (let i = 0; i < arr.length; i++) {
+        const range = arr[i].split('-');
+        let start = parseInt(range[0], 10);
+        let end = parseInt(range[1], 10);
+        // -nnn
+        if (isNaN(start)) {
+            start = size - end;
+            end = size - 1;
+            // nnn-
+        }
+        else if (isNaN(end)) {
+            end = size - 1;
+        }
+        // limit last-byte-pos to current length
+        if (end > size - 1) {
+            end = size - 1;
+        }
+        // invalid or unsatisifiable
+        if (isNaN(start) || isNaN(end) || start > end || start < 0) {
+            continue;
+        }
+        // add range
+        ranges.push({
+            start,
+            end,
+        });
+    }
+    if (ranges.length < 1) {
+        // unsatisifiable
+        return -1;
+    }
+    return { ranges, type };
+};
+exports.rangeParser = rangeParser;

package/dist/serve-static.d.ts

@@ -3,6 +3,7 @@ import { RenderMediaOnDownload } from './assets/download-and-map-assets-to-file'
 export declare const serveStatic: (path: string | null, options: {
     port: number | null;
     ffmpegExecutable: FfmpegExecutable;
+    ffprobeExecutable: FfmpegExecutable;
     downloadDir: string;
     onDownload: RenderMediaOnDownload;
     onError: (err: Error) => void;

package/dist/serve-static.js

@@ -6,14 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serveStatic = void 0;
 const http_1 = __importDefault(require("http"));
 const remotion_1 = require("remotion");
-const serve_handler_1 = __importDefault(require("serve-handler"));
 const get_port_1 = require("./get-port");
 const offthread_video_server_1 = require("./offthread-video-server");
+const serve_handler_1 = require("./serve-handler");
 const serveStatic = async (path, options) => {
     var _a, _b;
     const port = await (0, get_port_1.getDesiredPort)((_b = (_a = options === null || options === void 0 ? void 0 : options.port) !== null && _a !== void 0 ? _a : remotion_1.Internals.getServerPort()) !== null && _b !== void 0 ? _b : undefined, 3000, 3100);
     const offthreadRequest = (0, offthread_video_server_1.startOffthreadVideoServer)({
         ffmpegExecutable: options.ffmpegExecutable,
+        ffprobeExecutable: options.ffprobeExecutable,
         downloadDir: options.downloadDir,
         onDownload: options.onDownload,
         onError: options.onError,
@@ -30,10 +31,8 @@ const serveStatic = async (path, options) => {
                 response.end('Server only supports /proxy');
                 return;
             }
-            (0, serve_handler_1.default)(request, response, {
+            (0, serve_handler_1.serveHandler)(request, response, {
                 public: path,
-                directoryListing: false,
-                cleanUrls: false,
             }).catch(() => {
                 response.statusCode = 500;
                 response.end('Error serving file');

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

@@ -0,0 +1,8 @@
+import { StitcherOptions } from './stitch-frames-to-video';
+declare type ReturnType = {
+    task: Promise<unknown>;
+    getLogs: () => string;
+};
+export declare const spawnFfmpeg: (options: StitcherOptions) => Promise<ReturnType>;
+export declare const stitchFramesToGif: (options: StitcherOptions) => Promise<void>;
+export {};

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

@@ -0,0 +1,128 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stitchFramesToGif = exports.spawnFfmpeg = void 0;
+const execa_1 = __importDefault(require("execa"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const remotion_1 = require("remotion");
+const get_codec_name_1 = require("./get-codec-name");
+const get_prores_profile_name_1 = require("./get-prores-profile-name");
+const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
+const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
+const validate_ffmpeg_1 = require("./validate-ffmpeg");
+const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
+const packageJson = fs_1.default.existsSync(packageJsonPath)
+    ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
+    : null;
+const spawnFfmpeg = async (options) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    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()`');
+    const codec = (_a = options.codec) !== null && _a !== void 0 ? _a : remotion_1.Internals.DEFAULT_CODEC;
+    (0, validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec)({
+        width: options.width,
+        height: options.height,
+        codec,
+        scale: 1,
+    });
+    const crf = (_b = options.crf) !== null && _b !== void 0 ? _b : remotion_1.Internals.getDefaultCrfForCodec(codec);
+    const pixelFormat = (_c = options.pixelFormat) !== null && _c !== void 0 ? _c : remotion_1.Internals.DEFAULT_PIXEL_FORMAT;
+    await (0, validate_ffmpeg_1.validateFfmpeg)((_d = options.ffmpegExecutable) !== null && _d !== void 0 ? _d : null);
+    const encoderName = (0, get_codec_name_1.getCodecName)(codec);
+    const proResProfileName = (0, get_prores_profile_name_1.getProResProfileName)(codec, options.proResProfile);
+    const supportsCrf = encoderName && codec !== 'prores';
+    if (options.verbose) {
+        console.log('[verbose] ffmpeg', (_e = options.ffmpegExecutable) !== null && _e !== void 0 ? _e : 'ffmpeg in PATH');
+        console.log('[verbose] encoder', encoderName);
+        console.log('[verbose] pixelFormat', pixelFormat);
+        if (supportsCrf) {
+            console.log('[verbose] crf', crf);
+        }
+        console.log('[verbose] codec', codec);
+        console.log('[verbose] proResProfileName', proResProfileName);
+    }
+    remotion_1.Internals.validateSelectedCrfAndCodecCombination(crf, codec);
+    remotion_1.Internals.validateSelectedPixelFormatAndCodecCombination(pixelFormat, codec);
+    const expectedFrames = options.assetsInfo.assets.length;
+    const updateProgress = (preStitchProgress, muxProgress) => {
+        var _a;
+        const totalFrameProgress = 0.5 * preStitchProgress * expectedFrames + muxProgress * 0.5;
+        (_a = options.onProgress) === null || _a === void 0 ? void 0 : _a.call(options, Math.round(totalFrameProgress));
+    };
+    const ffmpegArgs = [
+        ['-r', String(options.fps)],
+        ...(((_f = options.internalOptions) === null || _f === void 0 ? void 0 : _f.preEncodedFileLocation)
+            ? [['-i', (_g = options.internalOptions) === null || _g === void 0 ? void 0 : _g.preEncodedFileLocation]]
+            : [
+                ['-f', 'image2'],
+                ['-s', `${options.width}x${options.height}`],
+                ['-start_number', String(options.assetsInfo.firstFrameIndex)],
+                ['-i', options.assetsInfo.imageSequenceName],
+            ]),
+        // -c:v is the same as -vcodec as -codec:video
+        // and specified the video codec.
+        options.loop === null
+            ? null
+            : ['-loop', typeof options.loop === 'number' ? options.loop : '-1'],
+        // Ignore metadata that may come from remote media
+        ['-map_metadata', '-1'],
+        [
+            '-metadata',
+            `comment=` +
+                [`Made with Remotion`, packageJson ? packageJson.version : null].join(' '),
+        ],
+        options.force ? '-y' : null,
+        options.outputLocation,
+    ];
+    if (options.verbose) {
+        console.log('Generated FFMPEG command:');
+        console.log(ffmpegArgs);
+    }
+    const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
+    const task = (0, execa_1.default)((_h = options.ffmpegExecutable) !== null && _h !== void 0 ? _h : 'ffmpeg', ffmpegString, {
+        cwd: options.dir,
+    });
+    (_j = options.cancelSignal) === null || _j === void 0 ? void 0 : _j.call(options, () => {
+        task.kill();
+    });
+    let ffmpegOutput = '';
+    let isFinished = false;
+    (_k = task.stderr) === null || _k === void 0 ? void 0 : _k.on('data', (data) => {
+        var _a;
+        const str = data.toString();
+        ffmpegOutput += str;
+        if (options.onProgress) {
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
+            // FFMPEG bug: In some cases, FFMPEG does hang after it is finished with it's job
+            // Example repo: https://github.com/JonnyBurger/ffmpeg-repro (access can be given upon request)
+            if (parsed !== undefined) {
+                // If two times in a row the finishing frame is logged, we quit the render
+                if (parsed === expectedFrames) {
+                    if (isFinished) {
+                        (_a = task.stdin) === null || _a === void 0 ? void 0 : _a.write('q');
+                    }
+                    else {
+                        isFinished = true;
+                    }
+                }
+                updateProgress(1, parsed);
+            }
+        }
+    });
+    return { task, getLogs: () => ffmpegOutput };
+};
+exports.spawnFfmpeg = spawnFfmpeg;
+const stitchFramesToGif = async (options) => {
+    const { task, getLogs } = await (0, exports.spawnFfmpeg)(options);
+    try {
+        await task;
+    }
+    catch (err) {
+        throw new Error(getLogs());
+    }
+};
+exports.stitchFramesToGif = stitchFramesToGif;

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

@@ -16,6 +16,7 @@ export declare type StitcherOptions = {
     proResProfile?: ProResProfile;
     verbose?: boolean;
     ffmpegExecutable?: FfmpegExecutable;
+    ffprobeExecutable?: FfmpegExecutable;
     dir?: string;
     cancelSignal?: CancelSignal;
     internalOptions?: {

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

@@ -25,7 +25,7 @@ const packageJsonPath = path_1.default.join(__dirname, '..', 'package.json');
 const packageJson = fs_1.default.existsSync(packageJsonPath)
     ? JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
-const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, onProgress, }) => {
+const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFrames, verbose, ffmpegExecutable, ffprobeExecutable, onProgress, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         downloadDir,
@@ -45,6 +45,7 @@ const getAssetsData = async ({ assets, downloadDir, onDownload, fps, expectedFra
         const filterFile = path_1.default.join(tempPath, `${index}.wav`);
         const result = await (0, preprocess_audio_track_1.preprocessAudioTrack)({
             ffmpegExecutable: ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null,
+            ffprobeExecutable: ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : null,
             outName: filterFile,
             asset,
             expectedFrames,
@@ -68,7 +69,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, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     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()`');
@@ -115,6 +116,7 @@ const spawnFfmpeg = async (options) => {
         expectedFrames,
         verbose: (_f = options.verbose) !== null && _f !== void 0 ? _f : false,
         ffmpegExecutable: (_g = options.ffmpegExecutable) !== null && _g !== void 0 ? _g : null,
+        ffprobeExecutable: (_h = options.ffprobeExecutable) !== null && _h !== void 0 ? _h : null,
         onProgress: (prog) => updateProgress(prog, 0),
     });
     if (isAudioOnly) {
@@ -126,14 +128,17 @@ const spawnFfmpeg = async (options) => {
             audio,
             '-c:a',
             audioCodecName,
+            // Set bitrate up to 320k, for aac it might effectively be lower
+            '-b:a',
+            '320k',
             options.force ? '-y' : null,
             options.outputLocation,
         ].filter(remotion_1.Internals.truthy));
-        (_h = options.cancelSignal) === null || _h === void 0 ? void 0 : _h.call(options, () => {
+        (_j = options.cancelSignal) === null || _j === void 0 ? void 0 : _j.call(options, () => {
             ffmpegTask.kill();
         });
         await ffmpegTask;
-        (_j = options.onProgress) === null || _j === void 0 ? void 0 : _j.call(options, expectedFrames);
+        (_k = options.onProgress) === null || _k === void 0 ? void 0 : _k.call(options, expectedFrames);
         return {
             getLogs: () => '',
             task: Promise.resolve(),
@@ -141,8 +146,8 @@ const spawnFfmpeg = async (options) => {
     }
     const ffmpegArgs = [
         ['-r', String(options.fps)],
-        ...(((_k = options.internalOptions) === null || _k === void 0 ? void 0 : _k.preEncodedFileLocation)
-            ? [['-i', (_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation]]
+        ...(((_l = options.internalOptions) === null || _l === void 0 ? void 0 : _l.preEncodedFileLocation)
+            ? [['-i', (_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation]]
             : [
                 ['-f', 'image2'],
                 ['-s', `${options.width}x${options.height}`],
@@ -153,7 +158,7 @@ const spawnFfmpeg = async (options) => {
         // -c:v is the same as -vcodec as -codec:video
         // and specified the video codec.
         ['-c:v', encoderName],
-        ...(((_m = options.internalOptions) === null || _m === void 0 ? void 0 : _m.preEncodedFileLocation)
+        ...(((_o = options.internalOptions) === null || _o === void 0 ? void 0 : _o.preEncodedFileLocation)
             ? []
             : [
                 proResProfileName ? ['-profile:v', proResProfileName] : null,
@@ -166,6 +171,8 @@ const spawnFfmpeg = async (options) => {
             ]),
         codec === 'h264' ? ['-movflags', 'faststart'] : null,
         audioCodecName ? ['-c:a', audioCodecName] : null,
+        // Set max bitrate up to 1024kbps, will choose lower if that's too much
+        audioCodecName ? ['-b:a', '512K'] : null,
         // Ignore metadata that may come from remote media
         ['-map_metadata', '-1'],
         [
@@ -181,15 +188,15 @@ const spawnFfmpeg = async (options) => {
         console.log(ffmpegArgs);
     }
     const ffmpegString = ffmpegArgs.flat(2).filter(Boolean);
-    const task = (0, execa_1.default)((_o = options.ffmpegExecutable) !== null && _o !== void 0 ? _o : 'ffmpeg', ffmpegString, {
+    const task = (0, execa_1.default)((_p = options.ffmpegExecutable) !== null && _p !== void 0 ? _p : 'ffmpeg', ffmpegString, {
         cwd: options.dir,
     });
-    (_p = options.cancelSignal) === null || _p === void 0 ? void 0 : _p.call(options, () => {
+    (_q = options.cancelSignal) === null || _q === void 0 ? void 0 : _q.call(options, () => {
         task.kill();
     });
     let ffmpegOutput = '';
     let isFinished = false;
-    (_q = task.stderr) === null || _q === void 0 ? void 0 : _q.on('data', (data) => {
+    (_r = task.stderr) === null || _r === void 0 ? void 0 : _r.on('data', (data) => {
         var _a;
         const str = data.toString();
         ffmpegOutput += str;

package/dist/validate-fps-for-gif.d.ts

@@ -0,0 +1,2 @@
+import { Codec } from 'remotion';
+export declare const validateFpsForGif: (codec: Codec, fps: number) => void;

package/dist/validate-fps-for-gif.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFpsForGif = void 0;
+const validateFpsForGif = (codec, fps) => {
+    if (codec === 'gif' && (fps > 50 || fps < 1)) {
+        throw new Error(`To render a GIF, the FPS must be less than or equal to 50 and greater than 0 but got ${fps} instead`);
+    }
+};
+exports.validateFpsForGif = validateFpsForGif;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.0.16",
+	"version": "3.0.19",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -21,9 +21,9 @@
 	},
 	"dependencies": {
 		"execa": "5.1.1",
+		"mime-types": "2.1.35",
 		"puppeteer-core": "13.5.1",
-		"remotion": "3.0.16",
-		"serve-handler": "6.1.3",
+		"remotion": "3.0.19",
 		"source-map": "^0.8.0-beta.0"
 	},
 	"peerDependencies": {
@@ -35,10 +35,10 @@
 		"@testing-library/dom": "^8.7.2",
 		"@testing-library/react": "13.1.1",
 		"@types/jest": "^27.4.0",
+		"@types/mime-types": "2.1.1",
 		"@types/node": "^16.7.5",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
-		"@types/serve-handler": "^6.1.0",
 		"eslint": "8.13.0",
 		"jest": "^27.2.4",
 		"prettier": "^2.0.5",
@@ -59,5 +59,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "9f09f61ae8fb65674d7dfbfc526a8f909d426519"
+	"gitHead": "388ef0a2eacf9dbadbc860fdb8d6b3e32acb10f3"
 }