mediac 1.8.5 → 2.0.0

package/README.md

@@ -2,7 +2,7 @@
 
 MediaCli is a multimedia file processing tool that utilizes ffmpeg and exiftool, among others, to compress/convert/rename/delete/organize media files, including images, videos, and audio.
 
-created at 2021.07, updated at 2024.04.07
+created at 2021.07, updated at 2026.01.16
 
 ## Installation
 
@@ -19,47 +19,52 @@ mediac --help
 ## Command Line
 
 ```
+==============================================================
 Usage: media_cli.js <command> <input> [options]
 
 Commands:
-  media_cli.js test                       Test command, do nothing
+  media_cli.js test                         Test command, do nothing
                                                          [default] [aliases: tt]
-  media_cli.js dcimr <input> [options]    Rename media files by exif metadata eg
-                                          . date             [aliases: dm, dcim]
-  media_cli.js organize <input> [output]  Organize pictures by file modified dat
-                                          e                        [aliases: oz]
-  media_cli.js lrmove <input> [output]    Move JPEG output of RAW files to other
-                                           folder                  [aliases: lv]
-  media_cli.js thumbs <input> [output]    Make thumbs for input images
-                                                                   [aliases: tb]
-  media_cli.js compress <input> [output]  Compress input images to target size
+  media_cli.js dcimr <input> [options]      Rename media files by exif metadata
+                                            eg. date         [aliases: dm, dcim]
+  media_cli.js organize <input> [output]    Organize pictures by file modified d
+                                            ate                    [aliases: oz]
+  media_cli.js lrmove <input> [output]      Move JPEG output of RAW files to oth
+                                            er folder              [aliases: lv]
+  media_cli.js compress <input> [output]    Compress input images to target size
                                                               [aliases: cs, cps]
-  media_cli.js remove <input> [output]    Remove files by given size/width-heigh
-                                          t/name-pattern/file-list
+  media_cli.js remove [input] [directories  Remove files by given size/width-hei
+  ...]                                      ght/name-pattern/file-list
                                                               [aliases: rm, rmf]
-  media_cli.js moveup <input> [output]    Move files to sub top folder or top fo
-                                          lder                     [aliases: mu]
-  media_cli.js prefix <input> [output]    Rename files by append dir name or str
-                                          ing                  [aliases: pf, px]
-  media_cli.js fixname <input> [output]   Fix filenames (fix messy, clean, conve
-                                          rt tc to sc)        [aliases: fn, fxn]
-  media_cli.js zipu <input> [output]      Smart unzip command (auto detect encod
-                                          ing)             [aliases: zipunicode]
-  media_cli.js decode <strings...>        Decode text with messy or invalid char
-                                          s                        [aliases: dc]
+  media_cli.js moveup <input> [output]      Move files to sub top folder or top
+                                            folder                 [aliases: mp]
+  media_cli.js move <input> [output]        Move files to folders by filename da
+                                            te patterns            [aliases: md]
+  media_cli.js prefix <input> [output]      Rename files by append dir name or s
+                                            tring              [aliases: pf, px]
+  media_cli.js rename <input>               Reanme files: fix encoding, replace
+                                            by regex, clean chars, from tc to sc
+                                            .                 [aliases: fn, fxn]
+  media_cli.js zipu <input> [output]        Smart unzip command (auto detect enc
+                                            oding)         [aliases: zipunicode]
+  media_cli.js decode <strings...>          Decode text with messy or invalid ch
+                                            ars                    [aliases: dc]
+  media_cli.js ffmpeg [input] [directories  convert audio or video files using f
+  ...]                                      fmpeg.
+                                      [aliases: transcode, aconv, vconv, avconv]
 
 Options:
       --version  Show version number                                   [boolean]
   -h, --help     Show help                                             [boolean]
 
 MediaCli is a multimedia file processing tool.
-Copyright 2021-2025 @ Zhang Xiaoke
+Copyright 2021-2026 @ Zhang Xiaoke
 
 ```
 
 ## License
 
