|
|
@@ -83,7 +83,7 @@ class VideoStitching():
|
|
|
SELECT video_id
|
|
|
FROM video_audio b
|
|
|
WHERE a.video_id = b.video_id AND b.audio = '{audio_id}'
|
|
|
- ) AND a.account_id = {account} ;"""
|
|
|
+ ) AND a.account_id = {account} limit 35;"""
|
|
|
url_list = MysqlHelper.get_values(url_list, "prod")
|
|
|
return url_list
|
|
|
|
|
|
@@ -148,7 +148,7 @@ class VideoStitching():
|
|
|
|
|
|
# 遍历每个视频并计算总时长
|
|
|
for i, video in enumerate(videos):
|
|
|
- clip = VideoFileClip(video[3])
|
|
|
+ clip = VideoFileClip(f"https://art-crawler.oss-cn-hangzhou.aliyuncs.com/{video[2]}")
|
|
|
clips.append(clip)
|
|
|
total_duration += clip.duration
|
|
|
if total_duration >= duration_limit:
|
|
|
@@ -202,7 +202,7 @@ class VideoStitching():
|
|
|
# /System/Library/Fonts/Hiragino Sans GB.ttc 本地字体
|
|
|
# /usr/share/fonts/truetype/wqy/wqy-zenhei.ttc 服务器地址
|
|
|
Common.logger().info(f"字幕:{text}")
|
|
|
- sub = editor.TextClip(text, font="/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
|
|
|
+ sub = editor.TextClip(text, font="/System/Library/Fonts/Hiragino Sans GB.ttc",
|
|
|
fontsize=18, color="black").set_duration(end - start).set_start(
|
|
|
start).set_position(
|
|
|
("center", final_height - 60)).set_opacity(0.8)
|
|
|
@@ -213,7 +213,7 @@ class VideoStitching():
|
|
|
else:
|
|
|
Common.logger().info(f"添加固定字幕")
|
|
|
text_clip = (
|
|
|
- editor.TextClip("分享、转发给群友", font="/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
|
|
|
+ editor.TextClip("分享、转发给群友", font="/System/Library/Fonts/Hiragino Sans GB.ttc",
|
|
|
fontsize=30, color="black").
|
|
|
set_position(("center", final_height - 70)).
|
|
|
set_duration(duration_limit).
|
|
|
@@ -288,7 +288,7 @@ class VideoStitching():
|
|
|
return
|
|
|
Common.logger().info(f"获取音频地址：{audio},获取用户id：{audio_id}")
|
|
|
videos = [list(item) for item in url_list]
|
|
|
- videos = Oss.get_oss_url(videos)
|
|
|
+ # videos = Oss.get_oss_url(videos)
|
|
|
# 视频截取
|
|
|
try:
|
|
|
audio_url, video_with_subtitles = cls.concatenate_videos(videos, str(audio), srt)
|
