Upload app.py

app.py

@@ -277,37 +277,28 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
         
         subprocess.run(cmd1, check=True)
         
-        # 然后添加字幕 - 先添加caption字幕（底部）
         temp_video2 = os.path.join(project_dir, "temp_video2.mp4")
 
         subtitle_path = caption_subtitle_file.replace(os.sep, '/')
         subtitle_path = subtitle_path.replace(':', '\\:')
-        caption_filter = f"subtitles='{subtitle_path}'"
-        
-        cmd2 = [
-            "ffmpeg", "-y",
-            "-i", temp_video,
-            "-vf", caption_filter,
-            "-c:a", "copy",
-            temp_video2
-        ]
-        
-        subprocess.run(cmd2, check=True)
+
+        # 然后添加字幕 - 先添加caption字幕（底部）
+        caption_filter = f"subtitles='{subtitle_path}':force_style='Alignment=2,WrapStyle=1,Fontsize=15,MarginV=30'"
         
         # 再添加speech字幕（顶部）
-        subtitle_path = speech_subtitle_file.replace(os.sep, '/')
-        subtitle_path = subtitle_path.replace(':', '\\:')
-        speech_filter = f"subtitles='{subtitle_path}'"
+        speech_filter = f"subtitles='{subtitle_path}':force_style='Alignment=8,WrapStyle=1,Fontsize=15,MarginV=30'"
 
-        cmd3 = [
+        # 将两次字幕处理合并为单个FFmpeg命令（替换原来的cmd2和cmd3）
+        combined_filter = f"subtitles='{caption_path}':force_style='Alignment=2,WrapStyle=1,Fontsize=24,MarginV=30 [with_captions]; [with_captions] subtitles='{speech_path}':force_style='Alignment=8,WrapStyle=1,Fontsize=24,MarginV=30'"
+        cmd_combined = [
             "ffmpeg", "-y",
-            "-i", temp_video2,
-            "-vf", speech_filter,
+            "-i", temp_video,
+            "-vf", combined_filter,
             "-c:a", "copy",
             output_video
         ]
         
-        subprocess.run(cmd3, check=True)
+        subprocess.run(cmd_combined, check=True)
         
         # 删除临时文件
         os.remove(temp_video)