mediac 1.8.2 → 1.8.5

package/cmd/cmd_compress.js

@@ -25,7 +25,7 @@ import * as log from '../lib/debug.js'
 import * as mf from '../lib/file.js'
 import * as helper from '../lib/helper.js'
 import * as tryfp from '../lib/tryfp.js'
-import { compressImage } from "./cmd_shared.js"
+import { applyFileNameRules, calculateScale, compressImage } from "./cmd_shared.js"
 
 //
 export { aliases, builder, command, describe, handler }
@@ -40,11 +40,11 @@ const WIDTH_DEFAULT = 6000
 
 const builder = function addOptions(ya, helpOrVersionSet) {
     return ya
-        .option("purge", {
+        .option("delete-source-files", {
             alias: "p",
             type: "boolean",
             default: false,
-            description: "Purge original image files",
+            description: "Delete original image files after compress",
         })
         // 输出目录，默认输出文件与原文件同目录
         .option("output", {
@@ -52,6 +52,32 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             describe: "Folder store ouput files",
             type: "string",
         })
+        // 正则，包含文件名规则
+        .option("include", {
+            alias: "I",
+            type: "string",
+            description: "filename include pattern",
+        })
+        //字符串或正则，不包含文件名规则
+        // 如果是正则的话需要转义
+        .option("exclude", {
+            alias: "E",
+            type: "string",
+            description: "filename exclude pattern ",
+        })
+        // 默认启用正则模式，禁用则为字符串模式
+        .option("regex", {
+            alias: 're',
+            type: "boolean",
+            default: true,
+            description: "match filenames by regex pattern",
+        })
+        // 需要处理的扩展名列表，默认为常见视频文件
+        .option("extensions", {
+            alias: "e",
+            type: "string",
+            describe: "include files by extensions (eg. .wav|.flac)",
+        })
         // 压缩后的文件后缀，默认为 _Z4K
         .option("suffix", {
             alias: "S",
@@ -59,10 +85,10 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             type: "string",
             default: "_Z4K",
         })
-        .option("purge-only", {
+        .option("delete-source-files-only", {
             type: "boolean",
             default: false,
-            description: "Just delete original image files only",
+            description: "Just delete original image files only, no compression",
         })
         // 是否覆盖已存在的压缩后文件
         .option("force", {
@@ -118,12 +144,7 @@ const handler = cmdCompress
 async function cmdCompress(argv) {
     const testMode = !argv.doit
     const logTag = "cmdCompress"
-    const root = path.resolve(argv.input)
-    assert.strictEqual("string", typeof root, "root must be string")
-    if (!root || !(await fs.pathExists(root))) {
-        log.error(logTag, `Invalid Input: '${root}'`)
-        throw new Error(`Invalid Input: ${root}`)
-    }
+    const root = await helper.validateInput(argv.input)
     if (!testMode) {
         log.fileLog(`Root:${root}`, logTag)
         log.fileLog(`Argv:${JSON.stringify(argv)}`, logTag)
@@ -133,8 +154,8 @@ async function cmdCompress(argv) {
     const quality = argv.quality || QUALITY_DEFAULT
     const minFileSize = (argv.size || SIZE_DEFAULT) * 1024
     const maxWidth = argv.width || WIDTH_DEFAULT
-    const purgeOnly = argv.purgeOnly || false
-    const purgeSource = argv.purge || false
+    const purgeOnly = argv.deleteSourceFilesOnly || false
+    const purgeSource = argv.deleteSourceFiles || false
     log.show(`${logTag} input:`, root)
     // 如果有force标志，就不过滤文件名
     const RE_THUMB = argv.force ? /@_@/ : /Z4K|P4K|M4K|feature|web|thumb$/i
@@ -152,8 +173,10 @@ async function cmdCompress(argv) {
         log.showYellow(logTag, "no files found, abort.")
         return
     }
+    // 应用文件名过滤规则
+    files = await applyFileNameRules(files, argv)
     log.show(logTag, `total ${files.length} files found (all)`)
-    if (files.length === 0) {
+    if (!files || files.length === 0) {
         log.showYellow("Nothing to do, abort.")
         return
     }
@@ -317,10 +340,11 @@ async function preCompress(f) {
     } else {
         if (im?.exif) {
             log.info(logTag, "force:", fileDst)
-            const md = exif(im.exif)?.Image
+            const [err, iexif] = tryfp.tryCatch(exif)(im.exif)
             // 跳过以前由mediac压缩过的图片，避免重复压缩
-            if (!f.force) {
-                if (md.Copyright?.includes("mediac")
+            if (!f.force && iexif?.Image) {
+                const md = iexif?.Image
+                if (md?.Copyright?.includes("mediac")
                     || md.Software?.includes("mediac")
                     || md.Artist?.includes("mediac") && !f.force) {
                     log.info(logTag, "skip:", fileDst)
@@ -339,12 +363,12 @@ async function preCompress(f) {
     }
 
     if (err) {
-        log.warn(logTag, "sharp", error.message, fileSrc)
-        log.fileLog(`SharpErr: ${f.index} <${fileSrc}> sharp:${error.message}`, logTag)
+        log.warn(logTag, "sharp", err.message, fileSrc)
+        log.fileLog(`SharpErr: ${f.index} <${fileSrc}> sharp:${err.message}`, logTag)
         return
     }
 
-    const { dstWidth, dstHeight } = calculateImageScale(im.width, im.height, maxWidth)
+    const { dstWidth, dstHeight } = calculateScale(im.width, im.height, maxWidth)
     if (f.total < 1000 || f.index > f.total - 1000) {
         log.show(logTag, `${f.index}/${f.total}`,
             helper.pathShort(fileSrc),

package/cmd/cmd_dcim.js

@@ -11,7 +11,7 @@ import fs from 'fs-extra'
 import inquirer from "inquirer"
 import path from "path"
 
-import { renameFiles } from "./cmd_shared.js"
+import { addEntryProps, renameFiles } from "./cmd_shared.js"
 
 import * as log from '../lib/debug.js'
 import * as exif from '../lib/exif.js'
@@ -136,6 +136,7 @@ const handler = async function cmdRename(argv) {
         log.showYellow(LOG_TAG, "Nothing to do, exit now.")
         return
     }
+    files = addEntryProps(files)
     log.show(
         LOG_TAG,
         `Total ${files.length} media files ready to rename by exif`,

package/cmd/cmd_decode.js

@@ -60,7 +60,7 @@ const handler = async function cmdDecode(argv) {
     }
     const fromEnc = argv.fromEnc?.length > 0 ? [argv.fromEnc] : ENC_LIST
     const toEnc = argv.toEnc?.length > 0 ? [argv.toEnc] : ENC_LIST
-    const threhold = log.isVerbose() ? 1 : 50
+    const threhold = log.isVerbose() ? 0 : 50
     log.show(logTag, `Input:`, strArgs)
     log.show(logTag, `fromEnc:`, JSON.stringify(fromEnc))
     log.show(logTag, `toEnc:`, JSON.stringify(toEnc))
@@ -88,19 +88,19 @@ function showResults(r) {
     let cr = chardet.analyse(Buffer.from(str))
     cr = cr.filter(ct => ct.confidence >= 70)
     cr?.length > 0 && print('Encoding', cr)
-    print('String', Array.from(str))
-    print('Unicode', Array.from(str).map(c => c.codePointAt(0).toString(16)))
-    const badUnicode = enc.checkBadUnicode(str)
+    // print('String', Array.from(str))
+    // print('Unicode', Array.from(str).map(c => c.codePointAt(0).toString(16)))
+    const badUnicode = enc.checkBadUnicode(str, true)
     badUnicode?.length > 0 && log.show('badUnicode:', badUnicode)
-    log.info(`MESSY_UNICODE=${enc.REGEX_MESSY_UNICODE.test(str)}`,
-        `MESSY_CJK=${enc.REGEX_MESSY_CJK.test(str)}`)
-    log.info(`OnlyJapanese=${unicode.strOnlyJapanese(str)}`,
-        `OnlyJpHan=${unicode.strOnlyJapaneseHan(str)}`,
-        `HasHiraKana=${unicode.strHasHiraKana(str)}`
-    )
-    log.info(`HasHangul=${unicode.strHasHangul(str)}`,
-        `OnlyHangul=${unicode.strOnlyHangul(str)}`)
-    log.info(`HasChinese=${unicode.strHasChinese(str)}`,
-        `OnlyChinese=${unicode.strOnlyChinese(str)}`,
-        `OnlyChn3500=${enc.RE_CHARS_MOST_USED.test(str)}`)
+    // log.info(`MESSY_UNICODE=${enc.REGEX_MESSY_UNICODE.test(str)}`,
+    //     `MESSY_CJK=${enc.REGEX_MESSY_CJK.test(str)}`)
+    // log.info(`OnlyJapanese=${unicode.strOnlyJapanese(str)}`,
+    //     `OnlyJpHan=${unicode.strOnlyJapaneseHan(str)}`,
+    //     `HasHiraKana=${unicode.strHasHiraKana(str)}`
+    // )
+    // log.info(`HasHangul=${unicode.strHasHangul(str)}`,
+    //     `OnlyHangul=${unicode.strOnlyHangul(str)}`)
+    // log.info(`HasChinese=${unicode.strHasChinese(str)}`,
+    //     `OnlyChinese=${unicode.strOnlyChinese(str)}`,
+    //     `OnlyChn3500=${enc.RE_CHARS_MOST_USED.test(str)}`)
 }

package/cmd/cmd_ffmpeg.js

@@ -24,7 +24,7 @@ import * as enc from '../lib/encoding.js'
 import presets from '../lib/ffmpeg_presets.js'
 import * as mf from '../lib/file.js'
 import * as helper from '../lib/helper.js'
-import { getMediaInfo } from '../lib/mediainfo.js'
+import { getMediaInfo, getSimpleInfo } from '../lib/mediainfo.js'
 import { addEntryProps, applyFileNameRules, calculateScale } from './cmd_shared.js'
 
 const LOG_TAG = "FFConv"
@@ -161,6 +161,12 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             default: 0,
             describe: "Set video bitrate (in kbytes) in ffmpeg command",
         })
+        // 直接复制视频流，不重新编码
+        .option("video-copy", {
+            type: "boolean",
+            default: false,
+            describe: "Copy video stream to ouput, no re-encoding",
+        })
         // 视频选项，指定视频质量参数
         .option("video-quality", {
             alias: "vq",
@@ -227,11 +233,17 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             type: "number",
         })
         // 如果目标文件已存在或转换成功，删除源文件
-        .option("purge-source-files", {
+        .option("delete-source-files", {
             type: "boolean",
             default: false,
             description: "delete source file if destination is exists",
         })
+        // 显示视频参数
+        .option("info", {
+            type: "boolean",
+            default: false,
+            description: "show info of media files",
+        })
         // 启用调试参数
         .option("debug", {
             type: "boolean",
@@ -325,6 +337,15 @@ async function cmdConvert(argv) {
         log.showYellow(logTag, 'No files left after rules, nothing to do.')
         return
     }
+    // 仅显示视频文件参数，不进行转换操作
+    if (argv.info) {
+        for (const entry of fileEntries) {
+            log.showGreen(logTag, `${entry.path}`)
+            const info = await getMediaInfo(entry.path)
+            log.show(logTag, JSON.stringify(info))
+        }
+        return
+    }
     if (fileEntries.length > 5000) {
         const continueAnswer = await inquirer.prompt([
             {
@@ -355,6 +376,7 @@ async function cmdConvert(argv) {
             testMode: testMode
         }
     })
+
     log.showYellow(logTag, 'ARGV:', argv)
     log.showYellow(logTag, 'PRESET:', preset)
     const prepareAnswer = await inquirer.prompt([
@@ -375,7 +397,7 @@ async function cmdConvert(argv) {
     let tasks = await pMap(fileEntries, prepareFFmpegCmd, { concurrency: argv.jobs || (core.isUNCPath(root) ? 4 : cpus().length) })
 
     // 如果选择了清理源文件
-    if (argv.purgeSourceFiles) {
+    if (argv.deleteSourceFiles) {
         // 删除目标文件已存在的源文件
         let dstExitsTasks = tasks.filter(t => t && t.dstExists && !t.fileDst)
         if (dstExitsTasks.length > 0) {
@@ -457,7 +479,7 @@ async function runFFmpegCmd(entry) {
 
     // 每10个输出一次ffmpeg详细信息，避免干扰
     // if (entry.index % 10 === 0) {
-    log.showGray(logTag, getEntryShowInfo(entry))
+    log.showCyan(logTag, getEntryShowInfo(entry))
     log.showGray(logTag, `ffmpeg`, entry.ffmpegArgs.flat().join(' '))
     // }
     const exePath = await which('ffmpeg')
@@ -553,7 +575,7 @@ async function prepareFFmpegCmd(entry) {
         // 默认true 保留目录结构，可以防止文件名冲突
         if (argv.outputTree) {
             // 如果要保持源文件目录结构
-            fileDstDir = helper.pathRewrite(root, srcDir, preset.output)
+            fileDstDir = helper.pathRewrite(entry.root, srcDir, preset.output)
         } else {
             // 不保留源文件目录结构，只保留源文件父目录
             fileDstDir = path.join(preset.output, path.basename(srcDir))
@@ -565,7 +587,7 @@ async function prepareFFmpegCmd(entry) {
     try {
         // 使用ffprobe读取媒体信息，速度较慢
         // 注意flac和ape格式的stream里没有bitrate字段 format里有
-        entry.info = await getMediaInfo(entry.path, { audio: isAudio })
+        entry.info = await getMediaInfo(entry.path)
 
         // ffprobe无法读取时长和比特率，可以认为文件损坏，或不支持的格式，跳过
         if (!(entry.info?.duration && entry.info?.bitrate)) {
@@ -593,15 +615,16 @@ async function prepareFFmpegCmd(entry) {
                 return false
             }
         } else {
-            // H264 10Bit Nvidia和Intel都不支持硬解，直接跳过
-            if (entry.info?.video?.format === 'h264'
-                && entry.info?.video.bitDepth === 10
-                && entry.info?.video.profile?.includes('10')) {
-                log.showYellow(logTag, `${ipx} Skip[H264_10Bit]: ${entry.path} ${entry.info?.video?.pixelFormat} (${helper.humanSize(entry.size)})`)
-                log.fileLog(`${ipx} Skip[H264_10Bit]: <${entry.path}> (${helper.humanSize(entry.size)})`, 'Prepare')
-                return false
-            }
-
+            // 检查目标宽高和原始文件宽高，不放大
+            const reqDimension = argv.dimension || preset.dimension
+            const sw = entry.info?.video?.width || 0
+            const sh = entry.info?.video?.height || 0
+            // if (sw < reqDimension && sh < reqDimension) {
+            //     // 忽略
+            //     log.showYellow(logTag, `${ipx} Skip[Dimension]: (${sw}x${sh},${reqDimension}) ${entry.path}`)
+            //     log.fileLog(`${ipx} Skip[Dimension]: (${sw}x${sh}) <${entry.path}>`, 'Prepare')
+            //     return false
+            // }
         }
         // 获取原始音频码率，计算目标音频码率
         // vp9视频和opus音频无法获取码率
@@ -664,10 +687,39 @@ async function prepareFFmpegCmd(entry) {
                 }
             }
         }
-        // 字幕文件
-        let fileSubtitle = path.join(srcDir, `${srcBase}.ass`)
-        if (!(await fs.pathExists(fileSubtitle))) {
-            fileSubtitle = null
+
+        if (!isAudio) {
+            // https://developer.nvidia.com/video-encode-and-decode-gpu-support-matrix-new
+            // H264 10Bit Nvidia和Intel都不支持硬解，直接跳过
+            // H264 High-L5以上也不支持
+            if (entry.info?.video?.format === 'h264'
+                && (entry.info?.video?.bitDepth === 10
+                    || (entry.info?.video?.profile?.includes('High') && entry.info?.video?.level >= 50))) {
+                log.warn(logTag, `${ipx} useCPUDecode ${entry.path} ${entry.info?.video?.pixelFormat}`, helper.humanSize(entry.size), chalk.white(JSON.stringify(entry.info.video)))
+                log.fileLog(`${ipx} useCPUDecode <${entry.path}> (${helper.humanSize(entry.size)})`, 'Prepare')
+                // 添加标志，使用软解，替换解码参数
+                // 在组装ffmpeg参数时判断和替换
+                // 解码和滤镜参数都需要修改
+                entry.info.useCPUDecode = true
+                // return false
+            }
+        }
+
+        // 找到并添加字幕文件，当前目录和subs子目录
+        const subExts = ['.ass', '.ssa', '.srt']
+        const subtitles = []
+        for (const ext of subExts) {
+            const sub1 = path.join(srcDir, `${srcBase}${ext}`)
+            const sub2 = path.join(srcDir, 'subs', `${srcBase}${ext}`)
+            if (await fs.pathExists(sub1)) {
+                subtitles.push(sub1)
+            }
+            if (await fs.pathExists(sub2)) {
+                subtitles.push(sub2)
+            }
+        }
+        if (subtitles.length > 0) {
+            log.showCyan(logTag, `${ipx} SubTitles:`, subtitles.join(' '))
         }
         log.show(logTag, `${ipx} FR: ${helper.pathShort(entry.path, 80)}`, chalk.yellow(entry.preset.name), helper.humanTime(entry.startMs))
         log.showGray(logTag, `${ipx} TO:`, fileDst)
@@ -678,7 +730,7 @@ async function prepareFFmpegCmd(entry) {
             fileDstBase,
             fileDst,
             fileDstTemp,
-            fileSubtitle,
+            subtitles,
         }
         newEntry.ffmpegArgs = createFFmpegArgs(newEntry)
         log.info(logTag, 'ffmpeg', newEntry.ffmpegArgs.flat().join(' '))
@@ -722,12 +774,7 @@ function getEntryShowInfo(entry) {
     showText.push(`pt:${entry.preset.name}`)
     showText.push(`sz:${helper.humanSize(args.size)}`)
     showText.push(`ts:${helper.humanSeconds(args.srcDuration)}`)
-    showText.push(`v:${vc}`)
-    if (args.dstVideoBitrate !== args.srcVideoBitrate) {
-        showText.push(`vb:${kNum(args.srcVideoBitrate)}=>${kNum(args.dstVideoBitrate)}`)
-    } else {
-        showText.push(`vb:${kNum(args.srcVideoBitrate)}`)
-    }
+
     showText.push(`a:${ac}`)
     if (args.dstAudioBitrate !== args.srcAudioBitrate) {
         showText.push(`ab:${kNum(args.srcAudioBitrate)}=>${kNum(args.dstAudioBitrate)}`)
@@ -737,8 +784,12 @@ function getEntryShowInfo(entry) {
     if (args.dstAudioQuality > 0) {
         showText.push(`aq:${args.dstAudioQuality}`)
     }
-    if (args.srcWidth !== args.dstWidth || args.srcHeight !== args.dstHeight) {
-        showText.push(`dm:${args.srcWidth}x${args.srcHeight}=>${args.dstWidth}x${args.dstHeight}`)
+
+    showText.push(`v:${vc}`)
+    if (args.dstVideoBitrate !== args.srcVideoBitrate) {
+        showText.push(`vb:${kNum(args.srcVideoBitrate)}=>${kNum(args.dstVideoBitrate)}`)
+    } else {
+        showText.push(`vb:${kNum(args.srcVideoBitrate)}`)
     }
     if (args.dstFrameRate > 0 && args.dstFrameRate !== args.srcFrameRate) {
         showText.push(`fps:${args.srcFrameRate}=>${args.dstFrameRate}`)
@@ -748,6 +799,11 @@ function getEntryShowInfo(entry) {
     if (args.speed > 0) {
         showText.push(`sp:${args.speed}`)
     }
+    if (args.srcWidth !== args.dstWidth || args.srcHeight !== args.dstHeight) {
+        showText.push(`${args.srcWidth}x${args.srcHeight}=>${args.dstWidth}x${args.dstHeight}`)
+    } else {
+        showText.push(`${args.srcWidth}x${args.srcHeight}`)
+    }
     return showText.join(',')
 }
 
@@ -802,8 +858,28 @@ function calculateDstArgs(entry) {
     let srcVideoBitrate = 0
     let dstVideoBitrate = 0
 
+    let srcFrameRate = 0
+    let dstFrameRate = 0
+    let dstWidth = 0
+    let dstHeight = 0
+
+    // 源文件时长
+    const srcDuration = info?.duration
+        || ivideo?.duration
+        || iaudio?.duration || 0
+
+    const srcWidth = ivideo?.width || 0
+    const srcHeight = ivideo?.height || 0
+
     const reqAudioBitrate = ep.userArgs.audioBitrate || ep.audioBitrate
     const reqVideoBitrate = ep.userArgs.videoBitrate || ep.videoBitrate
+
+    const dstAudioQuality = ep.userArgs.audioQuality || ep.audioQuality
+    const dstVideoQuality = ep.userArgs.videoQuality || ep.videoQuality
+
+    const dstSpeed = ep.userArgs.speed || ep.speed
+    const dstDimension = ep.userArgs.dimension || ep.dimension
+
     if (helper.isAudioFile(entry.path)) {
         // 音频文件
         // 文件信息中的码率值
@@ -838,6 +914,11 @@ function calculateDstArgs(entry) {
         dstAudioBitrate = minNoZero(dstAudioBitrate, srcAudioBitrate)
     } else {
         // 视频文件
+        const dstWH = calculateScale(srcWidth, srcHeight, dstDimension)
+        dstWidth = dstWH.dstWidth
+        dstHeight = dstWH.dstHeight
+        const srcPixels = srcWidth * srcHeight
+        const dstPixels = dstWidth * dstHeight
         // 这个是文件整体码率，如果是是视频文件，等于是视频和音频的码率相加
         const fileBitrate = info?.bitrate || 0
         srcAudioBitrate = iaudio?.bitrate || 0
@@ -849,51 +930,37 @@ function calculateDstArgs(entry) {
         // 音频和视频码率 用户指定>预设
         // 音频和视频码率都不能高于原码率
         dstAudioBitrate = minNoZero(srcAudioBitrate, reqAudioBitrate)
-        dstVideoBitrate = minNoZero(srcVideoBitrate, reqVideoBitrate)
-
-        log.info(entry.name, "fileBitrate", fileBitrate, "srcVideoBitrate", srcVideoBitrate, "reqVideoBitrate", reqVideoBitrate, "dstVideoBitrate", dstVideoBitrate)
+        // 如果源文件不是1080p，这里码率需要考虑分辨率
+        const pixelsScale = PIXELS_1080P / srcPixels
+        dstVideoBitrate = minNoZero(srcVideoBitrate * pixelsScale, reqVideoBitrate)
 
+        log.info(entry.name, "fileBitrate", fileBitrate, "srcVideoBitrate", srcVideoBitrate, "reqVideoBitrate", reqVideoBitrate, "dstVideoBitrate", dstVideoBitrate, "pixelsScale", pixelsScale)
+        // 小于1080p分辨率，码率也需要缩放
+        if (dstPixels > 0 && dstPixels < PIXELS_1080P) {
+            let scaleFactor = dstPixels / PIXELS_1080P
+            // 如果目标码率是4K，暂时吧不考虑
+            // 如果目标码率不是1080p，根据分辨率智能缩放
+            // 示例 辨率1920*1080的目标码率是 1600k
+            // 1280*720码率 960k
+            // scaleFactor = Math.sqrt(scaleFactor)
+            // 缩放码率，平滑系数
+            scaleFactor = core.smoothChange(scaleFactor, 1, 0.2)
+            // log.info('scaleFactor', scaleFactor)
+            dstVideoBitrate = Math.round(dstVideoBitrate * scaleFactor)
+            // 目标分辨率，不能大于源文件分辨率
+            dstVideoBitrate = minNoZero(dstVideoBitrate, srcVideoBitrate)
+            // 取整
+            // dstVideoBitrate = Math.floor(dstVideoBitrate / 1000) * 1000
+        }
     }
 
-    // 源文件时长
-    const srcDuration = info?.duration
-        || ivideo?.duration
-        || iaudio?.duration || 0
     // 如果目标帧率大于原帧率，就将目标帧率设置为0，即让ffmpeg自动处理，不添加帧率参数
     // 源文件帧率
-    const srcFrameRate = ivideo?.framerate || 0
+    srcFrameRate = ivideo?.framerate || 0
     // 预设或用户帧率，用户指定>预设
     const reqFrameRate = ep.userArgs.framerate || ep.framerate
     // 计算出的目标帧率
-    let dstFrameRate = reqFrameRate < srcFrameRate ? reqFrameRate : 0
-
-    const dstAudioQuality = ep.userArgs.audioQuality || ep.audioQuality
-    const dstVideoQuality = ep.userArgs.videoQuality || ep.videoQuality
-
-    const dstDimension = ep.userArgs.dimension || ep.dimension
-    const { dstWidth, dstHeight } = calculateScale(ivideo?.width || 0, ivideo?.height || 0, dstDimension)
-
-    const dstPixels = dstWidth * dstHeight
-    const dstVideoBitrateFixed = dstVideoBitrate
-    if (dstPixels > 0) {
-        let scaleFactor = dstPixels / PIXELS_1080P
-        // dstVideoBitrate针对目标是1080p的数据
-        // 如果目标码率不是1080p，根据分辨率智能缩放
-        // 示例 辨率1920*1080的目标码率是 1600k
-        // 1280*720码率 960k
-        // 3840*2160码率 2560k
-        // 0.9~1.1 之间不缩放
-        if (scaleFactor > 1.1) {
-            scaleFactor *= 0.4
-        } else if (scaleFactor < 0.9) {
-            scaleFactor *= 1.6
-        } else {
-            scaleFactor = 1
-        }
-        dstVideoBitrate = Math.round(dstVideoBitrate * scaleFactor)
-    }
-
-    const dstSpeed = ep.userArgs.speed || ep.speed
+    dstFrameRate = reqFrameRate < srcFrameRate ? reqFrameRate : 0
 
     // 用于模板字符串的模板参数，针对当前文件
     // 额外模板参数
@@ -904,9 +971,9 @@ function calculateDstArgs(entry) {
         srcVideoBitrate,
         srcFrameRate,
         srcDuration,
-        srcWidth: ivideo?.width || 0,
-        srcHeight: ivideo?.height || 0,
-        srcDuration: info?.duration || 0,
+        srcWidth: srcWidth,
+        srcHeight: srcHeight,
+        srcDuration: srcDuration,
         srcSize: info?.size || 0,
         srcVideoCodec: ivideo?.format,
         srcAudioCodec: iaudio?.format,
@@ -917,13 +984,12 @@ function calculateDstArgs(entry) {
         dstAudioQuality,
         dstVideoQuality,
         dstFrameRate,
-        dstDimension,
         dstWidth,
         dstHeight,
         dstSpeed,
         // 码率智能缩放
-        audioBitrateScaled: dstAudioBitrate !== reqAudioBitrate,
-        videoBitrateScaled: dstVideoBitrate !== dstVideoBitrateFixed,
+        audioBitScale: core.roundNum(dstAudioBitrate / srcAudioBitrate),
+        videoBitScale: core.roundNum(dstVideoBitrate / srcVideoBitrate),
         // 会覆盖preset的同名预设值
         // videoBitrate: dstVideoBitrate,
         videoBitrateK: `${Math.round(dstVideoBitrate / 1000)}K`,
@@ -986,8 +1052,12 @@ function createFFmpegArgs(entry, forDisplay = false) {
     inputArgs.push("-v", entry.argv.debug ? "repeat+level+info" : "error")
     // 输出视频时才需要cuda加速，音频用cpu就行
     if (tempPreset.type === 'video') {
-        // -hwaccel cuda -hwaccel_output_format cuda
-        inputArgs = inputArgs.concat(["-stats", "-hwaccel", "cuda", "-hwaccel_output_format", "cuda"])
+        inputArgs.push("-stats")
+        // 使用cuda硬件解码
+        if (!entry.info.useCPUDecode) {
+            inputArgs.push("-hwaccel", "cuda", "-hwaccel_output_format", "cuda")
+        }
+        // 不支持硬解的格式，如H264-10bit，使用软解
     }
     // 输入参数在输入文件前面，顺序重要
     if (tempPreset.inputArgs?.length > 0) {
@@ -995,12 +1065,18 @@ function createFFmpegArgs(entry, forDisplay = false) {
     }
     inputArgs.push('-i')
     inputArgs.push(forDisplay ? "input.mkv" : `"${entry.path}"`)
-    // 添加MP4内嵌字幕文件
-    if (entry.fileSubtitle) {
-        inputArgs.push('-i')
-        inputArgs.push(`"${entry.fileSubtitle}"`)
+    // 添加MP4内嵌字幕文件，支持多个字幕文件
+    if (entry.subtitles?.length > 0) {
+        // 用于显示和调试
+        tempPreset.subtitles = entry.subtitles.map(item => path.basename(item))
+        entry.subtitles.forEach(item => {
+            inputArgs.push('-i')
+            inputArgs.push(`"${item}"`)
+        })
         const subArgs = '-c:s mov_text -metadata:s:s:0 language=chi -disposition:s:0 default'
         inputArgs = inputArgs.concat(subArgs.split(' '))
+    } else {
+        inputArgs.push('-c:s mov_text')
     }
     //
     //===============================================================
@@ -1022,8 +1098,13 @@ function createFFmpegArgs(entry, forDisplay = false) {
         middleArgs.push('-filter_complex')
         middleArgs.push(`"${formatArgs(tempPreset.complexFilter, tempPreset)}"`)
     } else if (tempPreset.filters?.length > 0) {
+        let tempFilters = tempPreset.filters
+        // 使用软解时，需要传输数据道GPU
+        if (entry.info.useCPUDecode) {
+            tempFilters = 'hwupload_cuda,' + tempFilters
+        }
         middleArgs.push('-vf')
-        middleArgs.push(formatArgs(tempPreset.filters, tempPreset))
+        middleArgs.push(formatArgs(tempFilters, tempPreset))
     }
     // 视频参数
     if (tempPreset.videoArgs?.length > 0) {
@@ -1045,7 +1126,8 @@ function createFFmpegArgs(entry, forDisplay = false) {
             // 针对视频文件
             if (helper.isVideoFile(entry.path)) {
                 // 如果目标码率大于源文件码率，则不重新编码，考虑误差
-                const shouldCopy = tempPreset.dstAudioBitrate + 2000 > tempPreset.srcAudioBitrate
+                const shouldCopy = tempPreset.srcAudioBitrate > 0
+                    && tempPreset.dstAudioBitrate + 2000 > tempPreset.srcAudioBitrate
                 // 如果用户指定不重新编码
                 if (shouldCopy || tempPreset.userArgs.audioCopy) {
                     tempPreset.audioArgs = '-c:a copy'

package/cmd/cmd_moveup.js

@@ -151,6 +151,7 @@ const handler = async function cmdMoveUp(argv) {
                     log.showYellow(logTag, "New Name:", fileDst)
                 }
             }
+            //todo check file size 
             if (await fs.pathExists(fileDst)) {
                 log.showYellow(logTag, "Exists:", fileDst)
                 continue