@remotion/renderer 3.2.1 → 3.2.4

package/dist/assets/get-video-stream-duration.d.ts

@@ -1,3 +1,4 @@
 import type { FfmpegExecutable } from '../ffmpeg-executable';
 import type { DownloadMap, VideoDurationResult } from './download-map';
+export declare const parseVideoStreamDuration: (stdout: string) => VideoDurationResult;
 export declare const getVideoStreamDuration: (downloadMap: DownloadMap, src: string, ffprobeExecutable: FfmpegExecutable) => Promise<VideoDurationResult>;

package/dist/assets/get-video-stream-duration.js

@@ -3,10 +3,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVideoStreamDuration = void 0;
+exports.getVideoStreamDuration = exports.parseVideoStreamDuration = void 0;
 const execa_1 = __importDefault(require("execa"));
 const p_limit_1 = require("../p-limit");
 const limit = (0, p_limit_1.pLimit)(1);
+const parseAlternativeDuration = (stdout) => {
+    const webmDuration = stdout.match(/TAG:DURATION=([0-9.]+):([0-9.]+):([0-9.]+)/);
+    if (!webmDuration) {
+        return null;
+    }
+    const [, hours, minutes, seconds] = webmDuration;
+    const hoursAsNumber = Number(hours);
+    if (Number.isNaN(hoursAsNumber)) {
+        return null;
+    }
+    const minutesAsNumber = Number(minutes);
+    if (Number.isNaN(minutesAsNumber)) {
+        return null;
+    }
+    const secondsAsNumber = Number(seconds);
+    if (Number.isNaN(secondsAsNumber)) {
+        return null;
+    }
+    return secondsAsNumber + minutesAsNumber * 60 + hoursAsNumber * 3600;
+};
+const parseVideoStreamDuration = (stdout) => {
+    const duration = stdout.match(/duration=([0-9.]+)/);
+    const alternativeDuration = parseAlternativeDuration(stdout);
+    const fps = stdout.match(/r_frame_rate=([0-9.]+)\/([0-9.]+)/);
+    const result = {
+        duration: duration ? parseFloat(duration[1]) : alternativeDuration,
+        fps: fps ? parseInt(fps[1], 10) / parseInt(fps[2], 10) : null,
+    };
+    return result;
+};
+exports.parseVideoStreamDuration = parseVideoStreamDuration;
 async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable) {
     if (downloadMap.videoDurationResultCache[src]) {
         return downloadMap.videoDurationResultCache[src];
@@ -14,20 +45,13 @@ async function getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutab
     const args = [
         ['-v', 'error'],
         ['-select_streams', 'v:0'],
-        ['-show_entries', 'stream=duration,r_frame_rate'],
+        ['-show_entries', 'stream'],
         [src],
     ]
         .reduce((acc, val) => acc.concat(val), [])
         .filter(Boolean);
     const task = await (0, execa_1.default)(ffprobeExecutable !== null && ffprobeExecutable !== void 0 ? ffprobeExecutable : 'ffprobe', args);
-    const duration = task.stdout.match(/duration=([0-9.]+)/);
-    const fps = task.stdout.match(/r_frame_rate=([0-9.]+)\/([0-9.]+)/);
-    const result = {
-        duration: duration ? parseFloat(duration[1]) : null,
-        fps: fps ? parseInt(fps[1], 10) / parseInt(fps[2], 10) : null,
-    };
-    downloadMap.videoDurationResultCache[src] = result;
-    return result;
+    return (0, exports.parseVideoStreamDuration)(task.stdout);
 }
 const getVideoStreamDuration = (downloadMap, src, ffprobeExecutable) => {
     return limit(() => getVideoStreamDurationUnlimited(downloadMap, src, ffprobeExecutable));

package/dist/captions-to-ffmpeg-inputs.d.ts

@@ -0,0 +1,10 @@
+import type { TCaption } from 'remotion';
+interface CaptionFfmpegInputs {
+    captionFilters: string[];
+    captionInputs: [string, string][];
+}
+export declare const captionsToFfmpegInputs: ({ assetsCount, captions, }: {
+    assetsCount: number;
+    captions: TCaption[][];
+}) => CaptionFfmpegInputs;
+export {};

package/dist/captions-to-ffmpeg-inputs.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.captionsToFfmpegInputs = void 0;
+const captionsToFfmpegInputs = ({ assetsCount, captions, }) => {
+    const uniqueCaptions = Object.values(captions.flat(1).reduce((acc, caption) => {
+        acc[caption.id] = caption;
+        return acc;
+    }, {}));
+    /**
+     * TODO: Support more formats.
+     * `mov_text` works for SRT.
+     */
+    const getFilter = ({ language, title }, index) => {
+        return ['-map', `${assetsCount + 1 + index}:s`, '-c:s', 'mov_text'].concat(language ? [`-metadata:s:s:${index}`, `language=${language}`] : '', title ? [`-metadata:s:s:${index}`, `title=${title}`] : '');
+    };
+    return {
+        captionInputs: uniqueCaptions.map((caption) => ['-i', caption.src]),
+        captionFilters: uniqueCaptions.reduce((acc, caption, i) => acc.concat(getFilter(caption, i)), []),
+    };
+};
+exports.captionsToFfmpegInputs = captionsToFfmpegInputs;

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/get-extension-from-codec.d.ts

@@ -1,2 +1,2 @@
 import type { Codec } from './codec';
-export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "mp4" | "mkv" | "mov" | "webm";
+export declare const getFileExtensionFromCodec: (codec: Codec, type: 'chunk' | 'final') => "mp3" | "aac" | "wav" | "gif" | "webm" | "mp4" | "mov" | "mkv";

package/dist/guess-extension-for-media.d.ts

@@ -1 +1 @@
-export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "mp4" | "webm">;
+export declare const guessExtensionForVideo: (src: string) => Promise<"mp3" | "wav" | "webm" | "mp4">;

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import execa from 'execa';
 import { SymbolicateableError } from './error-handling/symbolicateable-error';
 import { mimeContentType, mimeLookup } from './mime-types';
@@ -137,7 +136,7 @@ export declare const RenderInternals: {
     getValidCrfRanges: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => [number, number];
     validateSelectedPixelFormatAndCodecCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif") => void;
     validateSelectedCodecAndProResCombination: (actualCodec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif", actualProResProfile: "4444-xq" | "4444" | "hq" | "standard" | "light" | "proxy" | undefined) => void;
-    validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "none" | "png" | "jpeg") => "none" | "valid";
+    validateSelectedPixelFormatAndImageFormatCombination: (pixelFormat: "yuv420p" | "yuva420p" | "yuv422p" | "yuv444p" | "yuv420p10le" | "yuv422p10le" | "yuv444p10le" | "yuva444p10le", imageFormat: "png" | "jpeg" | "none") => "none" | "valid";
     DEFAULT_CODEC: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif";
     isAudioCodec: (codec: "h264" | "h265" | "vp8" | "vp9" | "mp3" | "aac" | "wav" | "prores" | "h264-mkv" | "gif" | undefined) => boolean;
     logLevels: readonly ["verbose", "info", "warn", "error"];

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { OffthreadVideoImageFormat } from 'remotion';
 import type { DownloadMap, SpecialVCodecForTransparency } from './assets/download-map';
 import type { FfmpegExecutable } from './ffmpeg-executable';

package/dist/merge-audio-track.js

@@ -70,7 +70,8 @@ const mergeAudioTrackUnlimited = async ({ ffmpegExecutable, outName, files, numb
     await task;
     cleanup();
 };
-const limit = (0, p_limit_1.pLimit)(2);
+// Must be at least 3 because recursively called twice in mergeAudioTrack
+const limit = (0, p_limit_1.pLimit)(3);
 const mergeAudioTrack = (options) => {
     return limit(mergeAudioTrackUnlimited, options);
 };

package/dist/render-media.d.ts

@@ -64,4 +64,4 @@ export declare type RenderMediaOptions = {
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ...options }: RenderMediaOptions) => Promise<Buffer | null>;
+export declare const renderMedia: ({ parallelism, proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ...options }: RenderMediaOptions) => Promise<Buffer | null>;

package/dist/render-media.js

@@ -19,6 +19,7 @@ const get_duration_from_frame_range_1 = require("./get-duration-from-frame-range
 const get_extension_from_codec_1 = require("./get-extension-from-codec");
 const get_extension_of_filename_1 = require("./get-extension-of-filename");
 const get_frame_to_render_1 = require("./get-frame-to-render");
+const is_audio_codec_1 = require("./is-audio-codec");
 const legacy_webpack_config_1 = require("./legacy-webpack-config");
 const make_cancel_signal_1 = require("./make-cancel-signal");
 const overwrite_1 = require("./overwrite");
@@ -36,9 +37,9 @@ const validate_scale_1 = require("./validate-scale");
  * @description Render a video from a composition
  * @link https://www.remotion.dev/docs/renderer/render-media
  */
-const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, quality, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ...options }) => {
-    var _a, _b, _c;
-    (0, quality_1.validateQuality)(quality);
+const renderMedia = ({ parallelism, proResProfile, crf, composition, ffmpegExecutable, ffprobeExecutable, inputProps, pixelFormat, codec, envVariables, frameRange, puppeteerInstance, outputLocation, onProgress, overwrite, onDownload, dumpBrowserLogs, onBrowserLog, onStart, timeoutInMilliseconds, chromiumOptions, scale, browserExecutable, port, cancelSignal, muted, enforceAudioTrack, ...options }) => {
+    var _a, _b, _c, _d;
+    (0, quality_1.validateQuality)(options.quality);
     if (typeof crf !== 'undefined' && crf !== null) {
         (0, crf_1.validateSelectedCrfAndCodecCombination)(crf, codec);
     }
@@ -74,7 +75,10 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
             console.log('[PRESTITCHER] Parallel encoding is disabled.');
         }
     }
-    const actualImageFormat = imageFormat !== null && imageFormat !== void 0 ? imageFormat : 'jpeg';
+    const imageFormat = (0, is_audio_codec_1.isAudioCodec)(codec)
+        ? 'none'
+        : (_d = options.imageFormat) !== null && _d !== void 0 ? _d : 'jpeg';
+    const quality = imageFormat === 'jpeg' ? options.quality : undefined;
     const preEncodedFileLocation = parallelEncoding
         ? path_1.default.join(downloadMap.preEncode, 'pre-encode.' + (0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, 'chunk'))
         : null;
@@ -124,7 +128,7 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
                 },
                 verbose: (_a = options.verbose) !== null && _a !== void 0 ? _a : false,
                 ffmpegExecutable,
-                imageFormat: actualImageFormat,
+                imageFormat,
                 signal: cancelPrestitcher.cancelSignal,
             });
             stitcherFfmpeg = preStitcher.task;
