fix: 标题/换行 + TTS replace模式静音原音 + 配音素材库静音原音 #1504

Merged
auto-approve-bot merged 2 commits from fix/title-slash-newline-and-replace-mute into develop 2026-08-25 23:06:00 +08:00
Owner

修复内容

1. 标题 / 和 / 换行

文件: packages/domain/ass_subtitle_builder.py

  • escape_ass_text() 中,将半角 / 和全角 转换为 ASS 硬换行 \N
  • 在自动换行 _wrap_title_text() 之前完成替换,用户手动换行优先于自动换行

2. TTS replace 模式静音原视频音轨

文件: apps/worker/video_processing/unified_render_service.py

  • _maybe_add_voiceover_layer():TTS 配音添加成功后,若 overlap_mode == "replace",遍历 mainbroll 图层所有 clip,将 config["volume"] 设为 0
  • 修复了之前注释 replace 模式在外部处理 但实际逻辑缺失的问题

3. 配音素材库默认静音原音

  • _maybe_add_voice_library_layer():配音素材库音频添加后,同样静音 mainbroll 图层(配音素材库场景默认替换原音)

测试

  • 新增 7 个单元测试覆盖斜杠换行(半角/全角/混合)
  • 356 个相关测试全部通过(含 render/tts/voiceover 全套)
## 修复内容 ### 1. 标题 / 和 / 换行 **文件**: `packages/domain/ass_subtitle_builder.py` - 在 `escape_ass_text()` 中,将半角 `/` 和全角 `/` 转换为 ASS 硬换行 `\N` - 在自动换行 `_wrap_title_text()` 之前完成替换,用户手动换行优先于自动换行 ### 2. TTS replace 模式静音原视频音轨 **文件**: `apps/worker/video_processing/unified_render_service.py` - `_maybe_add_voiceover_layer()`:TTS 配音添加成功后,若 `overlap_mode == "replace"`,遍历 `main` 和 `broll` 图层所有 clip,将 `config["volume"]` 设为 0 - 修复了之前注释 `replace 模式在外部处理` 但实际逻辑缺失的问题 ### 3. 配音素材库默认静音原音 - `_maybe_add_voice_library_layer()`:配音素材库音频添加后,同样静音 `main` 和 `broll` 图层(配音素材库场景默认替换原音) ### 测试 - 新增 7 个单元测试覆盖斜杠换行(半角/全角/混合) - 356 个相关测试全部通过(含 render/tts/voiceover 全套)
xiaoxia added 1 commit 2026-08-25 22:25:53 +08:00
fix: title slash newline + TTS/voice-library replace mode mutes original audio
AI Code Review / AI Code Review (pull_request) Successful in 1m53s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m15s
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m10s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m20s
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 29s
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 53s
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 2m7s
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 / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m24s
CI/CD Pipeline / Validate - Code Quality (pull_request) Failing after 3m16s
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 2m35s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 5m38s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m57s
CI/CD Pipeline / CI Gate (pull_request) Failing after 7s
5b76f500f2
1. escape_ass_text: convert / and / to ASS hard newline \\N before
   automatic wrapping, so user manual line breaks take priority.
2. _maybe_add_voiceover_layer: when overlap_mode=='replace', set
   volume=0 on all main/broll layer clips after adding TTS audio.
3. _maybe_add_voice_library_layer: always mute main/broll clips when
   voice library audio is added (voice library replaces original audio).
4. Add 7 new unit tests covering slash conversion and integration.

🚀 预览环境已部署

项目 详情
PR号 #1504
预览链接 https://pr-1504.preview.xiaoxiajianji.com
API环境 staging

💡 预览环境使用 staging API 数据,请勿在预览环境中操作重要数据。

🔄 每次提交新代码后预览环境会自动更新。

🗑️ PR 关闭或合并后,预览环境会自动清理。

