@remotion/renderer 4.1.0-alpha3 → 4.1.0-alpha4

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

@@ -59,7 +59,7 @@ const packageJsonPath = node_path_1.default.join(__dirname, '..', 'package.json'
 const packageJson = node_fs_1.default.existsSync(packageJsonPath)
     ? JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, 'utf-8'))
     : null;
-const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose, onProgress, downloadMap, remotionRoot, indent, }) => {
+const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, logLevel, onProgress, downloadMap, remotionRoot, indent, }) => {
     const fileUrlAssets = await (0, convert_assets_to_file_urls_1.convertAssetsToFileUrls)({
         assets,
         onDownload: onDownload !== null && onDownload !== void 0 ? onDownload : (() => () => undefined),
@@ -67,7 +67,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     });
     (0, download_and_map_assets_to_file_1.markAllAssetsAsDownloaded)(downloadMap);
     const assetPositions = (0, calculate_asset_positions_1.calculateAssetPositions)(fileUrlAssets);
-    logger_1.Log.verboseAdvanced({ indent, logLevel: verbose ? 'verbose' : 'info', tag: 'audio' }, 'asset positions', JSON.stringify(assetPositions));
+    logger_1.Log.verboseAdvanced({ indent, logLevel, tag: 'audio' }, 'asset positions', JSON.stringify(assetPositions));
     const preprocessProgress = new Array(assetPositions.length).fill(0);
     const updateProgress = () => {
         onProgress(preprocessProgress.reduce((a, b) => a + b, 0) / assetPositions.length);
@@ -100,7 +100,7 @@ const getAssetsData = async ({ assets, onDownload, fps, expectedFrames, verbose,
     });
     return outName;
 };
-const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, verbose, videoBitrate, width, numberOfGifLoops, onProgress, }, remotionRoot) => {
+const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec, cancelSignal, codec, crf, dir, enforceAudioTrack, ffmpegOverride, force, fps, height, indent, muted, onDownload, outputLocation, pixelFormat, preEncodedFileLocation, preferLossless, proResProfile, logLevel, videoBitrate, width, numberOfGifLoops, onProgress, }, remotionRoot) => {
     var _a;
     remotion_1.Internals.validateDimension(height, 'height', 'passed to `stitchFramesToVideo()`');
     remotion_1.Internals.validateDimension(width, 'width', 'passed to `stitchFramesToVideo()`');
@@ -136,39 +136,29 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
         : node_path_1.default.join(assetsInfo.downloadMap.stitchFrames, `out.${(0, get_extension_from_codec_1.getFileExtensionFromCodec)(codec, resolvedAudioCodec)}`);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
-        tag: 'stitchFramesToVideo()',
-    }, 'encoder', encoderName);
-    logger_1.Log.verboseAdvanced({
-        indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, 'audioCodec', resolvedAudioCodec);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, 'pixelFormat', pixelFormat);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, 'codec', codec);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, 'shouldRenderAudio', shouldRenderAudio);
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, 'shouldRenderVideo', shouldRenderVideo);
-    logger_1.Log.verboseAdvanced({
-        indent,
-        logLevel: verbose ? 'verbose' : 'info',
-        tag: 'stitchFramesToVideo()',
-    }, 'proResProfileName', proResProfileName);
     (0, crf_1.validateQualitySettings)({
         crf,
         codec,
@@ -186,7 +176,7 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
             onDownload,
             fps,
             expectedFrames,
-            verbose,
+            logLevel,
             onProgress: (prog) => updateProgress(prog, 0),
             downloadMap: assetsInfo.downloadMap,
             remotionRoot,
@@ -288,12 +278,12 @@ const innerStitchFramesToVideo = async ({ assetsInfo, audioBitrate, audioCodec,
         : ffmpegString;
     logger_1.Log.verboseAdvanced({
         indent: indent !== null && indent !== void 0 ? indent : false,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, 'Generated final FFMPEG command:');
     logger_1.Log.verboseAdvanced({
         indent,
-        logLevel: verbose ? 'verbose' : 'info',
+        logLevel,
         tag: 'stitchFramesToVideo()',
     }, finalFfmpegString.join(' '));
     const task = (0, call_ffmpeg_1.callFf)('ffmpeg', finalFfmpegString, {
@@ -391,7 +381,7 @@ const stitchFramesToVideo = ({ assetsInfo, force, fps, height, width, audioBitra
         outputLocation: outputLocation !== null && outputLocation !== void 0 ? outputLocation : null,
         pixelFormat: pixelFormat !== null && pixelFormat !== void 0 ? pixelFormat : pixel_format_1.DEFAULT_PIXEL_FORMAT,
         proResProfile,
-        verbose: verbose !== null && verbose !== void 0 ? verbose : false,
+        logLevel: verbose ? 'verbose' : 'info',
         videoBitrate: videoBitrate !== null && videoBitrate !== void 0 ? videoBitrate : null,
         width,
         preEncodedFileLocation: null,

package/dist/try-to-extract-frame-of-video-fast.d.ts

@@ -0,0 +1,12 @@
+import type { OffthreadVideoImageFormat } from 'remotion';
+import type { NeedsResize, SpecialVCodecForTransparency } from './assets/download-map';
+import type { FfmpegExecutable } from './ffmpeg-executable';
+export declare const tryToExtractFrameOfVideoFast: ({ ffmpegExecutable, remotionRoot, specialVCodecForTransparency, imageFormat, needsResize, src, actualOffset, }: {
+    ffmpegExecutable: FfmpegExecutable;
+    remotionRoot: string;
+    imageFormat: OffthreadVideoImageFormat;
+    needsResize: NeedsResize;
+    src: string;
+    specialVCodecForTransparency: SpecialVCodecForTransparency;
+    actualOffset: string;
+}) => Promise<readonly [string, Buffer]>;

package/dist/try-to-extract-frame-of-video-fast.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tryToExtractFrameOfVideoFast = void 0;
+const execa_1 = __importDefault(require("execa"));
+const determine_resize_params_1 = require("./determine-resize-params");
+const determine_vcodec_ffmpeg_flags_1 = require("./determine-vcodec-ffmpeg-flags");
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const truthy_1 = require("./truthy");
+const tryToExtractFrameOfVideoFast = async ({ ffmpegExecutable, remotionRoot, specialVCodecForTransparency, imageFormat, needsResize, src, actualOffset, }) => {
+    const { stdout, stderr } = (0, execa_1.default)(await (0, ffmpeg_flags_1.getExecutableBinary)(ffmpegExecutable, remotionRoot, 'ffmpeg'), [
+        '-ss',
+        actualOffset,
+        ...(0, determine_vcodec_ffmpeg_flags_1.determineVcodecFfmpegFlags)(specialVCodecForTransparency),
+        '-i',
+        src,
+        '-frames:v',
+        '1',
+        '-c:v',
+        imageFormat === 'jpeg' ? 'mjpeg' : 'png',
+        '-f',
+        'image2pipe',
+        ...(0, determine_resize_params_1.determineResizeParams)(needsResize),
+        '-',
+    ].filter(truthy_1.truthy));
+    if (!stderr) {
+        throw new Error('unexpectedly did not get stderr');
+    }
+    if (!stdout) {
+        throw new Error('unexpectedly did not get stdout');
+    }
+    const stderrChunks = [];
+    const stdoutChunks = [];
+    const stdErrString = new Promise((resolve, reject) => {
+        stderr.on('data', (d) => stderrChunks.push(d));
+        stderr.on('error', (err) => reject(err));
+        stderr.on('end', () => resolve(Buffer.concat(stderrChunks).toString('utf-8')));
+    });
+    const stdoutChunk = new Promise((resolve, reject) => {
+        stdout.on('data', (d) => {
+            stdoutChunks.push(d);
+        });
+        stdout.on('error', (err) => {
+            reject(err);
+        });
+        stdout.on('end', () => {
+            resolve(Buffer.concat(stdoutChunks));
+        });
+    });
+    const [stdErr, stdoutBuffer] = await Promise.all([stdErrString, stdoutChunk]);
+    return [stdErr, stdoutBuffer];
+};
+exports.tryToExtractFrameOfVideoFast = tryToExtractFrameOfVideoFast;

package/dist/validate-ffmpeg.d.ts

@@ -0,0 +1,7 @@
+export declare const customExecutableExists: (localExecutable: string) => boolean;
+export declare const binaryExists: (name: 'ffmpeg' | 'ffprobe') => boolean;
+export declare const checkAndValidateFfmpegVersion: (options: {
+    ffmpegExecutable: string | null;
+    remotionRoot: string;
+}) => Promise<void>;
+export declare const validateFfmpeg: (customFfmpegBinary: string | null, remotionRoot: string, binary: 'ffmpeg' | 'ffprobe') => Promise<void>;

package/dist/validate-ffmpeg.js

@@ -0,0 +1,77 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFfmpeg = exports.checkAndValidateFfmpegVersion = exports.binaryExists = exports.customExecutableExists = void 0;
+const execa_1 = __importDefault(require("execa"));
+const fs_1 = require("fs");
+const os_1 = __importDefault(require("os"));
+const ffmpeg_flags_1 = require("./ffmpeg-flags");
+const warn_about_ffmpeg_version_1 = require("./warn-about-ffmpeg-version");
+const existsMap = {};
+const customExecutableExists = (localExecutable) => {
+    try {
+        (0, fs_1.statSync)(localExecutable);
+        existsMap[localExecutable] = true;
+    }
+    catch (err) {
+        existsMap[localExecutable] = false;
+    }
+    return existsMap[localExecutable];
+};
+exports.customExecutableExists = customExecutableExists;
+const binaryExists = (name) => {
+    if (typeof existsMap[name] !== 'undefined') {
+        return existsMap[name];
+    }
+    const isWin = os_1.default.platform() === 'win32';
+    const where = isWin ? 'where' : 'which';
+    try {
+        execa_1.default.sync(where, [name]);
+        existsMap[name] = true;
+        return true;
+    }
+    catch (err) {
+        existsMap[name] = false;
+        return false;
+    }
+};
+exports.binaryExists = binaryExists;
+const checkAndValidateFfmpegVersion = async (options) => {
+    const ffmpegVersion = await (0, ffmpeg_flags_1.getFfmpegVersion)({
+        ffmpegExecutable: options.ffmpegExecutable,
+        remotionRoot: options.remotionRoot,
+    });
+    const buildConf = await (0, ffmpeg_flags_1.getFfmpegBuildInfo)({
+        ffmpegExecutable: options.ffmpegExecutable,
+        remotionRoot: options.remotionRoot,
+    });
+    (0, warn_about_ffmpeg_version_1.warnAboutFfmpegVersion)({ ffmpegVersion, buildConf });
+};
+exports.checkAndValidateFfmpegVersion = checkAndValidateFfmpegVersion;
+const validateFfmpeg = async (customFfmpegBinary, remotionRoot, binary) => {
+    const ffmpegExists = (0, exports.binaryExists)(binary);
+    if (ffmpegExists) {
+        return;
+    }
+    if (customFfmpegBinary) {
+        if (!(0, exports.customExecutableExists)(customFfmpegBinary)) {
+            throw new Error('Custom FFmpeg executable not found: ' + customFfmpegBinary);
+        }
+        return;
+    }
+    if (process.platform === 'linux' && (0, fs_1.existsSync)(ffmpeg_flags_1.lambdaFfmpegPaths[binary])) {
+        return;
+    }
+    if ((0, ffmpeg_flags_1.ffmpegInNodeModules)(remotionRoot, binary)) {
+        return;
+    }
+    const binaryUrl = (0, ffmpeg_flags_1.getBinaryDownloadUrl)(binary);
+    if (binaryUrl) {
+        await (0, ffmpeg_flags_1.downloadBinary)(remotionRoot, binaryUrl.url, binary);
+        return (0, exports.validateFfmpeg)(customFfmpegBinary, remotionRoot, binary);
+    }
+    throw new Error(`${binary} could not be installed automatically. Your architecture and OS combination (os = ${os_1.default.platform()}, arch = ${process.arch}) is not supported. Please install ${binary} manually and add "${binary}" to your PATH.`);
+};
+exports.validateFfmpeg = validateFfmpeg;

package/dist/warn-about-ffmpeg-version.d.ts

@@ -0,0 +1,5 @@
+import type { FfmpegVersion } from './ffmpeg-flags';
+export declare const warnAboutFfmpegVersion: ({ ffmpegVersion, buildConf, }: {
+    ffmpegVersion: FfmpegVersion;
+    buildConf: string | null;
+}) => null | undefined;

package/dist/warn-about-ffmpeg-version.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.warnAboutFfmpegVersion = void 0;
+const printMessage = (ffmpegVersion) => {
+    console.warn('⚠️Old FFMPEG version detected: ' + ffmpegVersion.join('.'));
+    console.warn('   For audio support, you need at least version 4.1.0.');
+    console.warn('   Upgrade FFMPEG to get rid of this warning.');
+};
+const printBuildConfMessage = () => {
+    console.error('⚠️  Unsupported FFMPEG version detected.');
+    console.error("   Your version doesn't support the -buildconf flag");
+    console.error('   Audio will not be supported and you may experience other issues.');
+    console.error('   Upgrade FFMPEG to at least v4.1.0 to get rid of this warning.');
+};
+const warnAboutFfmpegVersion = ({ ffmpegVersion, buildConf, }) => {
+    if (buildConf === null) {
+        printBuildConfMessage();
+        return;
+    }
+    if (ffmpegVersion === null) {
+        return null;
+    }
+    const [major, minor] = ffmpegVersion;
+    // 3.x and below definitely is too old
+    if (major < 4) {
+        printMessage(ffmpegVersion);
+        return;
+    }
+    // 5.x will be all good
+    if (major > 4) {
+        return;
+    }
+    if (minor < 1) {
+        printMessage(ffmpegVersion);
+    }
+};
+exports.warnAboutFfmpegVersion = warnAboutFfmpegVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remotion/renderer",
-  "version": "4.1.0-alpha3",
+  "version": "4.1.0-alpha4",
   "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.1.0-alpha3"
+    "remotion": "4.1.0-alpha4"
   },
   "peerDependencies": {
     "react": ">=16.8.0",
@@ -42,13 +42,13 @@
     "zod": "^3.21.4"
   },
   "optionalDependencies": {
-    "@remotion/compositor-darwin-arm64": "4.1.0-alpha3",
-    "@remotion/compositor-linux-x64-musl": "4.1.0-alpha3",
-    "@remotion/compositor-linux-arm64-gnu": "4.1.0-alpha3",
-    "@remotion/compositor-win32-x64-msvc": "4.1.0-alpha3",
-    "@remotion/compositor-darwin-x64": "4.1.0-alpha3",
-    "@remotion/compositor-linux-arm64-musl": "4.1.0-alpha3",
-    "@remotion/compositor-linux-x64-gnu": "4.1.0-alpha3"
+    "@remotion/compositor-linux-arm64-musl": "4.1.0-alpha4",
+    "@remotion/compositor-darwin-arm64": "4.1.0-alpha4",
+    "@remotion/compositor-darwin-x64": "4.1.0-alpha4",
+    "@remotion/compositor-linux-arm64-gnu": "4.1.0-alpha4",
+    "@remotion/compositor-linux-x64-gnu": "4.1.0-alpha4",
+    "@remotion/compositor-win32-x64-msvc": "4.1.0-alpha4",
+    "@remotion/compositor-linux-x64-musl": "4.1.0-alpha4"
   },
   "keywords": [
     "remotion",