Update app.py

app.py

@@ -445,10 +445,56 @@ def ffmpeg_resize_video(input_path, output_path, target_ratio):
         else:
             filter_complex = "scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2:black"
         
-        command = build_ffmpeg_command(input_path, 0, 0, output_path, 'resize')
-        # 在resize操作中插入滤镜
-        command.insert(-5, '-vf')  # 在-y之前插入
-        command.insert(-4, filter_complex)
+        # 重新构建命令，确保参数顺序正确
+        command = [
+            'ffmpeg', '-threads', str(get_optimal_threads()),
+            '-i', input_path,
+            '-vf', filter_complex
+        ]
+        
+        # 添加编码参数
+        if HARDWARE_ACCEL['working']:
+            # 硬件编码参数
+            if HARDWARE_ACCEL['encoder'] == 'h264_nvenc':
+                command.extend([
+                    '-c:v', 'h264_nvenc',
+                    '-preset', 'fast',
+                    '-cq', '28',
+                    '-c:a', 'copy',
+                    '-movflags', '+faststart',
+                    '-y', output_path
+                ])
+            elif HARDWARE_ACCEL['encoder'] == 'h264_amf':
+                command.extend([
+                    '-c:v', 'h264_amf',
+                    '-quality', 'speed',
+                    '-rc', 'cqp',
+                    '-cqp_i', '28',
+                    '-cqp_p', '28',
+                    '-c:a', 'copy',
+                    '-movflags', '+faststart',
+                    '-y', output_path
+                ])
+            elif HARDWARE_ACCEL['encoder'] == 'h264_qsv':
+                command.extend([
+                    '-c:v', 'h264_qsv',
+                    '-preset', 'veryfast',
+                    '-global_quality', '28',
+                    '-c:a', 'copy',
+                    '-movflags', '+faststart',
+                    '-y', output_path
+                ])
+        else:
+            # 软件编码参数
+            command.extend([
+                '-c:v', 'libx264',
+                '-preset', 'ultrafast',
+                '-crf', '28',
+                '-tune', 'fastdecode',
+                '-c:a', 'copy',
+                '-movflags', '+faststart',
+                '-y', output_path
+            ])
         
         print(f"执行FFmpeg调整命令: {' '.join(command)}")  # 调试输出
         
@@ -467,9 +513,18 @@ def ffmpeg_resize_video(input_path, output_path, target_ratio):
                 HARDWARE_ACCEL['encoder'] = 'libx264'
                 
                 # 重新构建命令，使用软件编码
-                command = build_ffmpeg_command(input_path, 0, 0, output_path, 'resize')
-                command.insert(-5, '-vf')  # 在-y之前插入
-                command.insert(-4, filter_complex)
+                command = [
+                    'ffmpeg', '-threads', str(get_optimal_threads()),
+                    '-i', input_path,
+                    '-vf', filter_complex,
+                    '-c:v', 'libx264',
+                    '-preset', 'ultrafast',
+                    '-crf', '28',
+                    '-tune', 'fastdecode',
+                    '-c:a', 'copy',
+                    '-movflags', '+faststart',
+                    '-y', output_path
+                ]
                 
                 print(f"重试FFmpeg调整命令(软件编码): {' '.join(command)}")
                 result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)