@@ -162,7 +166,7 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
             },
             inputProps,
             envVariables,
-            imageFormat: actualImageFormat,
+            imageFormat,
             quality,
             frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
             puppeteerInstance,
@@ -215,7 +219,7 @@ const renderMedia = ({ parallelism, proResProfile, crf, composition, imageFormat
                 outputLocation,
                 internalOptions: {
                     preEncodedFileLocation,
-                    imageFormat: actualImageFormat,
+                    imageFormat,
                 },
                 force: overwrite !== null && overwrite !== void 0 ? overwrite : overwrite_1.DEFAULT_OVERWRITE,
                 pixelFormat,

package/dist/serve-static.js

@@ -19,6 +19,7 @@ const serveStatic = async (path, options) => {
         downloadMap: options.downloadMap,
     });
     try {
+        const connections = {};
         const server = http_1.default
             .createServer((request, response) => {
             var _a;
@@ -38,8 +39,20 @@ const serveStatic = async (path, options) => {
             });
         })
             .listen(port);
+        server.on('connection', (conn) => {
+            const key = conn.remoteAddress + ':' + conn.remotePort;
+            connections[key] = conn;
+            conn.on('close', () => {
+                delete connections[key];
+            });
+        });
+        const destroyConnections = function () {
+            for (const key in connections)
+                connections[key].destroy();
+        };
         const close = () => {
             return new Promise((resolve, reject) => {
+                destroyConnections();
                 server.close((err) => {
                     if (err) {
                         if (err.code === 'ERR_SERVER_NOT_RUNNING') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remotion/renderer",
-	"version": "3.2.1",
+	"version": "3.2.4",
 	"description": "Renderer for Remotion",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
 	"dependencies": {
 		"execa": "5.1.1",
 		"extract-zip": "2.0.1",
-		"remotion": "3.2.1",
+		"remotion": "3.2.4",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "0c4f0e1fdd423b882bf3dbc48b50037f9d5251c8"
+	"gitHead": "ee420b99227e0e5bcf093c108e3695f5d46e3658"
 }