Upload app.py

app.py

@@ -274,35 +274,26 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
             "-async", "1",    # 音频同步
             temp_video
         ]
-        
         subprocess.run(cmd1, check=True)
-        
-        temp_video2 = os.path.join(project_dir, "temp_video2.mp4")
-
-        subtitle_path = caption_subtitle_file.replace(os.sep, '/')
-        subtitle_path = subtitle_path.replace(':', '\\:')
-
-        # 然后添加字幕 - 先添加caption字幕（底部）
-        caption_filter = f"subtitles='{subtitle_path}':force_style='Alignment=2,WrapStyle=1,Fontsize=15,MarginV=30'"
-        
-        # 再添加speech字幕（顶部）
-        speech_filter = f"subtitles='{subtitle_path}':force_style='Alignment=8,WrapStyle=1,Fontsize=15,MarginV=30'"
 
-        # 将两次字幕处理合并为单个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'"
+        # 处理字幕路径转义（两个不同的字幕文件）
+        caption_path = caption_subtitle_file.replace(os.sep, '/').replace(':', '\\:')
+        speech_path = speech_subtitle_file.replace(os.sep, '/').replace(':', '\\:')
+        # 合并滤镜的正确写法（使用两个subtitles滤镜）
+        combined_filter = f"subtitles='{caption_path}':force_style='Alignment=2,WrapStyle=1,Fontsize=15,MarginV=30'," \
+                                    f"subtitles='{speech_path}':force_style='Alignment=8,WrapStyle=1,Fontsize=15,MarginV=30'"
         cmd_combined = [
             "ffmpeg", "-y",
             "-i", temp_video,
             "-vf", combined_filter,
             "-c:a", "copy",
-            output_video
+            output_video  # 直接输出到最终文件，无需temp_video2
         ]
         
         subprocess.run(cmd_combined, check=True)
         
-        # 删除临时文件
+        # 删除临时文件（只需删除temp_video）
         os.remove(temp_video)
-        os.remove(temp_video2)
         
         return output_video
     except Exception as e: