From 70e514b3e4b05bfb81b8fb367e457f47231fb32b Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 14 Jul 2026 09:35:59 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20rebase=E5=88=B0develop=20+=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/worker/video_processing/render_audio.py | 3 +-- apps/worker/video_processing/trim_engine.py | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/worker/video_processing/render_audio.py b/apps/worker/video_processing/render_audio.py index 107076841..1c3082232 100755 --- a/apps/worker/video_processing/render_audio.py +++ b/apps/worker/video_processing/render_audio.py @@ -181,8 +181,7 @@ def concat_main_audio( trim_start = getattr(clip, "start_time", 0) or 0 if effective_duration > 0: filter_parts.append( - f"[{i}:a]atrim=start={trim_start:.3f}:duration={effective_duration:.3f}," - f"asetpts=PTS-STARTPTS[a{i}]" + f"[{i}:a]atrim=start={trim_start:.3f}:duration={effective_duration:.3f}," f"asetpts=PTS-STARTPTS[a{i}]" ) else: filter_parts.append(f"[{i}:a]asetpts=PTS-STARTPTS[a{i}]") diff --git a/apps/worker/video_processing/trim_engine.py b/apps/worker/video_processing/trim_engine.py index c17133d45..ada3f373a 100755 --- a/apps/worker/video_processing/trim_engine.py +++ b/apps/worker/video_processing/trim_engine.py @@ -293,9 +293,7 @@ class TrimEngine: return segments # 单段裁剪兼容：从 trim_start/trim_end/trim_duration 构造 - has_single = any( - k in config for k in ("trim_start", "trim_end", "trim_duration") - ) + has_single = any(k in config for k in ("trim_start", "trim_end", "trim_duration")) if has_single: seg = TrimSegment( segment_id="main", @@ -329,9 +327,7 @@ def extract_trim_from_clip_config(config: dict[str, Any] | None) -> TrimConfig | return TrimConfig.from_dict(config["trim"]) # 扁平字段 - has_any = any( - k in config for k in ("trim_start", "trim_end", "trim_duration") - ) + has_any = any(k in config for k in ("trim_start", "trim_end", "trim_duration")) if not has_any: return None