zhangyong hai 11 meses
pai
achega
7d88074230
Modificáronse 2 ficheiros con 4 adicións e 4 borrados
  1. 2 3
      common/ffmpeg.py
  2. 2 1
      video_rewriting/video_prep.py

+ 2 - 3
common/ffmpeg.py

@@ -122,7 +122,7 @@ class FFmpeg():
      生成片尾视频
     """
     @classmethod
-    def pw_video(cls, jpg_url, video_path_url, pw_url, pw_srt, pw_random_id):
+    def pw_video(cls, jpg_url, video_path_url, pw_url, pw_srt, pw_random_id, pw_mp3_path):
         # 添加音频到图片
         """
         jpg_url 图片地址
@@ -141,8 +141,7 @@ class FFmpeg():
         pw_url_path = video_path_url + str(pw_random_id) + 'pw_video.mp4'
         # 获取视频时长
         pw_duration = cls.get_video_duration(pw_url)
-        # 获取音频
-        pw_mp3_path = cls.get_video_mp3(pw_url, video_path_url, pw_random_id)
+
         time.sleep(2)
         # 添加字幕 wqy-zenhei  Hiragino Sans GB
         subtitle_cmd = f"subtitles={pw_srt_path}:force_style='Fontsize=14,Fontname=wqy-zenhei,Outline=0,PrimaryColour=&H000000,SecondaryColour=&H000000,Bold=1,MarginV=155'"

+ 2 - 1
video_rewriting/video_prep.py

@@ -148,7 +148,8 @@ class getVideo:
                                 cls.remove_files(video_path_url)
                                 continue
                             for attempt in range(3):
-                                pw_path = FFmpeg.pw_video(jpg_path, video_path_url, pw_url, pw_srt, pw_random_id)  # 生成片尾视频
+                                pw_mp3_path = FFmpeg.get_video_mp3(pw_url, video_path_url, pw_random_id)
+                                pw_path = FFmpeg.pw_video(jpg_path, video_path_url, pw_url, pw_srt, pw_random_id, pw_mp3_path)  # 生成片尾视频
                                 if os.path.isfile(pw_path):
                                     Common.logger("log").info(f"{task_mark}下的视频ID{id},生成片尾视频成功")
                                     break