chore: rebase到develop + 格式化代码
CI/CD Pipeline / Unit Tests (pull_request) Successful in 1m27s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 2m23s
CI/CD Pipeline / Integration Tests (pull_request) Failing after 1m27s
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 5m51s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped

This commit is contained in:
CI Bot
2026-07-14 09:35:59 +08:00
committed by xiaoxia-bot
parent 9fd3a469d7
commit 70e514b3e4
2 changed files with 3 additions and 8 deletions
+1 -2
View File
@@ -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}]")
+2 -6
View File
@@ -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