@xiping/node-utils 1.0.66 → 1.0.69

package/lib/src/ffmpeg/getThumbnail.js

@@ -58,6 +58,7 @@ async function extractFrames(videoPath, tempDir, frames, interval, maxConcurrenc
                 "-q:v", "10",
                 "-an",
                 "-threads", "4",
+                "-strict", "unofficial", // 允许 limited-range YUV 输入，兼容 FFmpeg 7.x MJPEG 编码器
                 framePath,
             ]);
             if (result.code === 0) {

package/lib/src/ffmpeg/transcode.d.ts

@@ -19,6 +19,8 @@ export interface TranscodingConfig {
     thumbnailOptions?: Partial<ThumbnailOptions>;
     /** 目标编码格式，默认 'hevc' */
     format?: "av1" | "hevc";
+    /** 是否强制使用软编码（禁用硬件编码），默认 false */
+    forceSoftware?: boolean;
     /** 是否替换原文件（删除原文件并将输出重命名为原路径），默认 false */
     replaceOriginal?: boolean;
     /** 转换进度回调 */
@@ -29,6 +31,8 @@ export interface AvailableEncoders {
     libaomAv1: boolean;
     hevcNvenc: boolean;
     libx265: boolean;
+    /** macOS 上的 HEVC 硬编码（VideoToolbox） */
+    hevcVideoToolbox: boolean;
 }
 /** 同步检测可用编码器 */
 export declare function getAvailableEncoders(): AvailableEncoders;

package/lib/src/ffmpeg/transcode.js

@@ -11,6 +11,7 @@ const log = (message, data) => {
 const defaultConfig = {
     generateThumbnail: true,
     format: "hevc",
+    forceSoftware: false,
     replaceOriginal: false,
 };
 /** 同步检测可用编码器 */
@@ -22,6 +23,8 @@ export function getAvailableEncoders() {
         libaomAv1: stdout.includes("libaom-av1"),
         hevcNvenc: stdout.includes("hevc_nvenc"),
         libx265: stdout.includes("libx265"),
+        // macOS VideoToolbox 硬件编码（HEVC）
+        hevcVideoToolbox: stdout.includes("hevc_videotoolbox"),
     };
 }
 function validateAndSanitizePath(inputPath) {
@@ -77,10 +80,10 @@ function parseOutTimeFromProgressFile(content) {
     return lastUs != null ? lastUs / 1e6 : null;
 }
 /** 根据格式与可用编码器构建 ffmpeg 参数数组；progressPath 用于 -progress 以获取实时进度（避免 stderr 缓冲导致 0 直接跳到 99） */
-function buildTranscodeArgs(inputPath, outputPath, format, encoders, progressPath) {
+function buildTranscodeArgs(inputPath, outputPath, format, encoders, forceSoftware, progressPath) {
     const args = ["-i", inputPath];
     if (format === "av1") {
-        if (encoders.av1Nvenc) {
+        if (!forceSoftware && encoders.av1Nvenc) {
             args.push("-c:v", "av1_nvenc", "-preset", "slow", "-rc", "constqp", "-qp", "28");
         }
         else if (encoders.libaomAv1) {
@@ -91,7 +94,12 @@ function buildTranscodeArgs(inputPath, outputPath, format, encoders, progressPat
         }
     }
     else {
-        if (encoders.hevcNvenc) {
+        const isMacOS = os.platform() === "darwin";
+        if (!forceSoftware && isMacOS && encoders.hevcVideoToolbox) {
+            // macOS 上优先使用 VideoToolbox 硬件编码
+            args.push("-c:v", "hevc_videotoolbox");
+        }
+        else if (!forceSoftware && encoders.hevcNvenc) {
             args.push("-c:v", "hevc_nvenc", "-preset", "slow", "-rc", "constqp", "-qp", "28");
         }
         else if (encoders.libx265) {
@@ -109,10 +117,10 @@ function buildTranscodeArgs(inputPath, outputPath, format, encoders, progressPat
 }
 const PROGRESS_POLL_INTERVAL_MS = 400;
 /** 使用 spawn 执行 ffmpeg 转码。进度通过 -progress 文件轮询获取，避免 stderr 管道缓冲导致 0 直接跳到 99。 */
-function runTranscodeWithProgress(inputPath, outputPath, format, encoders, totalDuration, onProgress) {
+function runTranscodeWithProgress(inputPath, outputPath, format, encoders, forceSoftware, totalDuration, onProgress) {
     return new Promise((resolve, reject) => {
         const progressPath = path.join(os.tmpdir(), `ffmpeg-progress-${process.pid}-${Date.now()}`);
-        const args = buildTranscodeArgs(inputPath, outputPath, format, encoders, progressPath);
+        const args = buildTranscodeArgs(inputPath, outputPath, format, encoders, forceSoftware, progressPath);
         log("ffmpeg spawn", { totalDuration, format, outputPath, progressPath });
         const child = spawn("ffmpeg", args, { stdio: ["ignore", "pipe", "pipe"] });
         let lastPercent = -1;
@@ -233,7 +241,7 @@ export async function transcoding(inputPath, config = {}) {
     const reportProgress = (progress) => {
         finalConfig.onProgress?.(progress);
     };
-    await runTranscodeWithProgress(validatedPath, tempOutputPath, format, encoders, duration, reportProgress);
+    await runTranscodeWithProgress(validatedPath, tempOutputPath, format, encoders, finalConfig.forceSoftware, duration, reportProgress);
     if (finalConfig.generateThumbnail) {
         log("generating thumbnail", finalConfig.thumbnailOptions ?? {});
         await getThumbnail(validatedPath, finalConfig.thumbnailOptions ?? {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiping/node-utils",
-  "version": "1.0.66",
+  "version": "1.0.69",
   "description": "node-utils",
   "type": "module",
   "author": "The-End-Hero <527409987@qq.com>",
@@ -25,7 +25,7 @@
   "bugs": {
     "url": "https://github.com/The-End-Hero/xiping/issues"
   },
-  "gitHead": "477bf1fb5b65d5e34b2641eb24068bc064ebb648",
+  "gitHead": "3bf85a7229343f0c7141d60ceac026773a2c98cb",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"