@remotion/renderer 4.0.109 → 4.0.110

package/dist/combine-audio.d.ts

@@ -0,0 +1,16 @@
+import type { AudioCodec } from './audio-codec';
+import type { LogLevel } from './log-level';
+export declare const durationOf1Frame: number;
+export declare const getClosestAlignedTime: (targetTime: number) => number;
+export declare const createCombinedAudio: ({ seamless, filelistDir, files, indent, logLevel, audioBitrate, resolvedAudioCodec, output, chunkDurationInSeconds, addRemotionMetadata, }: {
+    seamless: boolean;
+    filelistDir: string;
+    files: string[];
+    indent: boolean;
+    logLevel: LogLevel;
+    audioBitrate: string | null;
+    resolvedAudioCodec: AudioCodec;
+    output: string;
+    chunkDurationInSeconds: number;
+    addRemotionMetadata: boolean;
+}) => Promise<string>;

package/dist/combine-audio.js

@@ -0,0 +1,162 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCombinedAudio = exports.getClosestAlignedTime = exports.durationOf1Frame = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const version_1 = require("remotion/version");
+const audio_codec_1 = require("./audio-codec");
+const call_ffmpeg_1 = require("./call-ffmpeg");
+const logger_1 = require("./logger");
+const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
+const sample_rate_1 = require("./sample-rate");
+const truthy_1 = require("./truthy");
+exports.durationOf1Frame = (1024 / sample_rate_1.DEFAULT_SAMPLE_RATE) * 1000000;
+const getClosestAlignedTime = (targetTime) => {
+    const decimalFramesToTargetTime = targetTime / exports.durationOf1Frame;
+    const nearestFrameIndexForTargetTime = Math.round(decimalFramesToTargetTime);
+    return nearestFrameIndexForTargetTime * exports.durationOf1Frame;
+};
+exports.getClosestAlignedTime = getClosestAlignedTime;
+const encodeAudio = async ({ files, resolvedAudioCodec, audioBitrate, filelistDir, output, indent, logLevel, addRemotionMetadata, }) => {
+    var _a;
+    const fileList = files.map((p) => `file '${p}'`).join('\n');
+    const fileListTxt = (0, path_1.join)(filelistDir, 'audio-files.txt');
+    (0, fs_1.writeFileSync)(fileListTxt, fileList);
+    const command = [
+        '-f',
+        'concat',
+        '-safe',
+        '0',
+        '-i',
+        fileListTxt,
+        '-c:a',
+        (0, audio_codec_1.mapAudioCodecToFfmpegAudioCodecName)(resolvedAudioCodec),
+        resolvedAudioCodec === 'aac' ? '-cutoff' : null,
+        resolvedAudioCodec === 'aac' ? '18000' : null,
+        '-b:a',
+        audioBitrate ? audioBitrate : '320k',
+        '-vn',
+        addRemotionMetadata ? `-metadata` : null,
+        addRemotionMetadata ? `comment=Made with Remotion ${version_1.VERSION}` : null,
+        '-y',
+        output,
+    ];
+    try {
+        const task = (0, call_ffmpeg_1.callFf)({
+            args: command,
+            bin: 'ffmpeg',
+            indent,
+            logLevel,
+        });
+        (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));
+            if (parsed === undefined) {
+                logger_1.Log.verbose({ indent, logLevel }, data.toString('utf8'));
+            }
+            else {
+                logger_1.Log.verbose({ indent, logLevel }, `Encoded ${parsed} audio frames`);
+            }
+        });
+        await task;
+        return output;
+    }
+    catch (e) {
+        (0, fs_1.rmSync)(filelistDir, { recursive: true });
+        throw e;
+    }
+};
+const combineAudioSeamlessly = async ({ files, filelistDir, indent, logLevel, output, chunkDurationInSeconds, addRemotionMetadata, }) => {
+    var _a;
+    const fileList = files
+        .map((p, i) => {
+        const isLast = i === files.length - 1;
+        const targetStart = i * chunkDurationInSeconds * 1000000;
+        const endStart = (i + 1) * chunkDurationInSeconds * 1000000;
+        const startTime = (0, exports.getClosestAlignedTime)(targetStart);
+        const endTime = (0, exports.getClosestAlignedTime)(endStart);
+        const realDuration = endTime - startTime;
+        let inpoint = 0;
+        if (i > 0) {
+            // Although we only asked for two frames of padding, ffmpeg will add an
+            // additional 2 frames of silence at the start of the segment. When we slice out
+            // our real data with inpoint and outpoint, we'll want remove both the silence
+            // and the extra frames we asked for.
+            inpoint = exports.durationOf1Frame * 4;
+        }
+        // inpoint is inclusive and outpoint is exclusive. To avoid overlap, we subtract
+        // the duration of one frame from the outpoint.
+        // we don't have to subtract a frame if this is the last segment.
+        const outpoint = (i === 0 ? exports.durationOf1Frame * 2 : inpoint) +
+            realDuration -
+            (isLast ? 0 : exports.durationOf1Frame);
+        return [`file '${p}'`, `inpoint ${inpoint}us`, `outpoint ${outpoint}us`]
+            .filter(truthy_1.truthy)
+            .join('\n');
+    })
+        .join('\n');
+    const fileListTxt = (0, path_1.join)(filelistDir, 'audio-files.txt');
+    (0, fs_1.writeFileSync)(fileListTxt, fileList);
+    const command = [
+        '-f',
+        'concat',
+        '-safe',
+        '0',
+        '-i',
+        fileListTxt,
+        '-c:a',
+        'copy',
+        '-vn',
+        addRemotionMetadata ? `-metadata` : null,
+        addRemotionMetadata ? `comment=Made with Remotion ${version_1.VERSION}` : null,
+        '-y',
+        output,
+    ];
+    try {
+        const task = (0, call_ffmpeg_1.callFf)({
+            args: command,
+            bin: 'ffmpeg',
+            indent,
+            logLevel,
+        });
+        (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));
+            if (parsed === undefined) {
+                logger_1.Log.verbose({ indent, logLevel }, data.toString('utf8'));
+            }
+            else {
+                logger_1.Log.verbose({ indent, logLevel }, `Encoded ${parsed} audio frames`);
+            }
+        });
+        await task;
+        return output;
+    }
+    catch (e) {
+        (0, fs_1.rmSync)(filelistDir, { recursive: true });
+        console.log(e);
+        throw e;
+    }
+};
+const createCombinedAudio = ({ seamless, filelistDir, files, indent, logLevel, audioBitrate, resolvedAudioCodec, output, chunkDurationInSeconds, addRemotionMetadata, }) => {
+    if (seamless) {
+        return combineAudioSeamlessly({
+            filelistDir,
+            files,
+            indent,
+            logLevel,
+            output,
+            chunkDurationInSeconds,
+            addRemotionMetadata,
+        });
+    }
+    return encodeAudio({
+        filelistDir,
+        files,
+        resolvedAudioCodec,
+        audioBitrate,
+        output,
+        indent,
+        logLevel,
+        addRemotionMetadata,
+    });
+};
+exports.createCombinedAudio = createCombinedAudio;