-    Copyright 2021-2025 github@mcxiaoke.com
+    Copyright 2021-2026 github@mcxiaoke.com
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

package/cmd/cmd_compress.js

@@ -219,11 +219,11 @@ async function cmdCompress(argv) {
     needBar && bar1.stop()
     log.info(logTag, "before filter: ", tasks.length)
     const total = tasks.length
-    tasks = tasks.filter((t) => t?.dst)
+    tasks = tasks.filter((t) => t?.dst && t.tmpDst && !t?.shouldSkip)
     const skipped = total - tasks.length
     log.info(logTag, "after filter: ", tasks.length)
     if (skipped > 0) {
-        log.showYellow(logTag, `${skipped} thumbs skipped`)
+        log.showYellow(logTag, `${skipped} image files skipped`)
     }
     if (tasks.length === 0) {
         log.showYellow("Nothing to do, abort.")
@@ -303,7 +303,7 @@ async function preCompress(f) {
 
     let fileDstDir = f.output ? helper.pathRewrite(f.root, dir, f.output, false) : dir
     const tempSuffix = `_tmp@${helper.textHash(fileSrc)}@tmp_`
-    const fileDstTmp = path.join(fileDstDir, `${base}${suffix}${tempSuffix}.jpg`)
+    const fileDstTmp = path.resolve(path.join(fileDstDir, `${base}${suffix}${tempSuffix}.jpg`))
     // 构建目标文件路径，添加压缩后的文件名后缀 
     let fileDst = path.join(fileDstDir, `${base}${suffix}.jpg`)
 
@@ -325,7 +325,6 @@ async function preCompress(f) {
             height: 0,
             src: fileSrc,
             dst: fileDst,
-            tmpDst: fileDstTmp,
             dstExists: true,
             shouldSkip: true,
             skipReason: 'DST EXISTS',

package/cmd/cmd_dcim.js

@@ -86,7 +86,10 @@ const handler = async function cmdRename(argv) {
     let files = await exif.listMedia(root)
     const fileCount = files.length
     log.show(LOG_TAG, `Total ${files.length} media files found`)
-
+    if (files.length === 0) {
+        log.showYellow(LOG_TAG, "No files found, exit now.")
+        return
+    }
     const confirmFiles = await inquirer.prompt([
         {
             type: "confirm",
@@ -142,7 +145,11 @@ const handler = async function cmdRename(argv) {
         `Total ${files.length} media files ready to rename by exif`,
         fastMode ? "(FastMode)" : ""
     )
-    log.show(LOG_TAG, `task sample:`, files.slice(-2))
+
+    log.show(LOG_TAG, `task sample list:`)
+    for (const f of files.slice(-20)) {
+        log.show(path.basename(f.path), f.outName, f.date)
+    }
     log.info(LOG_TAG, argv)
     testMode && log.showYellow("++++++++++ TEST MODE (DRY RUN) ++++++++++")
     const answer = await inquirer.prompt([

package/cmd/cmd_ffmpeg.js

@@ -58,11 +58,24 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             type: "string",
         })
         // 保持源文件目录结构
-        .option("output-tree", {
-            alias: 'otree',
-            describe: "keep folder tree structure in output folder",
-            type: "boolean",
-            default: true,
+        .option("output-mode", {
+            alias: 'om',
+            type: "choices",
+            choices: ['tree', 'dir', 'file'],
+            default: 'dir',
+            describe: "Output mode: keep folder tree/keep parent dir/ flatten files",
+        })
+        // 列表处理，起始索引
+        .option('start', {
+            type: 'number',
+            default: 0,
+            description: 'start index of file list to process'
+        })
+        // 列表处理，每次数目
+        .option('count', {
+            type: 'number',
+            default: 99999,
+            description: 'group size of file list to process'
         })
         // 正则，包含文件名规则
         .option("include", {
@@ -226,6 +239,13 @@ const builder = function addOptions(ya, helpOrVersionSet) {
             describe: "hardware acceleration for video decode and encode",
             type: "string",
         })
+        // 仅使用硬件解码
+        .option("decode-mode", {
+            type: "choices",
+            choices: ['auto', 'gpu', 'cpu'],
+            default: 'auto',
+            describe: "video decode mode: auto/gpu/cpu",
+        })
         // 并行操作限制，并发数，默认为 CPU 核心数
         .option("jobs", {
             alias: "j",
@@ -265,7 +285,8 @@ async function cmdConvert(argv) {
     // 显示预设列表
     if (argv.showPresets) {
         for (const [key, value] of presets.getAllPresets()) {
-            log.show(core.pick(value, 'name', 'type', 'format'))
+            const data = core.pick(value, 'name', 'type', 'format', 'videoBitrate', 'dimension')
+            log.show(JSON.stringify(data))
         }
         return
     }
@@ -300,7 +321,7 @@ async function cmdConvert(argv) {
     const walkOpts = {
         withFiles: true,
         needStats: true,
-        entryFilter: (e) => e.isFile && helper.isMediaFile(e.name)
+        entryFilter: (e) => e.isFile && helper.isVideoFile(e.name)
     }
     let fileEntries = await mf.walk(root, walkOpts)
     // 处理额外目录参数
@@ -337,12 +358,17 @@ async function cmdConvert(argv) {
         log.showYellow(logTag, 'No files left after rules, nothing to do.')
         return
     }
+
+    // 如果指定了start和count，截取列表部分
+    fileEntries = fileEntries.slice(argv.start, argv.start + argv.count)
+    log.show(logTag, `Total ${fileEntries.length} files left in (${argv.start}-${argv.start + argv.count})`)
+
     // 仅显示视频文件参数，不进行转换操作
     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))
+            log.show(logTag, info)
         }
         return
     }
@@ -394,7 +420,7 @@ async function cmdConvert(argv) {
         return
     }
     log.showGreen(logTag, 'Now Preparing task files and ffmpeg cmd args...')
-    let tasks = await pMap(fileEntries, prepareFFmpegCmd, { concurrency: argv.jobs || (core.isUNCPath(root) ? 4 : cpus().length) })
+    let tasks = await pMap(fileEntries, prepareFFmpegCmd, { concurrency: argv.jobs || (core.isUNCPath(root) ? 4 : cpus().length - 2) })
 
     // 如果选择了清理源文件
     if (argv.deleteSourceFiles) {
@@ -429,8 +455,8 @@ async function cmdConvert(argv) {
     const lastTask = tasks.slice(-1)[0]
     !testMode && log.fileLog(`ffmpegArgs:`, lastTask.ffmpegArgs.flat(), 'FFConv')
     log.show('-----------------------------------------------------------')
-    log.showYellow(logTag, 'PRESET:', lastTask.debugPreset)
-    log.showCyan(logTag, 'CMD: ffmpeg', lastTask.ffmpegArgs.flat().join(' '))
+    log.show(logTag, chalk.cyan('PRESET:'), lastTask.debugPreset)
+    log.show(logTag, chalk.cyan('CMD:'), 'ffmpeg', lastTask.ffmpegArgs.flat().join(' '))
     const totalDuration = tasks.reduce((acc, t) => acc + t.info?.duration || 0, 0)
     log.show('-----------------------------------------------------------')
     testMode && log.showYellow('++++++++++ TEST MODE (DRY RUN) ++++++++++')
@@ -466,21 +492,54 @@ async function cmdConvert(argv) {
         tasks = core.takeEveryNth(tasks, Math.floor(tasks.length / 10))
     }
     const results = await pMap(tasks, runFFmpegCmd, { concurrency: jobCount })
+    let failedTasks = results.filter(r => r && r.ffmpegFailed && !r.retryOnFailed)
+    let rOKCount = 0
+    if (failedTasks.length > 0) {
+        const answer = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'yes',
+                default: false,
+                message: chalk.bold.red(
+                    `${failedTasks.length} tasks failed, do you want to retry these tasks?`
+                )
+            }
+        ])
+        if (answer.yes) {
+            for (const ft of failedTasks) {
+                log.showYellow(logTag, `Retrying task: ${ft.path}`
+                )
+                let newFT = core.omit(ft, 'ffmpegArgs', 'info')
+                // 强制使用CPU解码f
+                newFT.argv.decodeMode = 'cpu'
+                newFT.retryOnFailed = true
+                const task = await prepareFFmpegCmd(newFT)
+                const rt = await runFFmpegCmd(task)
+                if (rt && rt.ok) {
+                    rOKCount++
+                }
+            }
+        }
+    }
+
     // const results = await core.asyncMapGroup(tasks, runFFmpegCmd, jobCount)
     testMode && log.showYellow(logTag, 'NO file processed in TEST MODE.')
     const okResults = results.filter(r => r && r.ok)
-    !testMode && log.showGreen(logTag, `Total ${okResults.length} files processed in ${helper.humanTime(startMs)}`)
+    !testMode && log.showGreen(logTag, `Total ${okResults.length + rOKCount} files processed in ${helper.humanTime(startMs)}`)
 }
 
 async function runFFmpegCmd(entry) {
     const ipx = `${entry.index + 1}/${entry.total}`
-    const logTag = chalk.green('FFCMD')
-    log.show(logTag, `${ipx} Processing ${helper.pathShort(entry.path, 72)}`, helper.humanSize(entry.size), chalk.green(helper.humanSeconds(entry.dstArgs.srcDuration)), chalk.yellow(entry.preset.name), helper.humanTime(entry.startMs))
+    let logTag = chalk.green('FFCMD') + chalk.cyanBright(entry.useCPUDecode ? '[SW]' : '[HW]')
+    if (entry.retryOnFailed) {
+        logTag += chalk.red('(R)')
+    }
+    log.show(logTag, chalk.yellow(ipx), chalk.cyan(`Processing`), `${helper.pathShort(entry.path, 72)}`, helper.humanSize(entry.size), chalk.yellow(helper.humanSeconds(entry.dstArgs.srcDuration)), entry.preset.name, helper.humanTime(entry.startMs))
 
     // 每10个输出一次ffmpeg详细信息，避免干扰
     // if (entry.index % 10 === 0) {
-    log.showCyan(logTag, getEntryShowInfo(entry))
-    log.showGray(logTag, `ffmpeg`, entry.ffmpegArgs.flat().join(' '))
+    log.showGray(logTag, ipx, getEntryShowInfo(entry))
+    log.showGray(logTag, ipx, `ffmpeg`, entry.ffmpegArgs.flat().join(' '))
     // }
     const exePath = await which('ffmpeg')
     if (entry.testMode) {
@@ -502,13 +561,15 @@ async function runFFmpegCmd(entry) {
         // https://2ality.com/2022/07/nodejs-child-process.html
         // Windows下 { shell: true } 必须，否则报错
         const ffmpegProcess = execa(exePath, ffmpegArgs, { shell: true, encoding: 'binary' })
-        ffmpegProcess.pipeStdout(process.stdout)
-        ffmpegProcess.pipeStderr(process.stderr)
+        if (ffmpegProcess?.hasOwnProperty('pipeStdout')) {
+            ffmpegProcess.pipeStdout(process.stdout)
+            ffmpegProcess.pipeStderr(process.stderr)
+        }
         const { stdout, stderr } = await ffmpegProcess
         // const stdoutFixed = fixEncoding(stdout || "")
         // const stderrFixed = fixEncoding(stderr || "")
         if (await fs.pathExists(entry.fileDst)) {
-            log.showYellow(logTag, `${ipx} DstExists ${entry.fileDst}`, helper.humanSize(entry.size), chalk.yellow(entry.preset.name), helper.humanTime(ffmpegStartMs))
+            log.showYellow(logTag, `${ipx} DstExists ${entry.fileDst}`, helper.humanSize(entry.size), entry.preset.name, helper.humanTime(ffmpegStartMs))
             await fs.remove(entry.fileDstTemp)
             return
         }
@@ -516,7 +577,7 @@ async function runFFmpegCmd(entry) {
             const dstSize = (await fs.stat(entry.fileDstTemp))?.size || 0
             if (dstSize > 20 * mf.FILE_SIZE_1K) {
                 await fs.move(entry.fileDstTemp, entry.fileDst)
-                log.showGreen(logTag, `${ipx} Done ${entry.fileDst}`, chalk.cyan(`${helper.humanSize(entry.size)}=>${helper.humanSize(dstSize)}`), chalk.yellow(entry.preset.name), helper.humanTime(ffmpegStartMs))
+                log.show(logTag, chalk.yellow(ipx), chalk.green('Done'), `${entry.fileDst}`, chalk.cyan(`${helper.humanSize(entry.size)}=>${helper.humanSize(dstSize)}`), entry.preset.name, helper.humanTime(ffmpegStartMs))
                 log.fileLog(`${ipx} Done <${entry.fileDst}> [${entry.preset.name}] (${helper.humanSize(dstSize)})`, 'FFCMD')
                 entry.ok = true
                 return entry
@@ -527,10 +588,15 @@ async function runFFmpegCmd(entry) {
         log.showYellow(logTag, `${ipx} Failed ${entry.path}`, entry.preset.name, helper.humanSize(dstSize))
         log.fileLog(`${ipx} Failed <${entry.path}> [${entry.dstAudioBitrate || entry.preset.name}]`, 'FFCMD')
     } catch (error) {
-        const errMsg = (error.stderr || error.message || '[Unknown]').substring(0, 360)
-        log.showRed(logTag, `Error(${ipx}) ${errMsg}`)
+        const errMsg = (error.stderr || error.message || '[Unknown]').substring(0, 160)
+        log.showRed(logTag, `Error(${ipx}) <${entry.path}>`, errMsg)
+        log.showYellow(logTag, `Media(${ipx}) <${entry.path}>`, JSON.stringify(entry.info?.video || entry.info?.audio))
         log.fileLog(`Error(${ipx}) <${entry.path}> [${entry.preset.name}] ${errMsg}`, 'FFCMD')
         await writeErrorFile(entry, error)
+        // 转换失败需要重试，使用CPUDecode
+        entry.ffmpegFailed = true
+        entry.ffmpegError = errMsg
+        return entry
     } finally {
         await fs.remove(entry.fileDstTemp)
     }
@@ -561,24 +627,36 @@ async function writeErrorFile(entry, error) {
 }
 
 async function prepareFFmpegCmd(entry) {
-    const logTag = chalk.green('Prepare')
+    const preset = entry.preset
+    const argv = entry.argv
+    let logTag = chalk.green(`Prepare[${entry.argv.decodeMode.toUpperCase()}]`)
+    if (entry.retryOnFailed) {
+        logTag += chalk.red('(R)')
+    }
     const ipx = `${entry.index + 1}/${entry.total}`
     log.info(logTag, `Processing(${ipx}) file: ${entry.path}`)
     const isAudio = helper.isAudioFile(entry.path)
+    const isVideo = helper.isVideoFile(entry.path)
     const [srcDir, srcBase, srcExt] = helper.pathSplit(entry.path)
-    const preset = entry.preset
-    const argv = entry.argv
     const dstExt = preset.format || srcExt
     let fileDstDir
     // 命令行参数指定输出目录
     if (argv.output) {
-        // 默认true 保留目录结构，可以防止文件名冲突
-        if (argv.outputTree) {
-            // 如果要保持源文件目录结构
-            fileDstDir = helper.pathRewrite(entry.root, srcDir, preset.output)
-        } else {
+        switch (argv.outputMode) {
+            case 'tree':
+                // 如果要保持源文件目录结构
+                fileDstDir = helper.pathRewrite(entry.root, srcDir, preset.output)
+                break
+            case 'file':
+                // 不保留目录结构，直接输出文件
+                fileDstDir = path.resolve(preset.output)
+                break
             // 不保留源文件目录结构，只保留源文件父目录
-            fileDstDir = path.join(preset.output, path.basename(srcDir))
+            case 'dir':
+                fileDstDir = path.join(preset.output, path.basename(srcDir))
+                break
+            default:
+                throw new Error(`Unknown output mode: ${argv.outputMode}`)
         }
     } else {
         // 如果没有指定输出目录，直接输出在原文件同目录
@@ -665,7 +743,7 @@ async function prepareFFmpegCmd(entry) {
         const fileDstSameDir = path.join(srcDir, `${fileDstName}`)
 
         if (await fs.pathExists(fileDst)) {
-            log.info(
+            log.showYellow(
                 logTag,
                 `${ipx} Skip[Dst1]: ${entry.path} (${helper.humanSize(entry.size)})`)
             return {
@@ -678,7 +756,7 @@ async function prepareFFmpegCmd(entry) {
         if (prefix || suffix) {
             // if (fileDstName !== entry.name) {
             if (await fs.pathExists(fileDstSameDir)) {
-                log.info(
+                log.showYellow(
                     logTag,
                     `${ipx} Skip[Dst2]: ${entry.path} (${helper.humanSize(entry.size)})`)
                 return {
@@ -688,20 +766,42 @@ async function prepareFFmpegCmd(entry) {
             }
         }
 
-        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
+        const duration = newEntry.info?.duration || ivideo?.duration || iaudio?.duration || 0
+        // 跳过过短的文件
+        if (duration < 5) {
+            log.showYellow(
+                logTag,
+                `$${ipx} Skip[Short]: ${entry.path} (${helper.humanSize(entry.size)}) Duration=($ {duration}s)`)
+            return false
+        }
+
+        const ivideo = newEntry.info?.video
+        const iaudio = newEntry.info?.audio
+        if (isVideo) {
+            switch (argv.decodeMode) {
+                case 'cpu':
+                    newEntry.useCPUDecode = true
+                    break
+                case 'gpu':
+                    newEntry.useCPUDecode = false
+                    break
+                case 'auto':
+                default:
+                    {
+                        // https://developer.nvidia.com/video-encode-and-decode-gpu-support-matrix-new
+                        // H264 10Bit Nvidia和Intel都不支持硬解，直接跳过
+                        // H264 High L5以上可能也不支持
+                        const isH264 = ivideo?.format === 'h264' || ivideo?.format === 'avc'
+                        const isHigh50 = ivideo?.profile?.includes('High') && ivideo?.level > 4.2
+                        if (isH264 && (ivideo?.bitDepth === 10 || isHigh50)) {
+                            // 添加标志，使用软解，替换解码参数
+                            // 在组装ffmpeg参数时判断和替换
+                            // 解码和滤镜参数都需要修改
+                            // 尝试使用CPU解码
+                            newEntry.useCPUDecode = true
+                        }
+                    }
+                    break
             }
         }
 
@@ -718,12 +818,10 @@ async function prepareFFmpegCmd(entry) {
                 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)
-        log.showGray(logTag, getEntryShowInfo(newEntry))
+        const codecInfo = isAudio ? `${iaudio?.format}(${iaudio?.sampleRate},${iaudio?.bitrate},${iaudio.duration})` : `${ivideo?.format}(${ivideo?.profile}@${ivideo?.level},${ivideo?.bitDepth})`
+        log.show(logTag, chalk.cyan(`${ipx} SRC`), chalk.yellow(newEntry.useCPUDecode ? `SW` : `HW`), `"${helper.pathShort(entry.path, 80)}"`, subtitles.length > 0 ? "(SUBS)" : "", codecInfo, helper.humanSize(entry.size), chalk.yellow(entry.preset.name), helper.humanTime(entry.startMs))
+        log.showGray(logTag, `${ipx} DST`, fileDst)
+        log.showGray(logTag, `${ipx}`, getEntryShowInfo(newEntry))
         newEntry = {
             ...newEntry,
             fileDstDir,
@@ -767,42 +865,50 @@ function kNum(value) {
 
 // 显示媒体编码和码率信息，调试用
 function getEntryShowInfo(entry) {
+    const ia = entry.info?.audio
+    const iv = entry.info?.video
+    const is = entry.info?.subtitles
     const args = { ...entry, ...entry.dstArgs }
     const ac = args.srcAudioCodec
     const vc = args.srcVideoCodec
     const showText = []
-    showText.push(`pt:${entry.preset.name}`)
+    // showText.push(`pt:${entry.preset.name}`)
     showText.push(`sz:${helper.humanSize(args.size)}`)
     showText.push(`ts:${helper.humanSeconds(args.srcDuration)}`)
-
-    showText.push(`a:${ac}`)
-    if (args.dstAudioBitrate !== args.srcAudioBitrate) {
-        showText.push(`ab:${kNum(args.srcAudioBitrate)}=>${kNum(args.dstAudioBitrate)}`)
-    } else {
-        showText.push(`ab:${kNum(args.srcAudioBitrate)}`)
-    }
-    if (args.dstAudioQuality > 0) {
-        showText.push(`aq:${args.dstAudioQuality}`)
-    }
-
-    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}`)
-    } else {
-        showText.push(`fps:${args.srcFrameRate}`)
+    if (ia?.duration) {
+        showText.push(`a:${ac}`)
+        if (args.dstAudioBitrate !== args.srcAudioBitrate) {
+            showText.push(`ab:${kNum(args.srcAudioBitrate)}=>${kNum(args.dstAudioBitrate)}`)
+        } else {
+            showText.push(`ab:${kNum(args.srcAudioBitrate)}`)
+        }
+        if (args.dstAudioQuality > 0) {
+            showText.push(`aq:${args.dstAudioQuality}`)
+        }
     }
-    if (args.speed > 0) {
-        showText.push(`sp:${args.speed}`)
+    if (iv?.duration) {
+        showText.push(`v:${vc}(${iv.profile}@${iv.level})`)
+        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}`)
+        } else {
+            showText.push(`fps:${args.srcFrameRate}`)
+        }
+        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}`)
+        }
     }
-    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}`)
+    if (is?.length > 0) {
+        showText.push(is.map(s => `${s.format}-${s.language}`).join('|'))
     }
     return showText.join(',')
 }
@@ -917,6 +1023,7 @@ function calculateDstArgs(entry) {
         const dstWH = calculateScale(srcWidth, srcHeight, dstDimension)
         dstWidth = dstWH.dstWidth
         dstHeight = dstWH.dstHeight
+        const bigSide = Math.max(dstWidth, dstHeight)
         const srcPixels = srcWidth * srcHeight
         const dstPixels = dstWidth * dstHeight
         // 这个是文件整体码率，如果是是视频文件，等于是视频和音频的码率相加
@@ -931,27 +1038,36 @@ function calculateDstArgs(entry) {
         // 音频和视频码率都不能高于原码率
         dstAudioBitrate = minNoZero(srcAudioBitrate, reqAudioBitrate)
         // 如果源文件不是1080p，这里码率需要考虑分辨率
-        const pixelsScale = PIXELS_1080P / srcPixels
-        dstVideoBitrate = minNoZero(srcVideoBitrate * pixelsScale, reqVideoBitrate)
+        let pixelsScale = 1
+        if (dstDimension > bigSide) {
+            // 如果使用4KPreset压缩1080P视频，需要缩放码率
+            pixelsScale = bigSide / (dstDimension * 1.2)
+        } else if (dstDimension < bigSide) {
+            pixelsScale = PIXELS_1080P / srcPixels
+        } else {
+            pixelsScale = 1
+        }
+        dstVideoBitrate = reqVideoBitrate * pixelsScale
 
-        log.info(entry.name, "fileBitrate", fileBitrate, "srcVideoBitrate", srcVideoBitrate, "reqVideoBitrate", reqVideoBitrate, "dstVideoBitrate", dstVideoBitrate, "pixelsScale", pixelsScale)
+        log.info("calculateDstArgs", entry.name, "fileBitrate", fileBitrate, "srcVideoBitrate", srcVideoBitrate, "reqVideoBitrate", reqVideoBitrate, "dstVideoBitrate", dstVideoBitrate, "pixelsScale", pixelsScale, "bigSide", bigSide, "dstDimension", dstDimension)
         // 小于1080p分辨率，码率也需要缩放
-        if (dstPixels > 0 && dstPixels < PIXELS_1080P) {
+        if (bigSide < 1920) {
             let scaleFactor = dstPixels / PIXELS_1080P
-            // 如果目标码率是4K，暂时吧不考虑
+            // 如果目标码率是4K，暂时不考虑
             // 如果目标码率不是1080p，根据分辨率智能缩放
             // 示例 辨率1920*1080的目标码率是 1600k
             // 1280*720码率 960k
             // scaleFactor = Math.sqrt(scaleFactor)
             // 缩放码率，平滑系数
-            scaleFactor = core.smoothChange(scaleFactor, 1, 0.2)
+            scaleFactor = core.smoothChange(scaleFactor, 1, 0.3)
             // log.info('scaleFactor', scaleFactor)
             dstVideoBitrate = Math.round(dstVideoBitrate * scaleFactor)
-            // 目标分辨率，不能大于源文件分辨率
-            dstVideoBitrate = minNoZero(dstVideoBitrate, srcVideoBitrate)
-            // 取整
-            // dstVideoBitrate = Math.floor(dstVideoBitrate / 1000) * 1000
+
         }
+        // 目标分辨率，不能大于源文件分辨率
+        dstVideoBitrate = minNoZero(dstVideoBitrate, srcVideoBitrate)
+        // 取整
+        // dstVideoBitrate = Math.floor(dstVideoBitrate / 1000) * 1000
     }
 
     // 如果目标帧率大于原帧率，就将目标帧率设置为0，即让ffmpeg自动处理，不添加帧率参数
@@ -1054,7 +1170,7 @@ function createFFmpegArgs(entry, forDisplay = false) {
     if (tempPreset.type === 'video') {
         inputArgs.push("-stats")
         // 使用cuda硬件解码
-        if (!entry.info.useCPUDecode) {
+        if (!entry.useCPUDecode) {
             inputArgs.push("-hwaccel", "cuda", "-hwaccel_output_format", "cuda")
         }
         // 不支持硬解的格式，如H264-10bit，使用软解
@@ -1075,8 +1191,20 @@ function createFFmpegArgs(entry, forDisplay = false) {
         })
         const subArgs = '-c:s mov_text -metadata:s:s:0 language=chi -disposition:s:0 default'
         inputArgs = inputArgs.concat(subArgs.split(' '))
+        // 使用提供的字幕，忽略MKV内置字幕文件
+        inputArgs = inputArgs.concat('-map 0:v -map 0:a -map 1'.split(' '))
     } else {
-        inputArgs.push('-c:s mov_text')
+        // MP4格式仅支持tx3g格式字幕
+        const subs = entry.info?.subtitles
+        if (subs?.length > 0) {
+            const isAllTextSubs = subs?.every(e => e.codec === 'tx3g')
+            if (isAllTextSubs) {
+                inputArgs = inputArgs.concat('-c:s mov_text'.split(' '))
+            } else {
+                // 不支持的字幕直接忽略
+                inputArgs.push('-sn')
+            }
+        }
     }
     //
     //===============================================================
@@ -1100,7 +1228,7 @@ function createFFmpegArgs(entry, forDisplay = false) {
     } else if (tempPreset.filters?.length > 0) {
         let tempFilters = tempPreset.filters
         // 使用软解时，需要传输数据道GPU
-        if (entry.info.useCPUDecode) {
+        if (entry.useCPUDecode) {
             tempFilters = 'hwupload_cuda,' + tempFilters
         }
         middleArgs.push('-vf')