字幕调整

video_stitching/video_stitching.py

@@ -244,10 +244,8 @@ class VideoStitching():
         final_width = 320
         final_height = 480
         final_clip = final_clip.resize((final_width, final_height))
-        # 设置背景色
-        color_clip = editor.ColorClip(size=(final_width, 90),
-                                      color=(255, 255, 0)).set_duration(duration_limit)
-        final_clip = editor.CompositeVideoClip([final_clip, color_clip.set_position(("center", final_height - 80))])
+
+
         Common.logger("video").info(f"字幕内容为：{srt}")
         if srt != None:
             Common.logger("video").info(f"处理字幕文件")
@@ -262,6 +260,11 @@ class VideoStitching():
                 end = editor.cvsecs(cls.srt_to_seconds(match[1]))
                 text = match[2].strip()
                 text = cls.split_text(text, 10)
+                # 设置背景色
+                color_clip = editor.ColorClip(size=(final_width, 90),
+                                              color=(255, 255, 0)).set_duration(end - start).set_start(start)
+                final_clip = editor.CompositeVideoClip(
+                    [final_clip, color_clip.set_position(("center", final_height - 80))])
                 # /System/Library/Fonts/Hiragino Sans GB.ttc 本地字体
                 # /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc 服务器地址
                 Common.logger("video").info(f"字幕:{text}")
@@ -274,6 +277,9 @@ class VideoStitching():
             # 将字幕添加到视频上
             video_with_subtitles = editor.CompositeVideoClip([final_clip] + subtitle_clips)
         else:
+            color_clip = editor.ColorClip(size=(final_width, 90),
+                                          color=(255, 255, 0)).set_duration(duration_limit)
+            final_clip = editor.CompositeVideoClip([final_clip, color_clip.set_position(("center", final_height - 80))])
             Common.logger("video").info(f"添加固定字幕")
             text_clip = (
                 editor.TextClip("分享、转发给群友", font="/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
@@ -369,7 +375,7 @@ class VideoStitching():
                 Common.logger("video").info(f"未使用视频链接为空：{url_list}")
                 return
             videos = [list(item) for item in url_list]
-        videos = Oss.get_oss_url(video_type, videos)
+        # videos = Oss.get_oss_url(video_type, videos)
         # 视频截取
         try:
             audio_url, video_with_subtitles, clips = cls.concatenate_videos(videos, str(audio), srt, video_type)