@remotion/renderer 3.2.32 → 3.2.34

package/dist/index.d.ts

@@ -39,14 +39,8 @@ export declare const RenderInternals: {
         feature: "enable-gpl" | "enable-libx265" | "enable-libvpx";
     }) => Promise<boolean>;
     getActualConcurrency: (userPreference: number | null) => number;
-    getFfmpegVersion: (options: {
-        ffmpegExecutable: string | null;
-    }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
     validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;
-    binaryExists: (name: "ffmpeg" | "brew", localFFmpeg: string | null) => Promise<boolean>;
-    getFfmpegBuildInfo: (options: {
-        ffmpegExecutable: string | null;
-    }) => Promise<string>;
+    binaryExists: (name: "ffmpeg" | "brew", localFFmpeg: string | null) => boolean;
     serveStatic: (path: string | null, options: {
         port: number | null;
         ffmpegExecutable: import("./ffmpeg-executable").FfmpegExecutable;
@@ -158,4 +152,7 @@ export declare const RenderInternals: {
         durationInFrames: number;
     }) => number;
     validateBitrate: (bitrate: unknown, name: string) => void;
+    getFfmpegVersion: (options: {
+        ffmpegExecutable: string | null;
+    }) => Promise<import("./ffmpeg-flags").FfmpegVersion>;
 };

package/dist/index.js

@@ -103,10 +103,8 @@ exports.RenderInternals = {
     ensureLocalBrowser: get_local_browser_executable_1.ensureLocalBrowser,
     ffmpegHasFeature: ffmpeg_flags_1.ffmpegHasFeature,
     getActualConcurrency: get_concurrency_1.getActualConcurrency,
-    getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
     validateFfmpeg: validate_ffmpeg_1.validateFfmpeg,
     binaryExists: validate_ffmpeg_1.binaryExists,
-    getFfmpegBuildInfo: ffmpeg_flags_1.getFfmpegBuildInfo,
     serveStatic: serve_static_1.serveStatic,
     validateEvenDimensionsWithCodec: validate_even_dimensions_with_codec_1.validateEvenDimensionsWithCodec,
     normalizeServeUrl: normalize_serve_url_1.normalizeServeUrl,
@@ -162,6 +160,7 @@ exports.RenderInternals = {
     cleanDownloadMap: download_map_1.cleanDownloadMap,
     convertToPositiveFrameIndex: convert_to_positive_frame_index_1.convertToPositiveFrameIndex,
     validateBitrate: validate_videobitrate_1.validateBitrate,
+    getFfmpegVersion: ffmpeg_flags_1.getFfmpegVersion,
 };
 // Warn of potential performance issues with Apple Silicon (M1 chip under Rosetta)
-(0, check_apple_silicon_1.warnIfAppleSiliconIsNotUsingArm64Architecture)();
+(0, check_apple_silicon_1.checkNodeVersionAndWarnAboutRosetta)();

package/dist/render-frames.js

@@ -227,11 +227,12 @@ const innerRenderFrames = ({ onFrameUpdate, outputDir, onStart, inputProps, qual
         return compressedAssets;
     }));
     const happyPath = progress.then(() => {
+        const firstFrameIndex = countType === 'from-zero' ? 0 : framesToRender[0];
         const returnValue = {
             assetsInfo: {
                 assets,
                 imageSequenceName: `element-%0${filePadLength}d.${imageFormat}`,
-                firstFrameIndex: framesToRender[0],
+                firstFrameIndex,
                 downloadMap,
             },
             frameCount: framesToRender.length,

package/dist/render-media.js

@@ -31,6 +31,7 @@ const quality_1 = require("./quality");
 const render_frames_1 = require("./render-frames");
 const stitch_frames_to_video_1 = require("./stitch-frames-to-video");
 const validate_even_dimensions_with_codec_1 = require("./validate-even-dimensions-with-codec");
+const validate_ffmpeg_1 = require("./validate-ffmpeg");
 const validate_ffmpeg_override_1 = require("./validate-ffmpeg-override");
 const validate_output_filename_1 = require("./validate-output-filename");
 const validate_scale_1 = require("./validate-scale");
@@ -52,6 +53,7 @@ const getConcurrency = (others) => {
  */
 const renderMedia = ({ 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, ffmpegOverride, audioBitrate, videoBitrate, onSlowestFrames, ...options }) => {
     var _a, _b, _c, _d;
+    (0, validate_ffmpeg_1.validateFfmpeg)(ffmpegExecutable !== null && ffmpegExecutable !== void 0 ? ffmpegExecutable : null);
     (0, quality_1.validateQuality)(options.quality);
     (0, crf_1.validateQualitySettings)({ crf, codec, videoBitrate });
     (0, validate_videobitrate_1.validateBitrate)(audioBitrate, 'audioBitrate');

package/dist/validate-ffmpeg.d.ts

@@ -1,2 +1,5 @@
-export declare const binaryExists: (name: 'ffmpeg' | 'brew', localFFmpeg: string | null) => Promise<boolean>;
+export declare const binaryExists: (name: 'ffmpeg' | 'brew', localFFmpeg: string | null) => boolean;
+export declare const checkAndValidateFfmpegVersion: (options: {
+    ffmpegExecutable: string | null;
+}) => Promise<void>;
 export declare const validateFfmpeg: (customFfmpegBinary: string | null) => Promise<void>;

package/dist/validate-ffmpeg.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateFfmpeg = exports.binaryExists = void 0;
+exports.validateFfmpeg = exports.checkAndValidateFfmpegVersion = exports.binaryExists = 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 binaryExists = async (name, localFFmpeg) => {
+const binaryExists = (name, localFFmpeg) => {
     if (typeof existsMap[name] !== 'undefined') {
         return existsMap[name];
     }
@@ -25,7 +27,7 @@ const binaryExists = async (name, localFFmpeg) => {
     const isWin = os_1.default.platform() === 'win32';
     const where = isWin ? 'where' : 'which';
     try {
-        await (0, execa_1.default)(where, [name]);
+        execa_1.default.sync(where, [name]);
         existsMap[name] = true;
         return true;
     }
@@ -38,16 +40,29 @@ exports.binaryExists = binaryExists;
 const isHomebrewInstalled = () => {
     return (0, exports.binaryExists)('brew', null);
 };
+const checkAndValidateFfmpegVersion = async (options) => {
+    const ffmpegVersion = await (0, ffmpeg_flags_1.getFfmpegVersion)({
+        ffmpegExecutable: options.ffmpegExecutable,
+    });
+    const buildConf = await (0, ffmpeg_flags_1.getFfmpegBuildInfo)({
+        ffmpegExecutable: options.ffmpegExecutable,
+    });
+    (0, warn_about_ffmpeg_version_1.warnAboutFfmpegVersion)({ ffmpegVersion, buildConf });
+};
+exports.checkAndValidateFfmpegVersion = checkAndValidateFfmpegVersion;
 const validateFfmpeg = async (customFfmpegBinary) => {
-    const ffmpegExists = await (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
+    if (process.platform === 'linux' && (0, fs_1.existsSync)('/opt/bin/ffmpeg')) {
+        return Promise.resolve();
+    }
+    const ffmpegExists = (0, exports.binaryExists)('ffmpeg', customFfmpegBinary);
     if (!ffmpegExists) {
         if (customFfmpegBinary) {
             console.error('FFmpeg executable not found:');
             console.error(customFfmpegBinary);
-            process.exit(1);
+            throw new Error('FFmpeg not found');
         }
         console.error('It looks like FFMPEG is not installed');
-        if (os_1.default.platform() === 'darwin' && (await isHomebrewInstalled())) {
+        if (os_1.default.platform() === 'darwin' && isHomebrewInstalled()) {
             console.error('Run `brew install ffmpeg` to install ffmpeg');
         }
         else if (os_1.default.platform() === 'win32') {
@@ -66,7 +81,8 @@ const validateFfmpeg = async (customFfmpegBinary) => {
         else {
             console.error('See https://github.com/adaptlearning/adapt_authoring/wiki/Installing-FFmpeg on how to install FFMPEG.');
         }
-        process.exit(1);
+        throw new Error('FFmpeg not found');
     }
+    await (0, exports.checkAndValidateFfmpegVersion)({ ffmpegExecutable: customFfmpegBinary });
 };
 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": "3.2.32",
+	"version": "3.2.34",
 	"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.32",
+		"remotion": "3.2.34",
 		"source-map": "^0.8.0-beta.0",
 		"ws": "8.7.0"
 	},
@@ -38,13 +38,13 @@
 		"@types/progress": "2.0.5",
 		"@types/react": "18.0.1",
 		"@types/react-dom": "18.0.0",
-		"eslint": "8.13.0",
-		"prettier": "^2.0.5",
+		"eslint": "8.25.0",
+		"prettier": "^2.7.1",
 		"prettier-plugin-organize-imports": "^2.3.4",
 		"react": "18.0.0",
 		"react-dom": "18.0.0",
 		"typescript": "^4.7.0",
-		"vitest": "0.18.0"
+		"vitest": "0.24.3"
 	},
 	"keywords": [
 		"remotion",
@@ -57,5 +57,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "4f7ab3637405d140041f898f95f78c99943d1b40"
+	"gitHead": "82f5d37510dfdf0630c5836cbe5655d7d3ebb2b2"
 }

package/dist/ffmpeg-args-hook.d.ts

@@ -1,4 +0,0 @@
-export declare type FfmpegArgsHook = (info: {
-    type: 'pre-stitcher' | 'stitcher';
-    args: string[];
-}) => string[];

package/dist/ffmpeg-args-hook.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });