Upload app.py

app.py

@@ -18,6 +18,7 @@ from fastapi.staticfiles import StaticFiles
 from pydub import AudioSegment
 import shlex
 from ffmpeg import probe as ffmpeg_probe  # 需要安装ffmpeg-python包
+import time
 
 # 配置日志
 logging.basicConfig(level=logging.INFO)
@@ -252,17 +253,33 @@ async def create_audio_file(project_dir, captions, speeches):
         return None, {}, [], []
 
 def get_video_dimensions(video_path):
-    """获取视频分辨率"""
     try:
-        probe = ffmpeg_probe(video_path)
-        video_stream = next(s for s in probe['streams'] if s['codec_type'] == 'video')
-        return int(video_stream['width']), int(video_stream['height'])
+        result = subprocess.run(
+            ["ffprobe", "-v", "error", "-select_streams", "v:0",
+             "-show_entries", "stream=width,height", "-of", "json", video_path],
+            capture_output=True,
+            text=True
+        )
+        data = json.loads(result.stdout)
+        return (int(data['streams'][0]['width']), 
+                int(data['streams'][0]['height']))
     except Exception as e:
-        logger.warning(f"Can't detect video dimensions: {e}, using default 1920x1080")
+        logger.warning(f"Video dimension detection failed: {e}")
         return (1920, 1080)
 
+def process_sub_path(path):
+    # 统一处理所有特殊字符
+    return shlex.quote(
+        str(Path(path).resolve())
+            .replace(':', '\\:')
+            .replace(' ', '\\ ')
+            .replace('(', '\\(')
+            .replace(')', '\\)')
+    )
+
 # 创建视频
-def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitle_file, audio_file, output_video, audio_durations, panel_start_times, panel_durations):
+def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitle_file, 
+               audio_file, output_video, audio_durations, panel_start_times, panel_durations):
     try:
         # 创建帧列表文件 - 使用精确的面板持续时间
         frames_list = os.path.join(project_dir, "frames.txt")
@@ -288,75 +305,47 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
         ]
         subprocess.run(cmd1, check=True)
 
-        # 动态获取视频参数
+        # 获取视频尺寸（使用改进后的方法）
         video_width, video_height = get_video_dimensions(temp_video)
         base_fontsize = max(24, video_width // 50)
-        
-        # 智能样式计算
-        style_config = {
-            "caption": {
-                "fontsize": int(base_fontsize * 0.9),
-                "margin_v": video_height // 10,
-                "alignment": 2  # 底部居中
-            },
-            "speech": {
-                "fontsize": base_fontsize,
-                "margin_v": video_height // 12,
-                "alignment": 8  # 顶部居中
-            }
-        }
-        # 安全处理字幕路径
-        def process_sub_path(path):
-            return shlex.quote(
-                Path(path).resolve().as_posix()
-                    .replace(':', '\\:')
-            )
-        # 构建复合滤镜
+        # 构建滤镜链
         combined_filter = (
             f"subtitles={process_sub_path(caption_subtitle_file)}:"
-            f"force_style="
-            f"'Fontname=Roboto-Bold,"
-            f"Fontsize={style_config['caption']['fontsize']},"
-            f"Alignment={style_config['caption']['alignment']},"
-            f"MarginV={style_config['caption']['margin_v']},"
-            f"Outline=1,Shadow=1,BackColour=&H40000000,"
-            f"BorderStyle=3,WordWrap=1,WrapStyle=2;"
+            "force_style='Fontsize={},Alignment=2,MarginV={},Outline=1'".format(
+                int(base_fontsize*0.9), 
+                video_height//10
+            ),
             f"subtitles={process_sub_path(speech_subtitle_file)}:"
-            f"force_style="
-            f"'Fontname=Roboto-Bold,"
-            f"Fontsize={style_config['speech']['fontsize']},"
-            f"Alignment={style_config['speech']['alignment']},"
-            f"MarginV={style_config['speech']['margin_v']},"
-            f"Outline=1,Shadow=1,BackColour=&H40000000,"
-            f"BorderStyle=1,WordWrap=1,WrapStyle=2'"
+            "force_style='Fontsize={},Alignment=8,MarginV={},Outline=1'".format(
+                base_fontsize,
+                video_height//12
+            )
         )
-        # 优化视频处理命令
+        filter_chain = ",".join(combined_filter)
+        # 优化ffmpeg命令
         cmd_combined = [
             "ffmpeg", "-y",
             "-i", temp_video,
-            "-vf", combined_filter,
+            "-vf", filter_chain,
             "-c:a", "copy",
             "-c:v", "libx264",
             "-preset", "fast",
             "-movflags", "+faststart",
-            "-x264-params", "log-level=error",
-            "-hide_banner",
-            "-loglevel", "error",
             output_video
         ]
-        
-        # 执行并计时
-        logger.info("Starting video processing with optimized subtitles")
+        # 添加执行计时
         start_time = time.time()
         subprocess.run(cmd_combined, check=True)
-        logger.info(f"Video processing completed in {time.time()-start_time:.2f}s")
+        logger.info(f"Video processed in {time.time()-start_time:.2f}s")
         # 清理临时文件
         os.remove(temp_video)
-        Path(frames_list).unlink(missing_ok=True)
         return output_video
+    except subprocess.CalledProcessError as e:
+        logger.error(f"FFmpeg failed with cmd: {' '.join(e.cmd)}")
+        logger.error(f"FFmpeg stderr: {e.stderr}")
+        return None
     except Exception as e:
-        logger.error(f"Video creation failed: {str(e)}")
-        logger.debug(f"Filter chain used: {combined_filter}")
+        logger.error(f"Unexpected error: {str(e)}")
         return None
 
 # 使用本地存储