添加合并文件性能限制

648540858
1 parent 753efef3
Showing 3 changed files with 14 additions and 0 deletions
src/main/java/top/panll/assist/dto/UserSettings.java
src/main/java/top/panll/assist/service/FFmpegExecUtils.java
src/main/resources/application-dev.yml
@@ -21,6 +21,9 @@ public class UserSettings {
     @Value("${userSettings.ffprobe}")
     private String ffprobe;
+    @Value("${userSettings.threads:2}")
+    private int threads;
+
     public String getRecord() {
         return record;
     }
@@ -64,4 +67,12 @@ public class UserSettings {
     public void setRecordTempDay(int recordTempDay) {
         this.recordTempDay = recordTempDay;
     }
+
+    public int getThreads() {
+        return threads;
+    }
+
+    public void setThreads(int threads) {
+        this.threads = threads;
+    }
 }
@@ -116,6 +116,7 @@ public class FFmpegExecUtils implements InitializingBean{
                 .overrideOutputFiles(true)
                 .setInput(fileListName) // Or filename
                 .addExtraArgs("-safe", "0")
+                .addExtraArgs("-threads", userSettings.getThreads() + "")
                 .addOutput(recordFileResultPath)
                 .setVideoCodec("copy")
                 .setAudioCodec("copy")
@@ -38,6 +38,8 @@ userSettings:
     ffmpeg: /usr/bin/ffmpeg
     # [必选 ] ffprobe路径， 一般安装ffmpeg就会自带， 一般跟ffmpeg在同一目录,用于查询文件的信息
     ffprobe: /usr/bin/ffprobe
+    # [可选 ] 限制 ffmpeg 合并文件使用的线程数，间接限制cpu使用率， 默认2 限制到50%
+    threads: 2
 swagger-ui:
     enabled: true