🚀 **预览环境已部署** | 项目 | 详情 | |------|------| | PR号 | #1504 | | 预览链接 | [https://pr-1504.preview.xiaoxiajianji.com](https://pr-1504.preview.xiaoxiajianji.com) | | API环境 | staging | > 💡 预览环境使用 staging API 数据,请勿在预览环境中操作重要数据。 > > 🔄 每次提交新代码后预览环境会自动更新。 > > 🗑️ PR 关闭或合并后,预览环境会自动清理。
auto-approve-bot added 1 commit 2026-08-25 22:37:57 +08:00
style: auto-format with black + isort + prettier [skip ci-format-check]
Preview Deploy / Deploy Preview Environment (pull_request) Successful in 2m20s
AI Code Review / AI Code Review (pull_request) Successful in 3m30s
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 23s
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / PR Build Web Image (pull_request) Has been skipped
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 21s
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m56s
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 1m36s
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 2m19s
CI/CD Pipeline / Unit Tests (pull_request) Successful in 4m41s
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 8m23s
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Canary Release to Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
CI/CD Pipeline / Integration Tests (pull_request) Successful in 5m23s
CI/CD Pipeline / CI Gate (pull_request) Successful in 8s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m45s
ACR Cleanup / ACR Image Cleanup (pull_request_target) Successful in 54s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 57s
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m57s
6aad1c2556
Collaborator

代码审查结果 - PR #1504

⚠️ 问题(0个需要修改)

💡 建议(2个可选)

  1. apps/worker/video_processing/unified_render_service.py 第829-833行及902-906行:存在重复代码逻辑。
    • 说明:静音 mainbroll 图层音轨的逻辑在两处完全一致(TTS replace 模式和配音素材库模式)。建议提取为私有方法(如 _mute_original_audio_layers)以提高代码可维护性并避免逻辑不一致。
  2. packages/domain/ass_subtitle_builder.py 第150行:斜杠转换逻辑可能影响非标题文本。
    • 说明:将所有 / 替换为 \N 适用于标题换行,但如果此通用函数被用于普通对话字幕(如包含 URL https://... 或分数 1/2),会导致内容显示错误。建议确认函数调用范围,或增加参数控制是否进行此转换,避免破坏普通文本内容。

格式检查通过 | 逻辑审查通过 | ⚠️ 建议关注性能


🤖 由 AI 代码审查机器人自动生成 | 2026-08-25 14:41:34 | 模型:

## 代码审查结果 - PR #1504 ### ⚠️ 问题(0个需要修改) ### 💡 建议(2个可选) 1. **apps/worker/video_processing/unified_render_service.py 第829-833行及902-906行**:存在重复代码逻辑。 - **说明**:静音 `main` 和 `broll` 图层音轨的逻辑在两处完全一致(TTS replace 模式和配音素材库模式)。建议提取为私有方法(如 `_mute_original_audio_layers`)以提高代码可维护性并避免逻辑不一致。 2. **packages/domain/ass_subtitle_builder.py 第150行**:斜杠转换逻辑可能影响非标题文本。 - **说明**:将所有 `/` 和 `/` 替换为 `\N` 适用于标题换行,但如果此通用函数被用于普通对话字幕(如包含 URL `https://...` 或分数 `1/2`),会导致内容显示错误。建议确认函数调用范围,或增加参数控制是否进行此转换,避免破坏普通文本内容。 --- ✅ 格式检查通过 | ✅ 逻辑审查通过 | ⚠️ 建议关注性能 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-08-25 14:41:34 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
auto-approve-bot approved these changes 2026-08-25 23:00:30 +08:00
auto-approve-bot left a comment
Collaborator

CI全绿,自动审批通过。

CI全绿,自动审批通过。
auto-approve-bot approved these changes 2026-08-25 23:00:30 +08:00
auto-approve-bot left a comment
Collaborator

CI全绿,自动审批通过。

CI全绿,自动审批通过。
auto-approve-bot merged commit 323bd2da5e into develop 2026-08-25 23:06:00 +08:00
auto-approve-bot deleted branch fix/title-slash-newline-and-replace-mute 2026-08-25 23:06:01 +08:00

🗑️ 预览环境已清理

PR #1504 已关闭或合并,对应的预览环境已被清理。

如有需要,可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #1504 已关闭或合并,对应的预览环境已被清理。 > 如有需要,可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.