Upload 2 files
Browse files- Dockerfile +2 -2
- app.py +2 -2
Dockerfile
CHANGED
|
@@ -2,9 +2,9 @@ FROM python:3.9-slim
|
|
| 2 |
|
| 3 |
WORKDIR /app
|
| 4 |
|
| 5 |
-
# 安装FFmpeg
|
| 6 |
RUN apt-get update && \
|
| 7 |
-
apt-get install -y ffmpeg && \
|
| 8 |
apt-get clean && \
|
| 9 |
rm -rf /var/lib/apt/lists/*
|
| 10 |
|
|
|
|
| 2 |
|
| 3 |
WORKDIR /app
|
| 4 |
|
| 5 |
+
# 安装FFmpeg和Noto Sans CJK SC字体
|
| 6 |
RUN apt-get update && \
|
| 7 |
+
apt-get install -y ffmpeg fonts-noto-cjk fonts-noto-cjk-extra && \
|
| 8 |
apt-get clean && \
|
| 9 |
rm -rf /var/lib/apt/lists/*
|
| 10 |
|
app.py
CHANGED
|
@@ -282,7 +282,7 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
|
|
| 282 |
|
| 283 |
subtitle_path = caption_subtitle_file.replace(os.sep, '/')
|
| 284 |
subtitle_path = subtitle_path.replace(':', '\\:')
|
| 285 |
-
caption_filter = f"subtitles='{subtitle_path}':force_style='Fontname=
|
| 286 |
|
| 287 |
cmd2 = [
|
| 288 |
"ffmpeg", "-y",
|
|
@@ -297,7 +297,7 @@ def create_video(project_dir, image_paths, caption_subtitle_file, speech_subtitl
|
|
| 297 |
# 再添加speech字幕(顶部)
|
| 298 |
subtitle_path = speech_subtitle_file.replace(os.sep, '/')
|
| 299 |
subtitle_path = subtitle_path.replace(':', '\\:')
|
| 300 |
-
speech_filter = f"subtitles='{subtitle_path}':force_style='Fontname=
|
| 301 |
|
| 302 |
cmd3 = [
|
| 303 |
"ffmpeg", "-y",
|
|
|
|
| 282 |
|
| 283 |
subtitle_path = caption_subtitle_file.replace(os.sep, '/')
|
| 284 |
subtitle_path = subtitle_path.replace(':', '\\:')
|
| 285 |
+
caption_filter = f"subtitles='{subtitle_path}':force_style='Fontname=Noto Sans CJK SC,Alignment=2,FontSize=15,PrimaryColour=&H00E0FFFF,OutlineColour=&H80000000,BackColour=&H40000000,BorderStyle=1,Outline=0.8,Shadow=0.5,MarginV=10'"
|
| 286 |
|
| 287 |
cmd2 = [
|
| 288 |
"ffmpeg", "-y",
|
|
|
|
| 297 |
# 再添加speech字幕(顶部)
|
| 298 |
subtitle_path = speech_subtitle_file.replace(os.sep, '/')
|
| 299 |
subtitle_path = subtitle_path.replace(':', '\\:')
|
| 300 |
+
speech_filter = f"subtitles='{subtitle_path}':force_style='Fontname=Noto Sans CJK SC,Alignment=6,FontSize=15,PrimaryColour=&H00FFCCE6,OutlineColour=&H80000000,BackColour=&H40000000,BorderStyle=1,Outline=0.8,Shadow=0.5,MarginV=10,MarginR=15'"
|
| 301 |
|
| 302 |
cmd3 = [
|
| 303 |
"ffmpeg", "-y",
|