package/dist/combine-video-streams.d.ts

@@ -0,0 +1,14 @@
+import type { Codec } from './codec';
+import type { LogLevel } from './log-level';
+export declare const combineVideoStreams: ({ fps, codec, filelistDir, numberOfGifLoops, output, indent, logLevel, onProgress, files, addRemotionMetadata, }: {
+    fps: number;
+    codec: Codec;
+    filelistDir: string;
+    numberOfGifLoops: number | null;
+    output: string;
+    indent: boolean;
+    logLevel: LogLevel;
+    onProgress: (p: number) => void;
+    files: string[];
+    addRemotionMetadata: boolean;
+}) => Promise<string>;

package/dist/combine-video-streams.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.combineVideoStreams = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const version_1 = require("remotion/version");
+const call_ffmpeg_1 = require("./call-ffmpeg");
+const convert_number_of_gif_loops_to_ffmpeg_1 = require("./convert-number-of-gif-loops-to-ffmpeg");
+const logger_1 = require("./logger");
+const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
+const truthy_1 = require("./truthy");
+const combineVideoStreams = async ({ fps, codec, filelistDir, numberOfGifLoops, output, indent, logLevel, onProgress, files, addRemotionMetadata, }) => {
+    var _a;
+    const fileList = files.map((p) => `file '${p}'`).join('\n');
+    const fileListTxt = (0, path_1.join)(filelistDir, 'video-files.txt');
+    (0, fs_1.writeFileSync)(fileListTxt, fileList);
+    const command = [
+        '-r',
+        String(fps),
+        '-f',
+        'concat',
+        '-safe',
+        '0',
+        '-i',
+        fileListTxt,
+        numberOfGifLoops === null ? null : '-loop',
+        numberOfGifLoops === null
+            ? null
+            : (0, convert_number_of_gif_loops_to_ffmpeg_1.convertNumberOfGifLoopsToFfmpegSyntax)(numberOfGifLoops),
+        '-an',
+        '-c:v',
+        codec === 'gif' ? 'gif' : 'copy',
+        codec === 'h264' ? '-movflags' : null,
+        codec === 'h264' ? 'faststart' : null,
+        addRemotionMetadata ? `-metadata` : null,
+        addRemotionMetadata ? `comment=Made with Remotion ${version_1.VERSION}` : null,
+        '-y',
+        output,
+    ].filter(truthy_1.truthy);
+    try {
+        const task = (0, call_ffmpeg_1.callFf)({
+            args: command,
+            bin: 'ffmpeg',
+            indent,
+            logLevel,
+        });
+        (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));
+            if (parsed === undefined) {
+                logger_1.Log.verbose({ indent, logLevel }, data.toString('utf8'));
+            }
+            else {
+                logger_1.Log.verbose({ indent, logLevel }, `Encoded ${parsed} video frames`);
+                onProgress(parsed);
+            }
+        });
+        await task;
+        return output;
+    }
+    catch (e) {
+        (0, fs_1.rmSync)(filelistDir, { recursive: true });
+        throw e;
+    }
+};
+exports.combineVideoStreams = combineVideoStreams;

