10 Commits

Author	SHA1	Message	Date
saas-backend-agent	dfc5e5a5b6	fix(worker): align gpu-direct title defaults (size/margin/bold) with CPU vfb path ... PR #2095 fixed title baseline positioning and width-scaling but didn't fully align default constants with the CPU video_filter_builder path, causing GPU rendered titles to appear slightly smaller / higher / bolder-differently than the CPU/ASS preview the template was authored against. This shows up in both single and batch GPU renders since every variant shares the same gpu_direct pipeline. Root causes in PR #2095 defaults: - Default title size 36@720p vs config_schemas DEFAULT 48 / vfb default 48 - Top/bottom margin 40@720p (PAD16+margin24) vs vfb _scale_title_len(50) - Subtitle bottom margin 60@720p vs vfb 50 - Faux bold used same-color 1px border (white-on-white invisible for default white text; red-on-red for colored) vs vfb black 2px (intentional choice per #2001 to avoid double-print/halo artifact) - margin_top was treated as absolute y offset, now correctly added on top of base margin (matches vfb additive semantics) - subtitle stroke/bold block referenced uninitialized s_borderw (ruff F821) — added proper init + stroke parsing consistent with title block Changes: - TITLE_DEFAULT_MARGIN_TOP/BOTTOM = 50 (was 24+PAD=40) - SUBTITLE_DEFAULT_MARGIN_BOTTOM = 50 (was 60) - TITLE_FAUX_BOLD_WIDTH = 2, border color = #000000 (was 1, same as text) - default title size 48@720p (was 36) - margin_top from cfg added on top of base 50 (additive, same as vfb) - subtitle: init s_borderw/s_border_color, parse stroke dict before bold check - bottom position: y = h - th - margin_bottom (correct baseline; previously used margin_top variable which was misleading but numerically equivalent before margin split; now uses explicit margin_bottom) Tests updated to new expected scaled values (1280x720 scale=1.778: fontsize 85, y=89, bold borderw=4 black; 1080x1920 vertical: fontsize 72, y=75; margin_top=100 user offset => y=267). Added test_title_bold_false_disables_faux_bold. Batch investigation notes (separate findings, not bugs in this PR): - per-variant plan config is correctly deep-copied via clone_plan_for_variant (config=dict(source.config or {})); title text per-variant via titles[] override; voice per-variant independent download with #1749 strict guards; bgm merged via merge_bgm_config — batch passthrough chain is correct. - Worker generation concurrency = 2 (compose.yml default); USER_PENDING_LIMIT=3, 6 tasks will enqueue in two waves (first 3 → then next 3 as workers free up); GLOBAL_PENDING_LIMIT allows it. This is expected behavior, not a bug. - Legacy key mismatch: subtitle_render_engine.py reads plan_config['subtitle_config'] (snake_case) but normalize_plan_config writes 'subtitle' short key. This file is not imported by unified_render_service (which uses render_subtitles.py with explicit subtitle_config= parameter), so no runtime impact; left for separate cleanup. - Frontend usePlanConfigLoader.ts reads config.title_config snake_case while backend writes 'title' short key — frontend-only issue for subsequent edit sessions, out of backend scope.	2026-09-29 18:08:18 +08:00
xiaoxia	3be06c5763	fix(worker): align gpu-direct title position/size with frontend preview (#2095) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-29 17:04:37 +08:00
xiaoxia	da59a6c9a6	fix(gpu-direct): passthrough template title/subtitle/BGM config (#2093) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-29 14:54:32 +08:00
xiaoxia	ba3e97c986	fix(worker): GPU直连支持配音素材库音轨+无声片段anullsrc+per-clip音量 (#2090) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 21:09:10 +08:00
xiaoxia	3106496c12	fix(worker): GPU直连管线音频bug修复+边缘裁剪入GPU省5s (#2089) ... Co-authored-by: xiaoxia <dev@xiaoxiajianji.com> Co-committed-by: xiaoxia <dev@xiaoxiajianji.com>	2026-09-28 20:17:54 +08:00
灵应	8a5cfe831e	fix: 修复 gpu_direct_pipeline.py 中 concat 构建的变量名错误 ... build_direct_render 方法中列表推导式使用 _lbl 作为循环变量， 但 f-string 中误用了未定义的 l，导致 NameError。 修复: f"[{l}]" -> f"[{_lbl}]" (line 195)	2026-09-28 16:22:01 +08:00
业务服务器运维	ec9240b52a	fix: 修复 _storage_key 无法写入 EditPlanClip（slots=True） ... EditPlanClip 使用 @dataclass(slots=True)，不允许 setattr 动态添加属性。 将 _storage_key 改为存储在 clip.config 字典中，所有读取处同步修改。 - render_adapter.py: c._storage_key = sk → c.config['_storage_key'] = sk - unified_render_service.py: getattr → config.get('_storage_key') - gpu_direct_pipeline.py: getattr → config.get('_storage_key')	2026-09-28 14:46:44 +08:00
saas-backend-agent	6e8199581d	fix(gpu-direct): 修复单测+style E741，默认字体改为Noto Sans CJK SC ... - DEFAULT_DRAWTEXT_FONT 从 sans 改为 'Noto Sans CJK SC'（P4000已装中文字体） - _download_assets 返回 4-tuple 导致老单测解包失败，更新 test_render_adapter - 修复 E741 模糊变量名 l → _lbl/_lyr - ruff format 统一格式	2026-09-28 14:02:57 +08:00
CI Bot	1e23a3f094	style: auto-format with black + isort + ruff + prettier [skip ci-format-check]	2026-09-28 05:38:30 +00:00
业务服务器运维	b04a803655	feat(worker): 全GPU直连渲染，取消mezzanine CPU中间编码 ... - gpu_encoder 新增 render_inputs_to_output：多输入+filter_complex 直接交 P4000 一次出片 - 新增 gpu_direct_pipeline：原始素材/BGM 签名URL、TTS 上传、drawtext 标题/字幕、 filter_complex 完成 trim/scale/pad/concat/边缘crop/amix，末端 h264_nvenc 仅编码一次 - unified_render_service：render() 步骤4.8 接入直连，命中即出片； 不满足条件或 GPU 失败自动回退现有 mezzanine/CPU 链路；config gpu_direct_enabled 可灰度关闭 - render_adapter：_download_assets 额外返回 asset_storage_map， _do_render 给 clip 注入 _storage_key 供直连签名 消除 mezzanine 85s + 边缘裁剪 26s + 合成 2s + 中转 1s ≈ 114s CPU 开销	2026-09-28 13:30:31 +08:00