xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 9 Pull Requests 2 Actions 1 Packages Projects Releases 7 Wiki Activity

P1-1: 一键生成P0效果层补齐 - 模板配置注入(BGM/字幕/ASR) + 直通模式调速修复 #465

Merged
xiaoxia merged 1 commits from feature/unified-gen-effect-layer-p0 into develop 2026-07-17 13:39:39 +08:00
Conversation 0 Commits 1 Files Changed 2
+72
xiaoxia commented 2026-07-17 12:38:20 +08:00
Owner
Copy Link
Copy Source

背景

P1-1验证发现一键生成模式效果层大面积缺失，核心原因是virtual_plan.config从未从模板加载配置。

修复内容

1. 一键生成注入模板配置（BGM + 字幕 + ASR自动字幕）

  • 新增_load_template_plan_config()函数，从模板读取plan级配置
  • 渲染前将模板config注入到virtual_plan.config
  • 模板不存在/加载失败时降级为空配置，不阻塞主流程
  • BGM、字幕(含ASR)、滤镜等plan级效果层自动生效

2. 直通模式调速修复

  • _render_pass_through中补充speed调速处理（setpts=PTS/speed）
  • 与filter_complex路径行为一致

3. 直通模式水印保护

  • 有水印配置时禁用直通路径，避免静默失效
  • 图片水印需要额外输入，统一走filter_complex

测试

  • 118个相关测试全绿（87 unified_render + 31 render_adapter）
## 背景 P1-1验证发现一键生成模式效果层大面积缺失，核心原因是virtual_plan.config从未从模板加载配置。 ## 修复内容 ### 1. 一键生成注入模板配置（BGM + 字幕 + ASR自动字幕） - 新增`_load_template_plan_config()`函数，从模板读取plan级配置 - 渲染前将模板config注入到virtual_plan.config - 模板不存在/加载失败时降级为空配置，不阻塞主流程 - BGM、字幕(含ASR)、滤镜等plan级效果层自动生效 ### 2. 直通模式调速修复 - `_render_pass_through`中补充speed调速处理（setpts=PTS/speed） - 与filter_complex路径行为一致 ### 3. 直通模式水印保护 - 有水印配置时禁用直通路径，避免静默失效 - 图片水印需要额外输入，统一走filter_complex ## 测试 - 118个相关测试全绿（87 unified_render + 31 render_adapter）
xiaoxia added 1 commit 2026-07-17 12:38:21 +08:00
feat: 一键生成P0效果层补齐 - 模板配置注入(BGM/字幕) + 直通模式调速修复
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Failing after 1s
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 15s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 49s
Details
AI Code Review / AI Code Review (pull_request) Successful in 57s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m41s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 2m59s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m54s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 31m51s
Details
c3c00c6361 
- 一键生成渲染前从模板加载plan级配置，注入virtual_plan.config
- BGM、字幕(含ASR)等效果层自动生效
- 直通模式(_render_pass_through)补充speed调速处理
- 有水印时禁用直通路径，避免静默失效
- 模板不存在/加载失败时降级，不阻塞主流程
xiaoxia merged commit 3afec86a4f into develop 2026-07-17 13:39:39 +08:00
xiaoxia deleted branch feature/unified-gen-effect-layer-p0 2026-07-17 13:39:39 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#465
Delete Branch "feature/unified-gen-effect-layer-p0"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?