package/dist/combine-videos.js

@@ -59,7 +59,7 @@ const combineVideos = async (options) => {
         });
         (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
             if (onProgress) {
-                const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));
+                const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'), fps);
                 if (parsed === undefined) {
                     logger_1.Log.verbose({ indent, logLevel }, data.toString('utf8'));
                 }

package/dist/mux-video-and-audio.d.ts

@@ -0,0 +1,9 @@
+import type { LogLevel } from './log-level';
+export declare const muxVideoAndAudio: ({ videoOutput, audioOutput, output, indent, logLevel, onProgress, }: {
+    videoOutput: string;
+    audioOutput: string;
+    output: string;
+    indent: boolean;
+    logLevel: LogLevel;
+    onProgress: (p: number) => void;
+}) => Promise<void>;

package/dist/mux-video-and-audio.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.muxVideoAndAudio = void 0;
+const version_1 = require("remotion/version");
+const call_ffmpeg_1 = require("./call-ffmpeg");
+const logger_1 = require("./logger");
+const parse_ffmpeg_progress_1 = require("./parse-ffmpeg-progress");
+const truthy_1 = require("./truthy");
+const muxVideoAndAudio = async ({ videoOutput, audioOutput, output, indent, logLevel, onProgress, }) => {
+    var _a;
+    const command = [
+        '-i',
+        videoOutput,
+        '-i',
+        audioOutput,
+        '-c:v',
+        'copy',
+        '-c:a',
+        'copy',
+        `-metadata`,
+        `comment=Made with Remotion ${version_1.VERSION}`,
+        '-y',
+        output,
+    ].filter(truthy_1.truthy);
+    logger_1.Log.verbose({ indent, logLevel }, 'Combining command: ', command);
+    const task = (0, call_ffmpeg_1.callFf)({
+        bin: 'ffmpeg',
+        args: command,
+        indent,
+        logLevel,
+    });
+    (_a = task.stderr) === null || _a === void 0 ? void 0 : _a.on('data', (data) => {
+        const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(data.toString('utf8'));
+        if (parsed === undefined) {
+            logger_1.Log.verbose({ indent, logLevel }, data.toString('utf8'));
+        }
+        else {
+            logger_1.Log.verbose({ indent, logLevel }, `Combined ${parsed} frames`);
+            onProgress(parsed);
+        }
+    });
+    await task;
+};
+exports.muxVideoAndAudio = muxVideoAndAudio;

