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

fix(P0): 放宽ingest视频编码拦截 + 自动选素材去掉编码过滤 #508

Merged
auto-approve-bot merged 3 commits from fix/p0-ingest-codec-relax into develop 2026-07-18 14:45:53 +08:00
Conversation 3 Commits 3 Files Changed 4
+90 -64
xiaoxia commented 2026-07-18 14:21:55 +08:00
Owner
Copy Link
Copy Source

问题：用户上传 HEVC/VP9/AV1/MPEG4 等常见视频格式，ingest 直接标记 ERROR，素材库看不到。用户不应该需要知道自己的视频是什么编码。

根因：ingest._is_valid_media() 只允许 h264/avc1 白名单编码，自动选素材也有同样的过滤。

修复：

  1. ingest 层：SUPPORTED_VIDEO_CODECS 白名单放宽到 20+ 常见视频编码（H.264/HEVC/VP9/AV1/VP8/MPEG-4/MPEG-2/WMV/ProRes/DNxHD 等），非白名单编码也不再拦截，只打 info 日志。只要 ffprobe 能识别的视频都让进。
  2. 自动选素材：去掉编码过滤逻辑，只保留横竖屏过滤作为优化项。
  3. 渲染引擎（legacy/unified）负责 concat 前的编码/像素格式统一。

测试：更新5个编码过滤相关单测，验证编码不再被过滤，17个相关单测全过。

关联：#406

**问题**：用户上传 HEVC/VP9/AV1/MPEG4 等常见视频格式，ingest 直接标记 ERROR，素材库看不到。用户不应该需要知道自己的视频是什么编码。 **根因**：ingest._is_valid_media() 只允许 h264/avc1 白名单编码，自动选素材也有同样的过滤。 **修复**： 1. **ingest 层**：SUPPORTED_VIDEO_CODECS 白名单放宽到 20+ 常见视频编码（H.264/HEVC/VP9/AV1/VP8/MPEG-4/MPEG-2/WMV/ProRes/DNxHD 等），非白名单编码也不再拦截，只打 info 日志。只要 ffprobe 能识别的视频都让进。 2. **自动选素材**：去掉编码过滤逻辑，只保留横竖屏过滤作为优化项。 3. 渲染引擎（legacy/unified）负责 concat 前的编码/像素格式统一。 **测试**：更新5个编码过滤相关单测，验证编码不再被过滤，17个相关单测全过。 **关联**：#406
xiaoxia added the bugbackendP0 labels 2026-07-18 14:21:55 +08:00
xiaoxia added 1 commit 2026-07-18 14:21:55 +08:00
fix: 放宽ingest视频编码拦截 + 自动选素材去掉编码过滤
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
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (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
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 21s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 25s
Details
AI Code Review / AI Code Review (pull_request) Failing after 39s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m3s
Details
CI/CD Pipeline / Unit Tests (pull_request) Failing after 16s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 1m28s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 48s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 1m44s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m41s
Details
0f73069eb1 
P0问题：用户上传常见视频格式（HEVC/VP9/AV1等）被ingest直接拦截，
素材库里看不到。渲染引擎才是处理编码差异的地方，ingest层不应该限制。

修改：
1. ingest._is_valid_media(): SUPPORTED_VIDEO_CODECS白名单大幅放宽（20+编码），
   遇到非白名单编码只打info日志，不拦截
2. auto_select_video_assets(): 去掉编码过滤逻辑，只保留横竖屏过滤作为优化
3. 更新5个相关单元测试，验证编码不再被过滤
xiaoxia added 1 commit 2026-07-18 14:38:54 +08:00
fix(test): 更新ingest编码校验测试以匹配放宽后的行为
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker 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 API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web 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 / Build Production Worker Image (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 13s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 17s
Details
AI Code Review / AI Code Review (pull_request) Failing after 31s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 20s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 50s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 40s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 1m6s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 1m7s
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
Details
041218afa6 
- HEVC/H265/VP9/AV1等常见编码从'无效'改为'有效'
- 新增未知编码(mpeg4)也放行的测试
- 大小写不敏感测试断言从False改为True
xiaoxia added 1 commit 2026-07-18 14:41:01 +08:00
style: black格式化ingest.py白名单集合
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
CI Build & Deploy Pipeline / Build Staging 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 API Image (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
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 16s
Details
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 18s
Details
AI Code Review / AI Code Review (pull_request) Failing after 37s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 44s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 28s
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m41s
Details
Auto Approve CI PRs / Auto Approve on CI Green (pull_request) Successful in 3m13s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 1m43s
Details
Auto Merge CI PRs / Auto Merge on CI Green + Approved (pull_request) Successful in 4m52s
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 20s
Details
2062889828
auto-approve-bot approved these changes 2026-07-18 14:44:14 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot approved these changes 2026-07-18 14:44:14 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
auto-approve-bot merged commit c7733a6974 into develop 2026-07-18 14:45:53 +08:00
auto-approve-bot deleted branch fix/p0-ingest-codec-relax 2026-07-18 14:45:54 +08:00
gitea-actions bot commented 2026-07-18 14:46:13 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

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

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

🗑️ **预览环境已清理** PR #508 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
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 P0 backend bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#508
Delete Branch "fix/p0-ingest-codec-relax"

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?