|
|
@@ -273,6 +273,7 @@ class AgcVidoe():
|
|
|
@classmethod
|
|
|
def concatenate_videos(cls, videos, audio_duration, audio_video, platform, s_path, v_path, mark, t_path):
|
|
|
video_files = cls.concat_videos_with_subtitles(videos, audio_duration, platform, mark)
|
|
|
+ Common.logger("video").info(f"{mark}的{platform}渠道待生成视频为：{video_files}")
|
|
|
if video_files == "":
|
|
|
return ""
|
|
|
print(f"{mark}的{platform}:开始拼接视频喽～～～")
|
|
|
@@ -419,6 +420,11 @@ class AgcVidoe():
|
|
|
# 随机生成视频oss_id
|
|
|
oss_id = cls.random_id()
|
|
|
Common.logger("video").info(f"{mark}的{platform}渠道上传到 OSS 生成视频id为：{oss_id}")
|
|
|
+ # 获取新生成视频时长
|
|
|
+ v_path_duration = cls.get_audio_duration(v_path)
|
|
|
+ if int(v_path_duration) > int(audio_video)+3:
|
|
|
+ Common.logger("video").info(f"{mark}的{platform}渠道最终生成视频秒数错误,生成了：{v_path_duration}秒")
|
|
|
+ return ""
|
|
|
# 上传 oss
|
|
|
oss_object_key = Oss.stitching_sync_upload_oss(v_path, oss_id)
|
|
|
status = oss_object_key.get("status")
|