package/dist/options/prefer-lossless.d.ts

@@ -0,0 +1,8 @@
+export declare const preferLossless: {
+    name: string;
+    cliFlag: "prefer-lossless";
+    description: () => string;
+    docLink: string;
+    type: boolean;
+    ssrName: "preferLossless";
+};

package/dist/options/prefer-lossless.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preferLossless = void 0;
+exports.preferLossless = {
+    name: 'Prefer lossless',
+    cliFlag: 'prefer-lossless',
+    description: () => 'Uses a lossless audio codec, if one is available for the codec. If you set audioCodec, it takes priority over preferLossless.',
+    docLink: 'https://www.remotion.dev/docs/encoding',
+    type: false,
+    ssrName: 'preferLossless',
+};

package/dist/parse-ffmpeg-progress.d.ts

@@ -1 +1 @@
-export declare const parseFfmpegProgress: (input: string) => number | undefined;
+export declare const parseFfmpegProgress: (input: string, fps: number) => number | undefined;

package/dist/parse-ffmpeg-progress.js

@@ -1,11 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseFfmpegProgress = void 0;
-const parseFfmpegProgress = (input) => {
+const parseFfmpegProgress = (input, fps) => {
     const match = input.match(/frame=(\s+)?([0-9]+)\s/);
-    if (!match) {
-        return undefined;
+    if (match) {
+        return Number(match[2]);
+    }
+    const match2 = input.match(/time=(\d+):(\d+):(\d+).(\d+)\s/);
+    if (match2) {
+        const [, hours, minutes, seconds, hundreds] = match2;
+        return ((Number(hundreds) / 100) * fps +
+            Number(seconds) * fps +
+            Number(minutes) * fps * 60 +
+            Number(hours) * fps * 60 * 60);
     }
-    return Number(match[2]);
 };
 exports.parseFfmpegProgress = parseFfmpegProgress;

package/dist/prespawn-ffmpeg.js

@@ -79,7 +79,7 @@ const prespawnFfmpeg = (options) => {
         const str = data.toString();
         ffmpegOutput += str;
         if (options.onProgress) {
-            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str, options.fps);
             if (parsed !== undefined) {
                 options.onProgress(parsed);
             }

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

@@ -284,7 +284,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
         const str = data.toString();
         ffmpegStderr += str;
         if (onProgress) {
-            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str);
+            const parsed = (0, parse_ffmpeg_progress_1.parseFfmpegProgress)(str, fps);
             // 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.0.109",
+  "version": "4.0.110",
   "description": "Renderer for Remotion",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "extract-zip": "2.0.1",
     "source-map": "^0.8.0-beta.0",
     "ws": "8.7.0",
-    "remotion": "4.0.109"
+    "remotion": "4.0.110"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -40,13 +40,13 @@
     "vitest": "0.31.1"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.0.109",
-    "@remotion/compositor-darwin-x64": "4.0.109",
-    "@remotion/compositor-linux-arm64-gnu": "4.0.109",
-    "@remotion/compositor-linux-arm64-musl": "4.0.109",
-    "@remotion/compositor-linux-x64-gnu": "4.0.109",
-    "@remotion/compositor-linux-x64-musl": "4.0.109",
-    "@remotion/compositor-win32-x64-msvc": "4.0.109"
+    "@remotion/compositor-darwin-arm64": "4.0.110",
+    "@remotion/compositor-linux-arm64-gnu": "4.0.110",
+    "@remotion/compositor-darwin-x64": "4.0.110",
+    "@remotion/compositor-linux-x64-gnu": "4.0.110",
+    "@remotion/compositor-linux-x64-musl": "4.0.110",
+    "@remotion/compositor-win32-x64-msvc": "4.0.110",
+    "@remotion/compositor-linux-arm64-musl": "4.0.110"
   },
   "keywords": [
     "remotion",