Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b203d84956 | |||
| 92bd1fe201 | |||
| 955613efd3 | |||
| f08a2bfa0d | |||
| 3441b3fece | |||
| b7be479ae7 | |||
| 95c33f6604 | |||
| 161c1a61b6 | |||
| 8b30193f3e | |||
| 665228a58f | |||
| 56d45c2d49 | |||
| ab4a1b7262 | |||
| a39e5ea936 | |||
| 2d0d8a2777 | |||
| d3469d9799 | |||
| 068010b059 | |||
| 231d5153bf | |||
| f4af6ec8b7 | |||
| 6a3f4e4127 | |||
| ec3ba19342 | |||
| 26728dfffb | |||
| cb903e3bd6 | |||
| b447ad84ea | |||
| 2356f12f11 | |||
| 3c42541ff7 | |||
| 85afadd166 | |||
| 634d05c010 |
@@ -18,7 +18,6 @@ from app.schemas.asset import (
|
||||
BatchMarkRequest,
|
||||
BatchOperationResponse,
|
||||
BatchTagRequest,
|
||||
CreateAssetRequest,
|
||||
ListAssetsResponse,
|
||||
SmartMatchItem,
|
||||
SmartMatchRequest,
|
||||
@@ -29,11 +28,6 @@ from app.schemas.asset import (
|
||||
from app.schemas.tag import TagAssetsRequest
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, Response
|
||||
|
||||
from packages.application import (
|
||||
CreateAssetCommand,
|
||||
CreateAssetUseCase,
|
||||
)
|
||||
from packages.domain import AssetStatus, ClassificationStatus
|
||||
from packages.domain.smart_match import smart_select_assets
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -677,51 +671,12 @@ def untag_asset(
|
||||
|
||||
|
||||
@router.post("", response_model=AssetResponse)
|
||||
def create_asset(
|
||||
request: CreateAssetRequest,
|
||||
authenticated_user: AuthenticatedUser = Depends(get_current_user),
|
||||
asset_repository: Any = Depends(get_asset_repository),
|
||||
asset_library_repository: Any = Depends(get_asset_library_repository),
|
||||
project_repository: Any = Depends(get_project_repository),
|
||||
) -> AssetResponse:
|
||||
# 先获取素材库,用于推导 project_id(前端可能不传)
|
||||
library = asset_library_repository.get(request.library_id)
|
||||
if library is None:
|
||||
raise HTTPException(status_code=404, detail=f"AssetLibrary {request.library_id} not found")
|
||||
|
||||
# project_id 自动推导:优先用请求值,否则从 library 关联的项目获取
|
||||
project_id = request.project_id or library.project_id
|
||||
|
||||
project = project_repository.find_by_id(project_id)
|
||||
if project is None:
|
||||
raise HTTPException(status_code=404, detail=f"Project {project_id} not found")
|
||||
if not project.can_access(authenticated_user.user.id):
|
||||
raise HTTPException(status_code=403, detail="Access denied to project")
|
||||
|
||||
# 确保 library 和 project 归属一致
|
||||
if library.project_id != project_id:
|
||||
raise HTTPException(status_code=400, detail="AssetLibrary does not belong to the specified project")
|
||||
|
||||
use_case = CreateAssetUseCase(asset_repository)
|
||||
item = use_case.execute(
|
||||
CreateAssetCommand(
|
||||
project_id=project_id,
|
||||
library_id=request.library_id,
|
||||
name=request.name,
|
||||
storage_key=request.storage_key,
|
||||
mime_type=request.mime_type,
|
||||
metadata=request.metadata,
|
||||
file_size=request.file_size,
|
||||
thumbnail_url=request.thumbnail_url,
|
||||
duration=request.duration,
|
||||
width=request.width,
|
||||
height=request.height,
|
||||
fps=request.fps,
|
||||
codec=request.codec,
|
||||
status=AssetStatus(request.status),
|
||||
classification_status=ClassificationStatus(request.classification_status),
|
||||
quality_score=request.quality_score,
|
||||
uploaded_by_user_id=authenticated_user.user.id,
|
||||
)
|
||||
def create_asset() -> None:
|
||||
"""
|
||||
已废弃接口。
|
||||
所有素材上传统一走 uploadAssetDirect → completeDirectUpload → ingest-jobs 流程。
|
||||
"""
|
||||
raise HTTPException(
|
||||
status_code=410,
|
||||
detail="此接口已废弃。请使用 uploadAssetDirect 接口上传素材,Worker 会自动处理(视频转码、图片/音频元数据提取)并创建 Asset 记录。",
|
||||
)
|
||||
return _to_asset_response(item)
|
||||
|
||||
@@ -206,6 +206,7 @@ async def complete_direct_upload(
|
||||
ingest_job_id="",
|
||||
duplicated=True,
|
||||
asset_id=existing.id,
|
||||
url=storage_service.get_url(normalized_key),
|
||||
)
|
||||
|
||||
job = _submit_ingest_job(
|
||||
@@ -215,7 +216,7 @@ async def complete_direct_upload(
|
||||
ingest_job_repository=ingest_job_repository,
|
||||
file_hash=request.file_hash,
|
||||
)
|
||||
return DirectUploadCompleteResponse(storage_key=normalized_key, ingest_job_id=job.id)
|
||||
return DirectUploadCompleteResponse(storage_key=normalized_key, ingest_job_id=job.id, url=storage_service.get_url(normalized_key))
|
||||
|
||||
|
||||
@router.post(
|
||||
|
||||
@@ -39,6 +39,7 @@ class DirectUploadCompleteResponse(BaseModel):
|
||||
ingest_job_id: str
|
||||
duplicated: bool = Field(default=False, description="是否为重复素材(命中去重)")
|
||||
asset_id: str = Field(default="", description="重复素材的 asset_id(duplicated=true 时返回)")
|
||||
url: str = Field(default="", description="Public URL of uploaded file")
|
||||
|
||||
|
||||
class UploadAssetResponse(BaseModel):
|
||||
|
||||
@@ -226,15 +226,14 @@ test.describe("Core generation flow", () => {
|
||||
await expect(page.getByRole("heading", { name: /确认生成/ })).toBeVisible()
|
||||
|
||||
// Wait for generation API to be called
|
||||
// 确认生成走新流程:POST /tasks/{taskId}/confirm(复用预览产物)
|
||||
// 或旧流程:POST /editor/generate(向后兼容)
|
||||
// 前端直接创建生成任务:POST /generation/tasks
|
||||
const generatePromise = page.waitForResponse(
|
||||
(response) => {
|
||||
const url = response.url()
|
||||
const path = new URL(url).pathname
|
||||
return (
|
||||
response.request().method() === "POST" &&
|
||||
(path.endsWith("/confirm") || path.endsWith("/editor/generate"))
|
||||
path.endsWith("/generation/tasks")
|
||||
)
|
||||
},
|
||||
{ timeout: 30_000 },
|
||||
|
||||
@@ -178,7 +178,7 @@ test.describe("素材库流程", () => {
|
||||
expect(kinds).toContain("image")
|
||||
})
|
||||
|
||||
test("创建素材记录", async ({ request }) => {
|
||||
test("创建素材记录 — POST /assets 已废弃返回 410", async ({ request }) => {
|
||||
const { headers, userId } = await createAuthedUser(request, "asset-create")
|
||||
const projectId = await createProject(request, headers, Date.now().toString())
|
||||
|
||||
@@ -194,7 +194,7 @@ test.describe("素材库流程", () => {
|
||||
expect(lib.ok()).toBeTruthy()
|
||||
const libData = await lib.json()
|
||||
|
||||
// 创建素材记录
|
||||
// POST /assets 已废弃,应返回 410 Gone
|
||||
const response = await request.post(`${apiBase}/assets`, {
|
||||
headers,
|
||||
data: {
|
||||
@@ -210,16 +210,9 @@ test.describe("素材库流程", () => {
|
||||
},
|
||||
})
|
||||
|
||||
expect(
|
||||
response.ok(),
|
||||
`创建素材应返回 2xx,实际: ${response.status()} ${await response.text()}`,
|
||||
).toBeTruthy()
|
||||
|
||||
expect(response.status()).toBe(410)
|
||||
const data = await response.json()
|
||||
expect(data.id, "应返回素材 ID").toBeTruthy()
|
||||
expect(data.name).toContain("test_video")
|
||||
expect(data.mime_type).toBe("video/mp4")
|
||||
expect(data.library_id).toBe(libData.id)
|
||||
expect(data.error?.code).toBe("HTTP_410")
|
||||
})
|
||||
|
||||
test("列出素材", async ({ request }) => {
|
||||
@@ -232,51 +225,50 @@ test.describe("素材库流程", () => {
|
||||
data: {
|
||||
project_id: projectId,
|
||||
name: `List Lib ${Date.now()}`,
|
||||
kind: "video",
|
||||
kind: "image",
|
||||
},
|
||||
})
|
||||
expect(lib.ok(), `创建素材库应成功: ${await lib.text()}`).toBeTruthy()
|
||||
const libData = await lib.json()
|
||||
|
||||
// 创建 2 个素材
|
||||
await request.post(`${apiBase}/assets`, {
|
||||
// 通过 multipart upload 上传 2 个小图片作为测试素材
|
||||
// 创建一个 1x1 的 PNG buffer
|
||||
const tinyPng = Buffer.from(
|
||||
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==",
|
||||
"base64",
|
||||
)
|
||||
|
||||
await request.post(`${apiBase}/upload`, {
|
||||
headers,
|
||||
data: {
|
||||
multipart: {
|
||||
project_id: projectId,
|
||||
library_id: libData.id,
|
||||
name: `clip_a_${Date.now()}.mp4`,
|
||||
storage_key: `uploads/e2e/clip_a.mp4`,
|
||||
mime_type: "video/mp4",
|
||||
status: "ready",
|
||||
uploaded_by_user_id: userId,
|
||||
file: { name: "clip_a.png", mimeType: "image/png", buffer: tinyPng },
|
||||
},
|
||||
})
|
||||
await request.post(`${apiBase}/assets`, {
|
||||
await request.post(`${apiBase}/upload`, {
|
||||
headers,
|
||||
data: {
|
||||
multipart: {
|
||||
project_id: projectId,
|
||||
library_id: libData.id,
|
||||
name: `clip_b_${Date.now()}.mp4`,
|
||||
storage_key: `uploads/e2e/clip_b.mp4`,
|
||||
mime_type: "video/mp4",
|
||||
status: "ready",
|
||||
uploaded_by_user_id: userId,
|
||||
file: { name: "clip_b.png", mimeType: "image/png", buffer: tinyPng },
|
||||
},
|
||||
})
|
||||
|
||||
// 列出素材
|
||||
const response = await request.get(`${apiBase}/assets`, {
|
||||
headers,
|
||||
params: { library_id: libData.id },
|
||||
})
|
||||
// 列出素材(可能需要等待 ingest job 完成)
|
||||
let items: any[] = []
|
||||
for (let i = 0; i < 10; i++) {
|
||||
const response = await request.get(`${apiBase}/assets`, {
|
||||
headers,
|
||||
params: { library_id: libData.id },
|
||||
})
|
||||
expect(response.ok(), `列出素材应返回 2xx`).toBeTruthy()
|
||||
const data = await response.json()
|
||||
items = data.items || []
|
||||
if (items.length >= 2) break
|
||||
await new Promise((r) => setTimeout(r, 2000))
|
||||
}
|
||||
|
||||
expect(
|
||||
response.ok(),
|
||||
`列出素材应返回 2xx,实际: ${response.status()} ${await response.text()}`,
|
||||
).toBeTruthy()
|
||||
|
||||
const data = await response.json()
|
||||
const items = data.items || []
|
||||
expect(items.length, "应至少有 2 个素材").toBeGreaterThanOrEqual(2)
|
||||
})
|
||||
|
||||
|
||||
@@ -60,18 +60,6 @@ export const smartMatchAssets = async (libraryId: string): Promise<{ items: Asse
|
||||
return response.data
|
||||
}
|
||||
|
||||
/** 创建素材(上传文件后调用,附带 metadata) */
|
||||
export const createAsset = async (data: {
|
||||
library_id: string
|
||||
name: string
|
||||
storage_key: string
|
||||
mime_type: string
|
||||
metadata?: AssetMetadata
|
||||
}): Promise<AssetItem> => {
|
||||
const response = await apiClient.post("/assets", data)
|
||||
return response.data
|
||||
}
|
||||
|
||||
/** 更新素材(名称、metadata 等) */
|
||||
export const updateAsset = async (
|
||||
assetId: string,
|
||||
|
||||
@@ -13,7 +13,6 @@ export type {
|
||||
ClassificationJob,
|
||||
AssetDiagnosis,
|
||||
BatchOperationResult,
|
||||
UploadResult,
|
||||
DirectUploadPrepareResult,
|
||||
DirectUploadCompleteResult,
|
||||
} from "./types"
|
||||
@@ -34,14 +33,13 @@ export {
|
||||
getAssets,
|
||||
getAssetsByKind,
|
||||
smartMatchAssets,
|
||||
createAsset,
|
||||
updateAsset,
|
||||
updateAssetReviewStatus,
|
||||
deleteAsset,
|
||||
} from "./assets"
|
||||
|
||||
// 上传
|
||||
export { uploadAsset, prepareDirectUpload, completeDirectUpload, uploadAssetDirect } from "./upload"
|
||||
export { prepareDirectUpload, completeDirectUpload, uploadAssetDirect } from "./upload"
|
||||
|
||||
// 任务
|
||||
export { getIngestJob, submitClassificationJob, getClassificationJob } from "./jobs"
|
||||
|
||||
@@ -135,4 +135,5 @@ export interface DirectUploadPrepareResult {
|
||||
export interface DirectUploadCompleteResult {
|
||||
storage_key: string
|
||||
ingest_job_id: string
|
||||
url: string
|
||||
}
|
||||
|
||||
@@ -3,16 +3,7 @@
|
||||
*/
|
||||
import apiClient from "../client"
|
||||
import { getOrCreateDefaultProject } from "../projects"
|
||||
import type { UploadResult, DirectUploadPrepareResult, DirectUploadCompleteResult } from "./types"
|
||||
|
||||
/** 表单上传素材(小文件) */
|
||||
export const uploadAsset = async (formData: FormData): Promise<UploadResult> => {
|
||||
const response = await apiClient.post("/upload", formData, {
|
||||
headers: { "Content-Type": "multipart/form-data" },
|
||||
timeout: 30 * 60 * 1000,
|
||||
})
|
||||
return response.data
|
||||
}
|
||||
import type { DirectUploadPrepareResult, DirectUploadCompleteResult } from "./types"
|
||||
|
||||
/** 预签名直传准备 */
|
||||
export const prepareDirectUpload = async (data: {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import React, { useState, useCallback, useRef, useEffect } from "react"
|
||||
import { Modal, Button } from "@/components/ui"
|
||||
import { createVoiceClone, toVoiceClone } from "@/api/voice-clone"
|
||||
import { uploadAsset } from "@/api/assets"
|
||||
import { uploadAssetDirect, ensureDefaultLibrary } from "@/api/assets"
|
||||
import { getOrCreateDefaultProject } from "@/api/projects"
|
||||
import { PROGRESS_STEPS, ACCEPTED_MIME } from "./constants"
|
||||
import { validateFile } from "./utils"
|
||||
import { useAudioRecorder } from "./hooks/useAudioRecorder"
|
||||
@@ -181,9 +182,15 @@ const CloneModal: React.FC<CloneModalProps> = ({ open, onClose, onSuccess }) =>
|
||||
})
|
||||
}
|
||||
|
||||
const formData = new FormData()
|
||||
formData.append("file", fileToUpload)
|
||||
const uploadResult = await uploadAsset(formData)
|
||||
// 获取默认项目和素材库
|
||||
const project = await getOrCreateDefaultProject()
|
||||
const library = await ensureDefaultLibrary({ project_id: project.id, kind: "voice" })
|
||||
|
||||
// 直传到 OSS
|
||||
const uploadResult = await uploadAssetDirect({
|
||||
file: fileToUpload,
|
||||
library_id: library.id,
|
||||
})
|
||||
|
||||
// 组件已卸载则中止后续操作
|
||||
if (!isMountedRef.current) return
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useRef, useCallback, useEffect } from "react"
|
||||
import { createVoiceClone, toVoiceClone } from "@/api/voice-clone"
|
||||
import { uploadAsset, ensureDefaultLibrary } from "@/api/assets"
|
||||
import { uploadAssetDirect, ensureDefaultLibrary } from "@/api/assets"
|
||||
import { getOrCreateDefaultProject } from "@/api/projects"
|
||||
import type { VoiceClone } from "@/api/voice-clone"
|
||||
|
||||
@@ -62,15 +62,15 @@ export function useCloneSubmit({
|
||||
})
|
||||
}
|
||||
|
||||
// 获取默认项目和素材库(后端 /upload 接口必填)
|
||||
// 获取默认项目和素材库
|
||||
const project = await getOrCreateDefaultProject()
|
||||
const library = await ensureDefaultLibrary({ project_id: project.id, kind: "voice" })
|
||||
|
||||
const formData = new FormData()
|
||||
formData.append("file", fileToUpload)
|
||||
formData.append("project_id", project.id)
|
||||
formData.append("library_id", library.id)
|
||||
const uploadResult = await uploadAsset(formData)
|
||||
// 直传到 OSS
|
||||
const uploadResult = await uploadAssetDirect({
|
||||
file: fileToUpload,
|
||||
library_id: library.id,
|
||||
})
|
||||
|
||||
// 阶段 2:克隆
|
||||
setPhase("cloning")
|
||||
|
||||
@@ -112,12 +112,29 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
[segments],
|
||||
)
|
||||
|
||||
// WebCodecs 解码失败后强制走 video fallback
|
||||
const [forceVideoFallback, setForceVideoFallback] = useState(false)
|
||||
|
||||
const handleCanvasError = useCallback((err: Error) => {
|
||||
console.error("[FrontendPreviewPlayer] Canvas decode Error, switching to video fallback:", err)
|
||||
setForceVideoFallback(true)
|
||||
}, [])
|
||||
|
||||
const { state: canvasState, controls: canvasControls } = useCanvasPlayer(
|
||||
canvasRef,
|
||||
canvasSegments,
|
||||
useWebCodecs ? canvasTitle : undefined,
|
||||
useWebCodecs && !forceVideoFallback ? canvasTitle : undefined,
|
||||
handleCanvasError,
|
||||
)
|
||||
|
||||
// WebCodecs 报告解码失败时自动切换到 video fallback
|
||||
useEffect(() => {
|
||||
if (canvasState.hasDecodeError && !forceVideoFallback) {
|
||||
console.warn("[FrontendPreviewPlayer] hasDecodeError detected, forcing video fallback")
|
||||
setForceVideoFallback(true)
|
||||
}
|
||||
}, [canvasState.hasDecodeError, forceVideoFallback])
|
||||
|
||||
// ── Video 播放器(fallback 路径) ──
|
||||
const {
|
||||
isPlaying: videoIsPlaying,
|
||||
@@ -130,12 +147,13 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
videoRefs,
|
||||
} = useSegmentScheduler(segments)
|
||||
|
||||
// 选择哪条路径的状态
|
||||
const isPlaying = useWebCodecs ? canvasState.isPlaying : videoIsPlaying
|
||||
const currentTime = useWebCodecs ? canvasState.currentTime : videoCurrentTime
|
||||
const totalDuration = useWebCodecs ? canvasState.duration : videoTotalDuration
|
||||
const canPlay = useWebCodecs ? canvasState.isReady : videoCanPlay
|
||||
const isBuffering = useWebCodecs ? canvasState.isBuffering : false
|
||||
// 选择哪条路径的状态(WebCodecs 解码失败时强制走 video fallback)
|
||||
const effectiveUseWebCodecs = useWebCodecs && !forceVideoFallback
|
||||
const isPlaying = effectiveUseWebCodecs ? canvasState.isPlaying : videoIsPlaying
|
||||
const currentTime = effectiveUseWebCodecs ? canvasState.currentTime : videoCurrentTime
|
||||
const totalDuration = effectiveUseWebCodecs ? canvasState.duration : videoTotalDuration
|
||||
const canPlay = effectiveUseWebCodecs ? canvasState.isReady : videoCanPlay
|
||||
const isBuffering = effectiveUseWebCodecs ? canvasState.isBuffering : false
|
||||
|
||||
// ── 配音音频同步 ──
|
||||
const audioRef = useRef<HTMLAudioElement | null>(null)
|
||||
@@ -172,7 +190,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
}, [isPlaying, currentTime])
|
||||
|
||||
// 片段切换时同步音频(仅 fallback 路径需要)
|
||||
const segmentSyncKey = useWebCodecs ? -1 : videoCurrentSegIdx
|
||||
const segmentSyncKey = effectiveUseWebCodecs ? -1 : videoCurrentSegIdx
|
||||
useEffect(() => {
|
||||
const audio = audioRef.current
|
||||
if (!audio || !audio.src || !isPlaying) return
|
||||
@@ -181,7 +199,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
|
||||
const handleSeekTo = useCallback(
|
||||
(time: number) => {
|
||||
if (useWebCodecs) {
|
||||
if (effectiveUseWebCodecs) {
|
||||
canvasControls.seek(time)
|
||||
} else {
|
||||
videoSeekTo(time)
|
||||
@@ -191,11 +209,11 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
audio.currentTime = time
|
||||
}
|
||||
},
|
||||
[useWebCodecs, canvasControls, videoSeekTo],
|
||||
[effectiveUseWebCodecs, canvasControls, videoSeekTo],
|
||||
)
|
||||
|
||||
const handleTogglePlay = useCallback(() => {
|
||||
if (useWebCodecs) {
|
||||
if (effectiveUseWebCodecs) {
|
||||
if (canvasState.isPlaying) {
|
||||
canvasControls.pause()
|
||||
} else {
|
||||
@@ -204,7 +222,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
} else {
|
||||
videoTogglePlayPause()
|
||||
}
|
||||
}, [useWebCodecs, canvasState.isPlaying, canvasControls, videoTogglePlayPause])
|
||||
}, [effectiveUseWebCodecs, canvasState.isPlaying, canvasControls, videoTogglePlayPause])
|
||||
|
||||
// ── 进度条拖拽 ──
|
||||
const [isDragging, setIsDragging] = useState(false)
|
||||
@@ -250,9 +268,17 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
// ── Canvas ResizeObserver ──
|
||||
const canvasContainerRef = useRef<HTMLDivElement>(null)
|
||||
useEffect(() => {
|
||||
if (!effectiveUseWebCodecs || !canPlay) return
|
||||
const container = canvasContainerRef.current
|
||||
const canvas = canvasRef.current
|
||||
if (!container || !canvas) return
|
||||
// 立即设置一次 canvas 像素分辨率,避免默认 300×150 导致首帧变形
|
||||
const initRect = container.getBoundingClientRect()
|
||||
if (initRect.width > 0 && initRect.height > 0) {
|
||||
const dpr = window.devicePixelRatio || 1
|
||||
canvas.width = initRect.width * dpr
|
||||
canvas.height = initRect.height * dpr
|
||||
}
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
for (const entry of entries) {
|
||||
const { width, height } = entry.contentRect
|
||||
@@ -264,7 +290,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
})
|
||||
ro.observe(container)
|
||||
return () => ro.disconnect()
|
||||
}, [])
|
||||
}, [effectiveUseWebCodecs, canPlay])
|
||||
|
||||
// ── 未就绪 ──
|
||||
if (!ready || !assets.length) {
|
||||
@@ -290,6 +316,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
|
||||
// ── 无播放片段 ──
|
||||
if (!canPlay) {
|
||||
const showDecodeError = forceVideoFallback && canvasState.hasDecodeError
|
||||
return (
|
||||
<div
|
||||
className="xx-preview-empty"
|
||||
@@ -308,6 +335,19 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
<LoadingOutlined style={{ fontSize: 48, color: "#fff", marginBottom: 12 }} spin />
|
||||
<p style={{ color: "rgba(255,255,255,0.8)" }}>加载中...</p>
|
||||
</>
|
||||
) : showDecodeError ? (
|
||||
<>
|
||||
<PlayCircleOutlined style={{ fontSize: 48, color: "#ef4444", marginBottom: 12 }} />
|
||||
<p className="xx-preview-empty-title" style={{ color: "rgba(255,255,255,0.9)" }}>
|
||||
视频解码失败
|
||||
</p>
|
||||
<p
|
||||
className="xx-preview-empty-desc"
|
||||
style={{ color: "rgba(255,255,255,0.6)", maxWidth: 300, textAlign: "center" }}
|
||||
>
|
||||
{canvasState.errorMessage || "当前浏览器不支持该视频编码格式,请刷新重试"}
|
||||
</p>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<PlayCircleOutlined
|
||||
@@ -324,7 +364,7 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
return (
|
||||
<>
|
||||
{/* ── Canvas 渲染层(WebCodecs 路径) ── */}
|
||||
{useWebCodecs && (
|
||||
{effectiveUseWebCodecs && (
|
||||
<div
|
||||
ref={canvasContainerRef}
|
||||
style={{
|
||||
@@ -345,8 +385,8 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* ── Video 渲染层(fallback 路径) ── */}
|
||||
{!useWebCodecs &&
|
||||
{/* ── Video 渲染层(fallback 路径,或 WebCodecs 解码失败时自动切换) ── */}
|
||||
{!effectiveUseWebCodecs &&
|
||||
segments.map((seg, i) => (
|
||||
<video
|
||||
key={seg.assetId}
|
||||
@@ -415,7 +455,11 @@ const FrontendPreviewPlayer: React.FC<FrontendPreviewPlayerProps> = ({
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
{useWebCodecs ? "Canvas" : `片段 ${videoCurrentSegIdx + 1}/${segments.length}`}
|
||||
{effectiveUseWebCodecs
|
||||
? "Canvas"
|
||||
: forceVideoFallback
|
||||
? "Canvas 解码失败,已切换原生播放"
|
||||
: `片段 ${videoCurrentSegIdx + 1}/${segments.length}`}
|
||||
</div>
|
||||
|
||||
{/* 控制条 */}
|
||||
|
||||
@@ -193,7 +193,7 @@ export const PreviewVideoPanel: React.FC<PreviewVideoPanelProps> = ({
|
||||
titleSettings,
|
||||
voiceAudioUrl,
|
||||
}) => {
|
||||
const videoAspectStyle = { aspectRatio: (videoRatio || "16:9").replace(":", "/") }
|
||||
const videoAspectStyle = { aspectRatio: (videoRatio || "9:16").replace(":", "/") }
|
||||
|
||||
return (
|
||||
<div className="xx-generate-preview">
|
||||
|
||||
@@ -30,7 +30,7 @@ export const UploadCoverPicker: React.FC<UploadCoverPickerProps> = ({ uploadUrl,
|
||||
<div className="xx-cover-upload-placeholder">
|
||||
<span style={{ fontSize: 32 }}>📤</span>
|
||||
<span className="xx-cover-upload-text">点击上传封面图片</span>
|
||||
<span className="xx-cover-upload-hint">支持 JPG / PNG,建议 16:9 比例</span>
|
||||
<span className="xx-cover-upload-hint">支持 JPG / PNG,建议 9:16 比例</span>
|
||||
</div>
|
||||
)}
|
||||
<input
|
||||
|
||||
@@ -891,7 +891,7 @@
|
||||
|
||||
/* ── 视频预览 ── */
|
||||
.xx-preview-video {
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
max-height: 400px;
|
||||
border-radius: var(--radius-md);
|
||||
background: linear-gradient(135deg, var(--color-gray-900), var(--color-primary-900));
|
||||
@@ -1516,7 +1516,7 @@
|
||||
.xx-smart-match-thumb {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
background: #f1f5f9;
|
||||
overflow: hidden;
|
||||
}
|
||||
@@ -2144,7 +2144,7 @@
|
||||
}
|
||||
|
||||
.xx-cover-frame-placeholder {
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||
border-radius: var(--radius-md);
|
||||
display: flex;
|
||||
@@ -2247,7 +2247,7 @@
|
||||
}
|
||||
|
||||
.xx-cover-upload-area {
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
border: 2px dashed var(--border-color);
|
||||
border-radius: var(--radius-md);
|
||||
display: flex;
|
||||
@@ -2308,7 +2308,7 @@
|
||||
|
||||
.xx-cover-preview-box {
|
||||
position: relative;
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
background: var(--bg-tertiary);
|
||||
border-radius: var(--radius-md);
|
||||
overflow: hidden;
|
||||
@@ -2666,7 +2666,7 @@
|
||||
.xx-preview-video-wrapper .xx-preview-video {
|
||||
max-width: 300px;
|
||||
width: 100%;
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
@@ -2772,7 +2772,7 @@
|
||||
|
||||
.xx-video-thumb {
|
||||
position: relative;
|
||||
aspect-ratio: 16 / 9;
|
||||
aspect-ratio: 9 / 16;
|
||||
background: var(--bg-tertiary);
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
@@ -8,6 +8,25 @@ import { useRef, useCallback, useEffect, useState } from "react"
|
||||
import { createFile } from "mp4box"
|
||||
import type { Movie, Sample } from "mp4box"
|
||||
|
||||
// ── 常量 ──
|
||||
/** 初始化预解码最大帧数(约 2 秒 @30fps),后续帧通过 decodeAroundPosition 按需解码 */
|
||||
const MAX_INIT_FRAMES = 60
|
||||
|
||||
/**
|
||||
* 规范化 mp4box 提取的 codec 字符串为 WebCodecs 兼容格式
|
||||
* mp4box 返回的 codec 可能包含 mp4box 特有后缀(如 avc1.640028),
|
||||
* WebCodecs 要求标准 ISO BMFF codec string(如 avc1.640028)
|
||||
* 大部分情况下格式一致,但需要做防御性处理
|
||||
*/
|
||||
function normalizeCodecString(codec: string): string {
|
||||
// mp4box 有时返回带空格的 codec,去掉
|
||||
const trimmed = codec.trim()
|
||||
// HEVC: mp4box 可能返回 hev1.1.6.L93.B0 或 hvc1.1.6.L93.B0
|
||||
// WebCodecs 接受 hev1.x.x 或 hvc1.x.x,两者都可
|
||||
// H.264: mp4box 返回 avc1.640028,WebCodecs 也接受
|
||||
return trimmed
|
||||
}
|
||||
|
||||
// ── MP4 Box 解析辅助函数 ──
|
||||
|
||||
// MP4 标准容器 box 列表(递归时会进入这些 box 内部搜索子 box)
|
||||
@@ -168,6 +187,10 @@ export interface CanvasPlayerState {
|
||||
duration: number
|
||||
isReady: boolean
|
||||
isBuffering: boolean
|
||||
/** WebCodecs 解码失败时为 true,调用方应 fallback 到原生 video 播放 */
|
||||
hasDecodeError: boolean
|
||||
/** 解码错误信息(用于 UI 展示) */
|
||||
errorMessage: string
|
||||
}
|
||||
|
||||
export interface CanvasPlayerControls {
|
||||
@@ -205,6 +228,7 @@ export function useCanvasPlayer(
|
||||
stroke?: boolean
|
||||
shadow?: boolean
|
||||
},
|
||||
onError?: (error: Error) => void,
|
||||
) {
|
||||
const [state, setState] = useState<CanvasPlayerState>({
|
||||
hasSupport: isWebCodecsSupported(),
|
||||
@@ -213,11 +237,17 @@ export function useCanvasPlayer(
|
||||
duration: 0,
|
||||
isReady: false,
|
||||
isBuffering: false,
|
||||
hasDecodeError: false,
|
||||
errorMessage: "",
|
||||
})
|
||||
|
||||
// ── 内部引用 ──
|
||||
const decoderRef = useRef<VideoDecoder | null>(null)
|
||||
const frameQueueRef = useRef(new FrameQueue(10))
|
||||
const frameQueueRef = useRef(new FrameQueue(600))
|
||||
/** 已解码的片段索引集合,用于按需解码(先标记防重入,失败时移除允许重试) */
|
||||
const decodedSegmentsRef = useRef(new Set<number>())
|
||||
/** 解码代数计数器,seek 时递增以作废正在进行的异步解码 */
|
||||
const decodeGenerationRef = useRef(0)
|
||||
const rafRef = useRef<number>(0)
|
||||
const playStartRef = useRef<number>(0)
|
||||
const playStartOffsetRef = useRef<number>(0)
|
||||
@@ -226,6 +256,8 @@ export function useCanvasPlayer(
|
||||
const videoDimRef = useRef<{ width: number; height: number }>({ width: 0, height: 0 })
|
||||
const isDestroyedRef = useRef(false)
|
||||
const lastProgressUpdateRef = useRef<number>(0)
|
||||
const onErrorRef = useRef(onError)
|
||||
onErrorRef.current = onError
|
||||
|
||||
// 计算总时长
|
||||
const totalDuration = segments.reduce((sum, seg) => sum + (seg.endTime - seg.startTime), 0)
|
||||
@@ -359,7 +391,7 @@ export function useCanvasPlayer(
|
||||
globalEndTime: globalStart + (segment.endTime - segment.startTime),
|
||||
trackId: videoTrack.id ?? 1,
|
||||
timescale: videoTrack.timescale ?? 90000,
|
||||
codec: videoTrack.codec ?? "avc1.42E01E",
|
||||
codec: normalizeCodecString(videoTrack.codec ?? "avc1.42E01E"),
|
||||
videoWidth: videoTrack.track_width || 1280,
|
||||
videoHeight: videoTrack.track_height || 720,
|
||||
description,
|
||||
@@ -445,7 +477,7 @@ export function useCanvasPlayer(
|
||||
|
||||
// ── 初始化 VideoDecoder 并解码指定片段 ──
|
||||
const decodeSegment = useCallback(
|
||||
async (_buffer: ArrayBuffer, meta: SegmentMeta): Promise<void> => {
|
||||
async (_buffer: ArrayBuffer, meta: SegmentMeta, maxFrames?: number): Promise<void> => {
|
||||
if (isDestroyedRef.current) return
|
||||
|
||||
let decoderReady = false
|
||||
@@ -453,6 +485,13 @@ export function useCanvasPlayer(
|
||||
// 配置解码器(每个片段可能需要不同的 codec/分辨率)
|
||||
const decoder = new VideoDecoder({
|
||||
output: (frame: VideoFrame) => {
|
||||
// 从第一帧获取实际尺寸
|
||||
if (videoDimRef.current.width === 0 || videoDimRef.current.height === 0) {
|
||||
videoDimRef.current = { width: frame.codedWidth, height: frame.codedHeight }
|
||||
console.log(
|
||||
`[useCanvasPlayer] Actual frame size: ${frame.codedWidth}x${frame.codedHeight}`,
|
||||
)
|
||||
}
|
||||
const localTime = frame.timestamp / 1_000_000
|
||||
const globalTime = localTime + meta.globalStartTime
|
||||
frameQueueRef.current.push({
|
||||
@@ -462,7 +501,15 @@ export function useCanvasPlayer(
|
||||
})
|
||||
},
|
||||
error: (e: DOMException) => {
|
||||
console.error("[useCanvasPlayer] Decoder error:", e)
|
||||
console.error("[useCanvasPlayer] Decoder error callback:", e)
|
||||
const error = new Error(`VideoDecoder error: ${e.message || e.name || "unknown"}`)
|
||||
setState((s) => ({
|
||||
...s,
|
||||
isBuffering: false,
|
||||
hasDecodeError: true,
|
||||
errorMessage: `视频解码器错误: ${e.message || "解码异常"}`,
|
||||
}))
|
||||
onErrorRef.current?.(error)
|
||||
},
|
||||
})
|
||||
|
||||
@@ -472,26 +519,39 @@ export function useCanvasPlayer(
|
||||
descriptionByteLength: meta.description?.byteLength,
|
||||
videoWidth: meta.videoWidth,
|
||||
videoHeight: meta.videoHeight,
|
||||
codecCharCodes: meta.codec.split("").map((c) => c.charCodeAt(0)),
|
||||
})
|
||||
|
||||
try {
|
||||
await decoder.configure({
|
||||
codec: meta.codec,
|
||||
codedWidth: meta.videoWidth,
|
||||
codedHeight: meta.videoHeight,
|
||||
...(meta.description ? { description: meta.description } : {}),
|
||||
})
|
||||
decoderRef.current = decoder
|
||||
decoderReady = true
|
||||
// 标记缓冲结束,让 UI 开始渲染
|
||||
setState((s) => ({ ...s, isBuffering: false }))
|
||||
|
||||
// 更新视频尺寸(用于 aspect ratio)
|
||||
if (meta.videoWidth > 0 && meta.videoHeight > 0) {
|
||||
videoDimRef.current = { width: meta.videoWidth, height: meta.videoHeight }
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("[useCanvasPlayer] Decoder configure failed for segment:", err)
|
||||
const error = err instanceof Error ? err : new Error(String(err))
|
||||
console.error(
|
||||
"[useCanvasPlayer] Decoder configure failed for segment:",
|
||||
meta.assetId,
|
||||
error,
|
||||
)
|
||||
console.error("[useCanvasPlayer] Failed codec config:", {
|
||||
codec: meta.codec,
|
||||
descriptionByteLength: meta.description?.byteLength,
|
||||
videoWidth: meta.videoWidth,
|
||||
videoHeight: meta.videoHeight,
|
||||
})
|
||||
setState((s) => ({
|
||||
...s,
|
||||
isBuffering: false,
|
||||
isReady: false,
|
||||
hasDecodeError: true,
|
||||
errorMessage: `视频解码失败: ${error.message || "不支持的编解码器"}`,
|
||||
}))
|
||||
onErrorRef.current?.(error)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -510,12 +570,20 @@ export function useCanvasPlayer(
|
||||
// 送入解码器
|
||||
let decodedCount = 0
|
||||
let skippedCount = 0
|
||||
let decodeErrors = 0
|
||||
for (const sample of samplesCollected) {
|
||||
if (!sample.data || isDestroyedRef.current) {
|
||||
skippedCount++
|
||||
continue
|
||||
}
|
||||
if (decoder.state === "closed") break
|
||||
// 初始化阶段限制解码帧数,避免帧缓冲溢出
|
||||
if (maxFrames && decodedCount >= maxFrames) {
|
||||
console.log(
|
||||
`[useCanvasPlayer] Segment ${meta.assetId}: init decode limited to ${maxFrames} frames`,
|
||||
)
|
||||
break
|
||||
}
|
||||
|
||||
const chunk = new EncodedVideoChunk({
|
||||
type: sample.is_sync ? "key" : "delta",
|
||||
@@ -525,30 +593,95 @@ export function useCanvasPlayer(
|
||||
})
|
||||
|
||||
try {
|
||||
decoder.decode(chunk)
|
||||
await decoder.decode(chunk) // 修复:await 捕获异步错误
|
||||
decodedCount++
|
||||
} catch (e) {
|
||||
console.warn("[useCanvasPlayer] Decode chunk error:", e)
|
||||
decodeErrors++
|
||||
console.warn(`[useCanvasPlayer] Decode chunk error (${decodeErrors}):`, e)
|
||||
// 连续 3 次解码失败,放弃当前片段并报告错误
|
||||
if (decodeErrors >= 3) {
|
||||
console.error("[useCanvasPlayer] Too many decode errors, aborting segment")
|
||||
const error = new Error(`视频解码连续失败 ${decodeErrors} 次,片段: ${meta.assetId}`)
|
||||
setState((s) => ({
|
||||
...s,
|
||||
isBuffering: false,
|
||||
hasDecodeError: true,
|
||||
errorMessage: `视频解码失败: 连续 ${decodeErrors} 次错误`,
|
||||
}))
|
||||
onErrorRef.current?.(error)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(
|
||||
`[useCanvasPlayer] Segment ${meta.assetId}: decoded ${decodedCount}, skipped ${skippedCount}, decoder.state=${decoder.state}`,
|
||||
`[useCanvasPlayer] Segment ${meta.assetId}: decoded ${decodedCount}, skipped ${skippedCount}, errors ${decodeErrors}, decoder.state=${decoder.state}`,
|
||||
)
|
||||
|
||||
// flush 超时保护:10秒
|
||||
try {
|
||||
await Promise.race([
|
||||
decoder.flush(),
|
||||
new Promise((_, reject) => setTimeout(() => reject(new Error("flush timeout 10s")), 10_000)),
|
||||
])
|
||||
console.log(`[useCanvasPlayer] Segment ${meta.assetId}: flush complete`)
|
||||
} catch (e) {
|
||||
console.warn("[useCanvasPlayer] Decoder flush error:", e)
|
||||
// flush 仅在解码器状态正常时执行
|
||||
if (decoder.state === "configured") {
|
||||
try {
|
||||
await decoder.flush()
|
||||
console.log(`[useCanvasPlayer] Segment ${meta.assetId}: flush complete`)
|
||||
} catch (e) {
|
||||
console.warn("[useCanvasPlayer] Decoder flush error:", e)
|
||||
}
|
||||
}
|
||||
},
|
||||
[],
|
||||
)
|
||||
|
||||
/**
|
||||
* 按需解码当前播放位置 ±1 个片段。
|
||||
* 在渲染循环中定期调用,避免一次性解码所有片段导致环形缓冲区溢出丢帧。
|
||||
* 使用"先标记再解码"模式防止并发重复解码,失败时移除标记允许重试。
|
||||
*/
|
||||
const decodeAroundPosition = useCallback(
|
||||
async (currentTime: number) => {
|
||||
const metas = segmentMetaRef.current
|
||||
if (!metas || metas.length === 0) return
|
||||
|
||||
// 记录当前代数,seek 后代数变化则中止
|
||||
const gen = decodeGenerationRef.current
|
||||
|
||||
let targetIdx = -1
|
||||
let acc = 0
|
||||
for (let i = 0; i < metas.length; i++) {
|
||||
const dur = metas[i].globalEndTime - metas[i].globalStartTime
|
||||
if (currentTime < acc + dur) {
|
||||
targetIdx = i
|
||||
break
|
||||
}
|
||||
acc += dur
|
||||
}
|
||||
if (targetIdx === -1) targetIdx = metas.length - 1
|
||||
|
||||
for (
|
||||
let i = Math.max(0, targetIdx - 1);
|
||||
i <= Math.min(metas.length - 1, targetIdx + 1);
|
||||
i++
|
||||
) {
|
||||
// seek 已作废当前解码任务
|
||||
if (decodeGenerationRef.current !== gen) return
|
||||
if (decodedSegmentsRef.current.has(i)) continue
|
||||
const meta = metas[i]
|
||||
const buffer = segmentDataRef.current.get(meta.assetId)
|
||||
if (!buffer) continue
|
||||
// 先标记为解码中,防止下一帧渲染时重复发起解码
|
||||
decodedSegmentsRef.current.add(i)
|
||||
try {
|
||||
await decodeSegment(buffer, meta, 300)
|
||||
} catch (e) {
|
||||
// 解码失败则移除标记,允许后续重试
|
||||
decodedSegmentsRef.current.delete(i)
|
||||
console.warn(`[useCanvasPlayer] 按需解码片段 ${i} 失败:`, e)
|
||||
}
|
||||
// await 后再次检查代数,seek 期间不更新标记
|
||||
if (decodeGenerationRef.current !== gen) return
|
||||
}
|
||||
},
|
||||
[decodeSegment],
|
||||
)
|
||||
|
||||
// ── 标题绘制 ──
|
||||
const drawTitle = useCallback(
|
||||
(
|
||||
@@ -650,6 +783,8 @@ export function useCanvasPlayer(
|
||||
const elapsed = (performance.now() - playStartRef.current) / 1000
|
||||
const currentTime = Math.min(playStartOffsetRef.current + elapsed, totalDuration)
|
||||
|
||||
// getCurrentFrame 返回 FrameQueue 内部引用,帧生命周期由 FrameQueue 管理
|
||||
// (push 淘汰旧帧时 close、clear 时全部 close),渲染层不应 close
|
||||
const frame = frameQueueRef.current.getCurrentFrame(currentTime)
|
||||
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height)
|
||||
@@ -673,6 +808,8 @@ export function useCanvasPlayer(
|
||||
}
|
||||
return s
|
||||
})
|
||||
// 按需解码当前 ±1 片段
|
||||
decodeAroundPosition(currentTime)
|
||||
}
|
||||
|
||||
if (currentTime >= totalDuration) {
|
||||
@@ -681,18 +818,29 @@ export function useCanvasPlayer(
|
||||
}
|
||||
|
||||
rafRef.current = requestAnimationFrame(renderFrame)
|
||||
}, [canvasRef, totalDuration, titleSettings, drawTitle, computeDrawRect])
|
||||
}, [canvasRef, totalDuration, titleSettings, drawTitle, computeDrawRect, decodeAroundPosition])
|
||||
|
||||
// ── 播放控制 ──
|
||||
const play = useCallback(async () => {
|
||||
if (!state.hasSupport || isDestroyedRef.current) return
|
||||
|
||||
// 重播场景:currentTime 已回到起点但 decodedSegmentsRef 仍有旧标记
|
||||
// 此时 FrameQueue 中旧帧已被淘汰,需清空标记让 decodeAroundPosition 重新解码
|
||||
if (state.currentTime <= 0.1 && decodedSegmentsRef.current.size > 0) {
|
||||
decodeGenerationRef.current++
|
||||
decodedSegmentsRef.current.clear()
|
||||
// 同步清空帧缓冲,避免旧帧残留导致 getCurrentFrame 返回 null
|
||||
frameQueueRef.current.clear()
|
||||
}
|
||||
|
||||
setState((s) => ({ ...s, isPlaying: true }))
|
||||
playStartRef.current = performance.now()
|
||||
playStartOffsetRef.current = state.currentTime
|
||||
lastProgressUpdateRef.current = 0
|
||||
rafRef.current = requestAnimationFrame(renderFrame)
|
||||
}, [state.hasSupport, state.currentTime, renderFrame])
|
||||
// 立即触发一次按需解码,不等渲染循环 200ms 节流
|
||||
decodeAroundPosition(state.currentTime)
|
||||
}, [state.hasSupport, state.currentTime, renderFrame, decodeAroundPosition])
|
||||
|
||||
const pause = useCallback(() => {
|
||||
setState((s) => ({ ...s, isPlaying: false }))
|
||||
@@ -700,15 +848,19 @@ export function useCanvasPlayer(
|
||||
}, [])
|
||||
|
||||
const seek = useCallback(
|
||||
(time: number) => {
|
||||
async (time: number) => {
|
||||
const clampedTime = Math.max(0, Math.min(time, totalDuration))
|
||||
setState((s) => ({ ...s, currentTime: clampedTime }))
|
||||
playStartOffsetRef.current = clampedTime
|
||||
playStartRef.current = performance.now()
|
||||
// seek 后清空帧队列,等待新帧解码
|
||||
// seek 时递增解码代数,作废正在进行的异步解码
|
||||
decodeGenerationRef.current++
|
||||
// 清空帧队列(clear 内部会 close 所有帧)+ 清空已解码标记
|
||||
frameQueueRef.current.clear()
|
||||
decodedSegmentsRef.current.clear()
|
||||
await decodeAroundPosition(clampedTime)
|
||||
},
|
||||
[totalDuration],
|
||||
[totalDuration, decodeAroundPosition],
|
||||
)
|
||||
|
||||
const destroy = useCallback(() => {
|
||||
@@ -719,9 +871,12 @@ export function useCanvasPlayer(
|
||||
decoderRef.current.close()
|
||||
}
|
||||
|
||||
// 递增代数中止进行中的异步解码,清空帧队列(clear 内部 close 所有帧)
|
||||
decodeGenerationRef.current++
|
||||
frameQueueRef.current.clear()
|
||||
segmentDataRef.current.clear()
|
||||
segmentMetaRef.current = []
|
||||
decodedSegmentsRef.current.clear()
|
||||
}, [])
|
||||
|
||||
// ── 预加载下一个片段的数据 ──
|
||||
@@ -792,17 +947,27 @@ export function useCanvasPlayer(
|
||||
|
||||
segmentMetaRef.current = metas
|
||||
|
||||
// 3. 设置视频尺寸(用第一个片段的尺寸)
|
||||
if (metas[0].videoWidth > 0 && metas[0].videoHeight > 0) {
|
||||
videoDimRef.current = { width: metas[0].videoWidth, height: metas[0].videoHeight }
|
||||
}
|
||||
|
||||
// 4. 依次解码每个片段
|
||||
for (const meta of metas) {
|
||||
// 3. 按需解码:初始只解码前 3 个片段,后续通过 decodeAroundPosition 动态加载
|
||||
// 避免一次性全量解码导致 frameQueue 环形缓冲区旧帧被丢弃引发黑屏
|
||||
decodedSegmentsRef.current.clear()
|
||||
const initGen = decodeGenerationRef.current
|
||||
const initialDecodeCount = Math.min(metas.length, 3)
|
||||
for (let i = 0; i < initialDecodeCount; i++) {
|
||||
if (cancelled) break
|
||||
// seek 或 destroy 已作废当前初始化
|
||||
if (decodeGenerationRef.current !== initGen) break
|
||||
const meta = metas[i]
|
||||
const buffer = segmentDataRef.current.get(meta.assetId)
|
||||
if (!buffer) continue
|
||||
await decodeSegment(buffer, meta)
|
||||
if (cancelled) break
|
||||
// 先标记为解码中,防止重复解码
|
||||
decodedSegmentsRef.current.add(i)
|
||||
try {
|
||||
await decodeSegment(buffer, meta, MAX_INIT_FRAMES)
|
||||
} catch (e) {
|
||||
// 解码失败则移除标记,允许后续重试
|
||||
decodedSegmentsRef.current.delete(i)
|
||||
console.warn(`[useCanvasPlayer] 初始化解码片段 ${i} 失败:`, e)
|
||||
}
|
||||
}
|
||||
|
||||
if (!cancelled) {
|
||||
|
||||
@@ -114,9 +114,22 @@ export function useStep6Cover({
|
||||
const anyErr = err as any
|
||||
const statusCode = anyErr?.response?.status
|
||||
|
||||
// 400 错误:后端缺少预览视频,自动创建后重试
|
||||
if (statusCode === 400) {
|
||||
console.log("[Step6] 后端返回 400,尝试自动创建预览渲染任务...")
|
||||
// 400 错误:精确判断是否为"预览缺失",避免误判其他 400 错误
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const errCode = anyErr?.response?.data?.code as string | undefined
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const errMsg = (anyErr?.response?.data?.message ||
|
||||
anyErr?.response?.data?.detail ||
|
||||
"") as string
|
||||
const isPreviewMissing =
|
||||
statusCode === 400 &&
|
||||
(errCode?.includes("PREVIEW") ||
|
||||
/预览.*(?:缺失|不存在|未找到)|(?:missing|not found|does not exist).*preview/i.test(
|
||||
errMsg,
|
||||
))
|
||||
|
||||
if (isPreviewMissing) {
|
||||
console.log("[Step6] 检测到预览缺失,尝试自动创建预览渲染任务...")
|
||||
message.info("正在准备预览视频,请稍候...")
|
||||
try {
|
||||
const previewResp = await createPreview({
|
||||
@@ -124,23 +137,34 @@ export function useStep6Cover({
|
||||
asset_ids: assetIds,
|
||||
duration: duration || 30,
|
||||
})
|
||||
// 轮询等待预览渲染完成
|
||||
// 轮询等待预览渲染完成:递归 setTimeout 避免请求重叠 + 120s 超时兜底
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const poll = setInterval(async () => {
|
||||
let finished = false
|
||||
const done = (fn: () => void) => {
|
||||
if (finished) return
|
||||
finished = true
|
||||
clearTimeout(timeoutId)
|
||||
fn()
|
||||
}
|
||||
const timeoutId = setTimeout(() => {
|
||||
done(() => reject(new Error("预览生成超时,请稍后重试")))
|
||||
}, 120_000)
|
||||
const poll = async () => {
|
||||
if (finished) return
|
||||
try {
|
||||
const status = await getPreviewStatus(previewResp.task_id)
|
||||
if (status.status === "completed") {
|
||||
clearInterval(poll)
|
||||
resolve()
|
||||
done(() => resolve())
|
||||
} else if (status.status === "failed") {
|
||||
clearInterval(poll)
|
||||
reject(new Error(status.error_message || "预览渲染失败"))
|
||||
done(() => reject(new Error(status.error_message || "预览渲染失败")))
|
||||
} else {
|
||||
setTimeout(poll, 2000)
|
||||
}
|
||||
} catch (e) {
|
||||
clearInterval(poll)
|
||||
reject(e)
|
||||
done(() => reject(e))
|
||||
}
|
||||
}, 3000)
|
||||
}
|
||||
poll()
|
||||
})
|
||||
message.success("预览视频就绪,重新生成封面...")
|
||||
// 重试封面生成
|
||||
|
||||
+23
-22
@@ -2,14 +2,13 @@ import { useState, useCallback } from "react"
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query"
|
||||
import { message } from "antd"
|
||||
import {
|
||||
createAsset,
|
||||
uploadAssetDirect,
|
||||
getAssetLibraries,
|
||||
getIngestJob,
|
||||
type AssetLibraryItem,
|
||||
} from "@/api/assets"
|
||||
import { tagAsset } from "@/api/tags"
|
||||
import { type VoiceGender, type VoiceMaterial, buildMetadata } from "../../../types"
|
||||
import { getAudioDuration } from "../../../utils/audio"
|
||||
import { type VoiceGender, type VoiceMaterial } from "../../../types"
|
||||
|
||||
interface UseVoiceUploadOptions {
|
||||
voiceLibrary?: { id: string; kind: string }
|
||||
@@ -48,32 +47,34 @@ export function useVoiceUpload({ voiceLibrary, createLibMutation }: UseVoiceUplo
|
||||
if (!lib) throw new Error("无法创建配音库")
|
||||
}
|
||||
|
||||
// 2. 上传文件(带进度)
|
||||
const { storage_key } = await uploadAssetDirect({
|
||||
// 2. 上传文件(带进度,后端自动创建 ingest job)
|
||||
const { ingest_job_id } = await uploadAssetDirect({
|
||||
file: data.file,
|
||||
library_id: lib.id,
|
||||
onProgress: (p) => setUploadProgress(p),
|
||||
})
|
||||
|
||||
// 3. 获取音频时长
|
||||
const duration = await getAudioDuration(data.file)
|
||||
// 3. 轮询 ingest job 状态
|
||||
let job: Awaited<ReturnType<typeof getIngestJob>> | null = null
|
||||
let retries = 0
|
||||
const maxRetries = 60 // 最多等待 5 分钟
|
||||
while (retries < maxRetries) {
|
||||
await new Promise((r) => setTimeout(r, 5000))
|
||||
job = await getIngestJob(ingest_job_id)
|
||||
if (job.status === "completed" || job.status === "failed") break
|
||||
retries++
|
||||
}
|
||||
|
||||
// 4. 创建素材记录
|
||||
const asset = await createAsset({
|
||||
library_id: lib.id,
|
||||
name: data.name,
|
||||
storage_key,
|
||||
mime_type: data.file.type || "audio/mpeg",
|
||||
metadata: buildMetadata({
|
||||
gender: data.gender,
|
||||
description: data.description,
|
||||
duration,
|
||||
}),
|
||||
})
|
||||
if (!job || job.status === "failed") {
|
||||
throw new Error("音频处理失败,请重试")
|
||||
}
|
||||
if (retries >= maxRetries) {
|
||||
throw new Error("音频处理超时,请稍后在素材库查看")
|
||||
}
|
||||
|
||||
// 5. 打标签(标签走独立 API)
|
||||
if (data.tagIds.length > 0) {
|
||||
await tagAsset(asset.id, data.tagIds)
|
||||
// 4. 打标签(标签走独立 API)
|
||||
if (data.tagIds.length > 0 && job.result_asset_id) {
|
||||
await tagAsset(job.result_asset_id, data.tagIds)
|
||||
}
|
||||
} finally {
|
||||
setUploadProgress(null)
|
||||
|
||||
@@ -21,7 +21,7 @@ export interface VoiceMaterial {
|
||||
fileUrl?: string
|
||||
}
|
||||
|
||||
/** 配音素材上传元数据(传递给 createAsset 的 metadata) */
|
||||
/** 配音素材上传元数据(上传素材的 metadata) */
|
||||
export interface VoiceAssetMetadata {
|
||||
gender: VoiceGender
|
||||
description: string
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import { useState, useCallback } from "react"
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query"
|
||||
import { uploadAssetDirect, getAssetLibraries, createAsset } from "@/api/assets"
|
||||
import { getAudioDuration } from "../utils/audio"
|
||||
import { buildVoiceMetadata } from "../types"
|
||||
import { uploadAssetDirect, getAssetLibraries, getIngestJob } from "@/api/assets"
|
||||
|
||||
/**
|
||||
* 配音上传 Hook
|
||||
@@ -33,27 +31,30 @@ export function useVoiceUpload({ showToast }: UseVoiceUploadProps) {
|
||||
const lib = libs.find((l) => l.kind === "voice")
|
||||
if (!lib) throw new Error("配音库不存在,请先在配音库页面创建")
|
||||
|
||||
/* 直传文件 */
|
||||
const { storage_key } = await uploadAssetDirect({
|
||||
/* 直传文件(后端会自动创建 ingest job) */
|
||||
const { ingest_job_id } = await uploadAssetDirect({
|
||||
file: data.file,
|
||||
library_id: lib.id,
|
||||
onProgress: (p) => setUploadProgress(p),
|
||||
})
|
||||
|
||||
/* 获取音频时长 */
|
||||
const duration = await getAudioDuration(data.file)
|
||||
/* 轮询 ingest job 状态,等待 Worker 处理完成 */
|
||||
let jobStatus = ""
|
||||
let retries = 0
|
||||
const maxRetries = 60 // 最多等待 5 分钟(60 * 5秒)
|
||||
while (jobStatus !== "ready" && jobStatus !== "failed" && retries < maxRetries) {
|
||||
await new Promise((r) => setTimeout(r, 5000))
|
||||
const job = await getIngestJob(ingest_job_id)
|
||||
jobStatus = job.status
|
||||
retries++
|
||||
}
|
||||
|
||||
/* 创建素材记录 */
|
||||
await createAsset({
|
||||
library_id: lib.id,
|
||||
name: data.name,
|
||||
storage_key,
|
||||
mime_type: data.file.type || "audio/mpeg",
|
||||
metadata: buildVoiceMetadata({
|
||||
description: data.description,
|
||||
duration,
|
||||
}),
|
||||
})
|
||||
if (jobStatus === "failed") {
|
||||
throw new Error("音频处理失败,请重试")
|
||||
}
|
||||
if (retries >= maxRetries) {
|
||||
throw new Error("音频处理超时,请稍后在素材库查看")
|
||||
}
|
||||
} finally {
|
||||
setUploadProgress(null)
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ export interface ClonedVoiceDisplay {
|
||||
sampleUrl?: string
|
||||
}
|
||||
|
||||
/** 音色上传元数据(传递给 createAsset 的 metadata) */
|
||||
/** 音色上传元数据(上传素材的 metadata) */
|
||||
export interface VoiceUploadMetadata {
|
||||
gender?: string
|
||||
description?: string
|
||||
|
||||
@@ -7,11 +7,9 @@ import {
|
||||
deleteAssetLibrary,
|
||||
getAssets,
|
||||
getAssetsByKind,
|
||||
createAsset,
|
||||
updateAsset,
|
||||
updateAssetReviewStatus,
|
||||
deleteAsset,
|
||||
uploadAsset,
|
||||
prepareDirectUpload,
|
||||
completeDirectUpload,
|
||||
uploadAssetDirect,
|
||||
@@ -175,22 +173,6 @@ describe("assets API", () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe("createAsset", () => {
|
||||
it("should resolve successfully", async () => {
|
||||
await expect(createAsset({ name: "test-item" })).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it("should reject on API error", async () => {
|
||||
mockGet.mockRejectedValue(new Error("Network error"))
|
||||
mockPost.mockRejectedValue(new Error("Network error"))
|
||||
mockPut.mockRejectedValue(new Error("Network error"))
|
||||
mockDelete.mockRejectedValue(new Error("Network error"))
|
||||
mockPatch.mockRejectedValue(new Error("Network error"))
|
||||
|
||||
await expect(createAsset({ name: "test-item" })).rejects.toThrow()
|
||||
})
|
||||
})
|
||||
|
||||
describe("updateAsset", () => {
|
||||
it("should resolve successfully", async () => {
|
||||
await expect(updateAsset("test-assetId")).resolves.not.toThrow()
|
||||
@@ -239,22 +221,6 @@ describe("assets API", () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe("uploadAsset", () => {
|
||||
it("should resolve successfully", async () => {
|
||||
await expect(uploadAsset(new FormData())).resolves.not.toThrow()
|
||||
})
|
||||
|
||||
it("should reject on API error", async () => {
|
||||
mockGet.mockRejectedValue(new Error("Network error"))
|
||||
mockPost.mockRejectedValue(new Error("Network error"))
|
||||
mockPut.mockRejectedValue(new Error("Network error"))
|
||||
mockDelete.mockRejectedValue(new Error("Network error"))
|
||||
mockPatch.mockRejectedValue(new Error("Network error"))
|
||||
|
||||
await expect(uploadAsset(new FormData())).rejects.toThrow()
|
||||
})
|
||||
})
|
||||
|
||||
describe("prepareDirectUpload", () => {
|
||||
it("should resolve successfully", async () => {
|
||||
await expect(prepareDirectUpload({ name: "test-item" })).resolves.not.toThrow()
|
||||
|
||||
@@ -10,7 +10,9 @@ vi.mock("@/api/voice-clone", () => ({
|
||||
}))
|
||||
|
||||
vi.mock("@/api/assets", () => ({
|
||||
uploadAsset: vi.fn(),
|
||||
uploadAssetDirect: vi
|
||||
.fn()
|
||||
.mockResolvedValue({ storage_key: "test", ingest_job_id: "test", url: "http://test" }),
|
||||
}))
|
||||
|
||||
vi.mock("@/components/ui", () => ({
|
||||
|
||||
@@ -180,7 +180,6 @@ vi.mock("@/api/assets", () => ({
|
||||
getAssets: vi.fn().mockResolvedValue({ items: [], total: 0 }),
|
||||
getAssetsByKind: vi.fn().mockResolvedValue({ items: [], total: 0 }),
|
||||
smartMatchAssets: vi.fn().mockResolvedValue({ items: [] }),
|
||||
createAsset: vi.fn().mockResolvedValue({}),
|
||||
updateAsset: vi.fn().mockResolvedValue({}),
|
||||
deleteAsset: vi.fn().mockResolvedValue({}),
|
||||
uploadAssetDirect: vi.fn().mockResolvedValue({}),
|
||||
|
||||
@@ -165,7 +165,6 @@ vi.mock("@/api/assets", () => ({
|
||||
deleteAssetLibrary: vi.fn().mockResolvedValue({}),
|
||||
getAssetsByKind: vi.fn().mockResolvedValue({ items: [], total: 0 }),
|
||||
getAssets: vi.fn().mockResolvedValue({ items: [], total: 0 }),
|
||||
createAsset: vi.fn().mockResolvedValue({}),
|
||||
updateAsset: vi.fn().mockResolvedValue({}),
|
||||
deleteAsset: vi.fn().mockResolvedValue({}),
|
||||
uploadAssetDirect: vi.fn().mockResolvedValue({}),
|
||||
|
||||
@@ -93,5 +93,5 @@ describe("useStep5Voice smoke test", () => {
|
||||
)
|
||||
expect(result.current).toBeDefined()
|
||||
expect(typeof result.current.handlePlayCloneSample).toBe("function")
|
||||
})
|
||||
}, 15_000)
|
||||
})
|
||||
|
||||
@@ -13,6 +13,7 @@ export default defineConfig({
|
||||
environment: "jsdom",
|
||||
globals: true,
|
||||
setupFiles: ["./src/test/setup.ts"],
|
||||
testTimeout: 15_000, // 全局 15 秒,防止 CI 高负载时偶发超时
|
||||
},
|
||||
plugins: [
|
||||
react({
|
||||
|
||||
@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
# OSS 上传配置
|
||||
OSS_CONNECT_TIMEOUT = 10 # 连接超时(秒),防止 TCP 握手挂死
|
||||
OSS_UPLOAD_TOTAL_TIMEOUT = 300 # 单文件上传总超时(秒),防止网络慢时无限卡住
|
||||
OSS_UPLOAD_TOTAL_TIMEOUT = 900 # 单文件上传总超时(秒),防止网络慢时无限卡住
|
||||
OSS_MULTIPART_THRESHOLD = 100 * 1024 * 1024 # 分片上传阈值:100MB 以上走分片
|
||||
OSS_PART_SIZE = 8 * 1024 * 1024 # 分片大小:8MB
|
||||
OSS_MULTIPART_NUM_THREADS = 3 # 分片上传并发数
|
||||
@@ -127,10 +127,10 @@ def download_asset(asset_storage_key: str, local_path: Path) -> bool:
|
||||
def _download_via_http(url: str, local_path: Path) -> bool:
|
||||
"""通过 HTTP 下载文件(支持预签名 URL)。
|
||||
|
||||
使用流式下载避免大文件内存溢出,超时 300s。
|
||||
使用流式下载避免大文件内存溢出,超时 900s。
|
||||
"""
|
||||
try:
|
||||
resp = requests.get(url, stream=True, timeout=300)
|
||||
resp = requests.get(url, stream=True, timeout=900)
|
||||
resp.raise_for_status()
|
||||
with open(local_path, "wb") as f:
|
||||
for chunk in resp.iter_content(chunk_size=8 * 1024 * 1024):
|
||||
@@ -146,7 +146,7 @@ def upload_to_oss(local_path: Path | str, storage_key: str) -> str | None:
|
||||
"""上传文件到 OSS,返回公开 URL。
|
||||
|
||||
大文件(>100MB)自动走分片上传,降低内存峰值,减少 OOM 风险。
|
||||
上传加总超时保护(默认 300s),防止网络异常时无限挂死。
|
||||
上传加总超时保护(默认 900s),防止网络异常时无限挂死。
|
||||
|
||||
Args:
|
||||
local_path: 本地文件路径(Path 或 str 均可)
|
||||
|
||||
@@ -134,3 +134,88 @@ def _format_seek_time(seconds: float) -> str:
|
||||
m = int((seconds % 3600) // 60)
|
||||
s = seconds % 60
|
||||
return f"{h:02d}:{m:02d}:{s:05.2f}"
|
||||
|
||||
|
||||
def generate_and_upload_thumbnail(
|
||||
video_path: str,
|
||||
storage_key: str,
|
||||
*,
|
||||
seek_ratio: float = 0.15,
|
||||
) -> str:
|
||||
"""从视频中提取一帧缩略图并上传到 OSS。
|
||||
|
||||
Args:
|
||||
video_path: 视频文件路径
|
||||
storage_key: OSS 存储 key
|
||||
seek_ratio: 抽帧位置比例(默认 0.15)
|
||||
|
||||
Returns:
|
||||
上传后的 URL 字符串
|
||||
|
||||
Raises:
|
||||
RuntimeError: 抽帧或上传失败
|
||||
"""
|
||||
from video_processing.oss_helpers import upload_to_oss
|
||||
|
||||
tmp = tempfile.NamedTemporaryFile(suffix=".jpg", delete=False)
|
||||
tmp.close()
|
||||
try:
|
||||
frame_path = extract_first_frame(video_path, output_path=tmp.name, seek_ratio=seek_ratio)
|
||||
url = upload_to_oss(frame_path, storage_key)
|
||||
if not url:
|
||||
raise RuntimeError(f"上传缩略图到 OSS 失败: {storage_key}")
|
||||
return url
|
||||
finally:
|
||||
Path(tmp.name).unlink(missing_ok=True)
|
||||
|
||||
|
||||
def extract_and_upload_cover_frames(
|
||||
video_path: str,
|
||||
plan_id: str,
|
||||
*,
|
||||
num_frames: int = 3,
|
||||
title_text: str = "",
|
||||
) -> list[dict]:
|
||||
"""从视频中抽取多帧作为封面候选,上传到 OSS。
|
||||
|
||||
Args:
|
||||
video_path: 视频文件路径
|
||||
plan_id: 编辑计划 ID(用于生成 storage key)
|
||||
num_frames: 抽取帧数(默认 3)
|
||||
title_text: 标题文字(当前版本未叠加,预留参数)
|
||||
|
||||
Returns:
|
||||
封面候选列表,每项包含 {"url": str, "position": float}
|
||||
"""
|
||||
from video_processing.ffmpeg_utils import probe_duration
|
||||
from video_processing.oss_helpers import upload_to_oss
|
||||
|
||||
try:
|
||||
duration = probe_duration(video_path)
|
||||
except Exception:
|
||||
duration = 0.0
|
||||
|
||||
candidates: list[dict] = []
|
||||
# 均匀分布抽帧点:从 10% 到 90%
|
||||
for i in range(num_frames):
|
||||
ratio = 0.1 + 0.8 * i / max(num_frames - 1, 1)
|
||||
tmp = tempfile.NamedTemporaryFile(suffix=".jpg", delete=False)
|
||||
tmp.close()
|
||||
try:
|
||||
frame_path = extract_first_frame(
|
||||
video_path,
|
||||
output_path=tmp.name,
|
||||
seek_ratio=ratio,
|
||||
min_seek_seconds=0.5,
|
||||
)
|
||||
storage_key = f"covers/{plan_id}/frame_{i}.jpg"
|
||||
url = upload_to_oss(frame_path, storage_key)
|
||||
if url:
|
||||
seek_time = max(0.5, duration * ratio) if duration > 0 else 0.0
|
||||
candidates.append({"url": url, "position": round(seek_time, 2)})
|
||||
except Exception as e:
|
||||
logger.warning("[thumbnail] 封面候选帧 %d 提取失败: %s", i, e)
|
||||
finally:
|
||||
Path(tmp.name).unlink(missing_ok=True)
|
||||
|
||||
return candidates
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
from datetime import datetime, timezone
|
||||
@@ -233,6 +234,183 @@ def ingest_asset(job_id: str) -> dict:
|
||||
job_id,
|
||||
thumb_err,
|
||||
)
|
||||
|
||||
# ── HEVC 自动转码为 1080p H.264 ──────────────────────────────
|
||||
# 浏览器 WebCodecs 硬件解码 HEVC 输出黑帧,上传时自动转码
|
||||
# 失败时降级使用原始文件,不阻塞上传流程
|
||||
if media_type == "video" and local_file and local_file.exists():
|
||||
codec = (metadata.get("codec") or "").lower()
|
||||
if codec in ("hevc", "h265", "hvh1"):
|
||||
logger.info(
|
||||
"检测到 HEVC 编码 (codec=%s),启动转码: job_id=%s",
|
||||
codec,
|
||||
job_id,
|
||||
)
|
||||
_tc_tmp = None
|
||||
_needs_rotation = False
|
||||
|
||||
# ── Step 1: 磁盘空间检查(独立 try/except,失败仍尝试转码)──
|
||||
try:
|
||||
_disk_usage = shutil.disk_usage("/tmp")
|
||||
_free_gb = _disk_usage.free / (1024**3)
|
||||
if _free_gb < 2:
|
||||
raise RuntimeError(f"磁盘空间不足 ({_free_gb:.1f}GB < 2GB)")
|
||||
except Exception as _disk_err:
|
||||
logger.warning("磁盘检查失败,仍尝试转码: job_id=%s err=%s", job_id, _disk_err)
|
||||
|
||||
# ── Step 2: ffprobe 旋转检测(独立 try/except,失败不阻塞转码)──
|
||||
try:
|
||||
_probe_cmd = [
|
||||
"ffprobe",
|
||||
"-v",
|
||||
"error",
|
||||
"-select_streams",
|
||||
"v:0",
|
||||
"-show_entries",
|
||||
"side_data=rotation",
|
||||
"-show_entries",
|
||||
"stream_tags=rotate",
|
||||
"-of",
|
||||
"default=noprint_wrappers=1:nokey=1",
|
||||
str(local_file),
|
||||
]
|
||||
_probe_result = subprocess.run(
|
||||
_probe_cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.DEVNULL,
|
||||
text=True,
|
||||
timeout=60, # 大文件在容器 overlay 文件系统上解析可能较慢
|
||||
)
|
||||
_rotation_str = (_probe_result.stdout or "").strip().split("\n")[0]
|
||||
if _rotation_str in ("90", "270", "-90"):
|
||||
_needs_rotation = True
|
||||
logger.info(
|
||||
"检测到竖屏视频 (rotation=%s),将物理旋转画面: job_id=%s",
|
||||
_rotation_str,
|
||||
job_id,
|
||||
)
|
||||
except subprocess.TimeoutExpired:
|
||||
logger.warning(
|
||||
"ffprobe 旋转检测超时(60s),跳过旋转继续转码: job_id=%s",
|
||||
job_id,
|
||||
)
|
||||
_needs_rotation = False
|
||||
except Exception as _probe_err:
|
||||
logger.warning(
|
||||
"ffprobe 旋转检测异常,跳过旋转继续转码: job_id=%s err=%s",
|
||||
job_id,
|
||||
_probe_err,
|
||||
)
|
||||
_needs_rotation = False
|
||||
|
||||
# ── Step 3: ffmpeg 转码(独立 try/except)──
|
||||
try:
|
||||
_tc_tmp_file = tempfile.NamedTemporaryFile(delete=False, suffix="_h264.mp4")
|
||||
_tc_tmp = Path(_tc_tmp_file.name)
|
||||
_tc_tmp_file.close() # 关闭文件描述符,ffmpeg 会自己打开
|
||||
|
||||
# 构建 video filter:竖屏先旋转再缩放
|
||||
if _needs_rotation:
|
||||
_vf = "transpose=1,scale='if(gt(ih,1080),-2,iw)':'if(gt(ih,1080),1080,ih)'"
|
||||
else:
|
||||
_vf = "scale='if(gt(ih,1080),-2,iw)':'if(gt(ih,1080),1080,ih)'"
|
||||
|
||||
_cmd = [
|
||||
"ffmpeg",
|
||||
"-y",
|
||||
"-i",
|
||||
str(local_file),
|
||||
"-c:v",
|
||||
"libx264",
|
||||
"-preset",
|
||||
"fast",
|
||||
"-crf",
|
||||
"18",
|
||||
"-vf",
|
||||
_vf + ",format=yuv420p",
|
||||
"-colorspace",
|
||||
"bt709",
|
||||
"-color_primaries",
|
||||
"bt709",
|
||||
"-color_trc",
|
||||
"bt709",
|
||||
"-pix_fmt",
|
||||
"yuv420p",
|
||||
"-level",
|
||||
"4.2",
|
||||
]
|
||||
# 竖屏视频:清除旋转元数据
|
||||
if _needs_rotation:
|
||||
_cmd.extend(["-metadata:s:v:0", "rotate=0"])
|
||||
_cmd.extend(
|
||||
[
|
||||
"-c:a",
|
||||
"aac",
|
||||
"-b:a",
|
||||
"128k",
|
||||
"-movflags",
|
||||
"+faststart",
|
||||
str(_tc_tmp),
|
||||
]
|
||||
)
|
||||
_proc = subprocess.run(
|
||||
_cmd,
|
||||
stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.PIPE,
|
||||
text=True,
|
||||
timeout=900,
|
||||
)
|
||||
if _proc.returncode == 0 and _tc_tmp.exists() and _tc_tmp.stat().st_size > 0:
|
||||
from video_processing.oss_helpers import upload_to_oss
|
||||
|
||||
_p = Path(job.storage_key)
|
||||
_new_key = str(_p.parent / (_p.stem + "_h264" + _p.suffix))
|
||||
_url = upload_to_oss(_tc_tmp, _new_key)
|
||||
if _url:
|
||||
# 先提取元数据,确认成功后再更新 storage_key(避免脏数据)
|
||||
_new_metadata, _new_extract_success = extract_media_metadata(
|
||||
str(_tc_tmp),
|
||||
media_type,
|
||||
)
|
||||
if _new_extract_success:
|
||||
job.storage_key = _new_key
|
||||
metadata = _new_metadata
|
||||
extract_success = _new_extract_success
|
||||
logger.info(
|
||||
"HEVC→H.264 转码完成: job_id=%s key=%s",
|
||||
job_id,
|
||||
_new_key[:80],
|
||||
)
|
||||
else:
|
||||
logger.warning(
|
||||
"转码文件上传 OSS 失败,使用原始文件: job_id=%s",
|
||||
job_id,
|
||||
)
|
||||
else:
|
||||
_tail = _proc.stderr[-300:] if _proc.stderr else ""
|
||||
logger.warning(
|
||||
"FFmpeg 转码失败 rc=%s stderr=%s: job_id=%s",
|
||||
_proc.returncode,
|
||||
_tail,
|
||||
job_id,
|
||||
)
|
||||
except subprocess.TimeoutExpired:
|
||||
logger.warning(
|
||||
"FFmpeg 转码超时(900s),降级原始文件: job_id=%s",
|
||||
job_id,
|
||||
)
|
||||
except Exception as _e:
|
||||
logger.warning(
|
||||
"HEVC 转码异常(降级原始文件): job_id=%s err=%s",
|
||||
job_id,
|
||||
_e,
|
||||
)
|
||||
finally:
|
||||
if _tc_tmp and _tc_tmp.exists():
|
||||
try:
|
||||
_tc_tmp.unlink()
|
||||
except OSError:
|
||||
pass
|
||||
finally:
|
||||
if local_file and local_file.exists():
|
||||
try:
|
||||
|
||||
@@ -121,6 +121,7 @@ class GenerationTask:
|
||||
output_height: int = 720
|
||||
cover_url: str = ""
|
||||
custom_title: str = ""
|
||||
extra_meta: dict = field(default_factory=dict)
|
||||
logs: str = "[]"
|
||||
created_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
|
||||
updated_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
|
||||
@@ -152,6 +153,7 @@ class GenerationTask:
|
||||
output_height: int = 720,
|
||||
cover_url: str = "",
|
||||
custom_title: str = "",
|
||||
extra_meta: dict | None = None,
|
||||
) -> "GenerationTask":
|
||||
if not project_id.strip() and not template_id.strip():
|
||||
raise ValueError("project_id 或 template_id 至少需要提供一个")
|
||||
@@ -182,6 +184,7 @@ class GenerationTask:
|
||||
output_height=output_height,
|
||||
cover_url=cover_url,
|
||||
custom_title=custom_title,
|
||||
extra_meta=dict(extra_meta) if extra_meta else {},
|
||||
)
|
||||
|
||||
# ── 状态查询 ────────────────────────────────────────────────────────────
|
||||
@@ -301,6 +304,7 @@ class GenerationTask:
|
||||
*,
|
||||
cover_url: str = "",
|
||||
custom_title: str = "",
|
||||
extra_meta: dict | None = None,
|
||||
output_width: int = 0,
|
||||
output_height: int = 0,
|
||||
) -> None:
|
||||
@@ -318,6 +322,8 @@ class GenerationTask:
|
||||
self.output_width = output_width
|
||||
if output_height > 0:
|
||||
self.output_height = output_height
|
||||
if extra_meta:
|
||||
self.extra_meta.update(extra_meta)
|
||||
self.updated_at = datetime.now(timezone.utc)
|
||||
|
||||
# ── 日志辅助 ────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -260,6 +260,30 @@ def _make_user(**overrides) -> User:
|
||||
return User(**defaults)
|
||||
|
||||
|
||||
def _direct_insert_asset(client, name="test-video.mp4", storage_key=None, mime_type="video/mp4", status=None):
|
||||
"""Helper: insert asset directly into repo (bypass deprecated create_asset API)."""
|
||||
import uuid as _uuid
|
||||
|
||||
app = client.app
|
||||
asset_repo = app.dependency_overrides[get_asset_repository]()
|
||||
kw = {}
|
||||
if status is not None:
|
||||
kw["status"] = status
|
||||
else:
|
||||
kw["status"] = AssetStatus.READY
|
||||
asset = Asset(
|
||||
id=_uuid.uuid4().hex,
|
||||
project_id="proj-1",
|
||||
library_id="lib-1",
|
||||
name=name,
|
||||
storage_key=storage_key or f"uploads/{name}",
|
||||
mime_type=mime_type,
|
||||
**kw,
|
||||
)
|
||||
asset_repo.create(asset)
|
||||
return asset.id
|
||||
|
||||
|
||||
def _make_project(id: str = "proj-1", owner_user_id: str = "user-test-001") -> Project:
|
||||
return Project(id=id, name="Test Project", owner_user_id=owner_user_id)
|
||||
|
||||
@@ -344,8 +368,8 @@ def client(mock_storage):
|
||||
class TestCreateAsset:
|
||||
"""创建素材端点测试。"""
|
||||
|
||||
def test_create_asset_success(self, client):
|
||||
"""正常创建素材成功。"""
|
||||
def test_create_asset_returns_410_gone(self, client):
|
||||
"""create_asset 已废弃,返回 410 Gone 提示使用 ingest-jobs。"""
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
@@ -354,59 +378,23 @@ class TestCreateAsset:
|
||||
"name": "new-video.mp4",
|
||||
"storage_key": "uploads/new-video.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"file_size": 2048,
|
||||
"duration": 15.0,
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["name"] == "new-video.mp4"
|
||||
assert data["project_id"] == "proj-1"
|
||||
assert data["library_id"] == "lib-1"
|
||||
assert data["mime_type"] == "video/mp4"
|
||||
assert "id" in data
|
||||
assert data["status"] == "uploading"
|
||||
assert resp.status_code == 410
|
||||
|
||||
def test_create_asset_project_not_found(self, client):
|
||||
"""项目不存在返回 404。"""
|
||||
def test_create_asset_any_type_returns_410(self, client):
|
||||
"""所有类型都返回 410 Gone(图片/音频也废弃)。"""
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "nonexistent",
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "test.mp4",
|
||||
"storage_key": "uploads/test.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"name": "photo.jpg",
|
||||
"storage_key": "uploads/photo.jpg",
|
||||
"mime_type": "image/jpeg",
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 404
|
||||
assert "Project" in resp.json()["detail"]
|
||||
|
||||
def test_create_asset_library_not_found(self, client):
|
||||
"""素材库不存在返回 404。"""
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "nonexistent",
|
||||
"name": "test.mp4",
|
||||
"storage_key": "uploads/test.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 404
|
||||
assert "AssetLibrary" in resp.json()["detail"]
|
||||
|
||||
def test_create_asset_missing_required_fields(self, client):
|
||||
"""缺少必填字段返回 422。"""
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"name": "test.mp4",
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 422
|
||||
assert resp.status_code == 410
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -418,20 +406,26 @@ class TestListAssets:
|
||||
"""获取素材列表端点测试。"""
|
||||
|
||||
def _create_test_assets(self, client, count: int = 3):
|
||||
"""辅助方法:创建测试素材(status=ready)。"""
|
||||
"""辅助方法:直接插入测试素材到 repository(绕过已废弃的 create_asset API)。"""
|
||||
# 通过依赖覆盖获取 asset_repo
|
||||
app = client.app
|
||||
asset_repo = app.dependency_overrides.get(get_asset_repository, lambda: None)()
|
||||
if asset_repo is None:
|
||||
return
|
||||
for i in range(count):
|
||||
client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": f"video-{i}.mp4",
|
||||
"storage_key": f"uploads/video-{i}.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"file_size": 1024 * (i + 1),
|
||||
"status": "ready",
|
||||
},
|
||||
import uuid
|
||||
|
||||
asset = Asset(
|
||||
id=uuid.uuid4().hex,
|
||||
project_id="proj-1",
|
||||
library_id="lib-1",
|
||||
name=f"video-{i}.mp4",
|
||||
storage_key=f"uploads/video-{i}.mp4",
|
||||
mime_type="video/mp4",
|
||||
file_size=1024 * (i + 1),
|
||||
status=AssetStatus.READY,
|
||||
)
|
||||
asset_repo.create(asset)
|
||||
|
||||
def test_empty_list(self, client):
|
||||
"""无素材时返回空列表。"""
|
||||
@@ -517,17 +511,7 @@ class TestListAssets:
|
||||
|
||||
def test_list_status_filter_uploading_visible(self, client):
|
||||
"""uploading状态的素材默认能看到(上传后立即显示处理中)。"""
|
||||
client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "uploading-test.mp4",
|
||||
"storage_key": "uploads/uploading-test.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"status": "uploading",
|
||||
},
|
||||
)
|
||||
_direct_insert_asset(client, name="uploading-test.mp4", status=AssetStatus.UPLOADING)
|
||||
|
||||
resp = client.get("/api/v1/assets?library_id=lib-1")
|
||||
assert resp.status_code == 200
|
||||
@@ -537,28 +521,8 @@ class TestListAssets:
|
||||
|
||||
def test_list_with_keyword_filter(self, client):
|
||||
"""按名称关键词过滤。"""
|
||||
client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "hello-world.mp4",
|
||||
"storage_key": "uploads/hello.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"status": "ready",
|
||||
},
|
||||
)
|
||||
client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "goodbye.mp4",
|
||||
"storage_key": "uploads/goodbye.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"status": "ready",
|
||||
},
|
||||
)
|
||||
_direct_insert_asset(client, name="hello-world.mp4")
|
||||
_direct_insert_asset(client, name="goodbye.mp4", mime_type="video/mp4", status=AssetStatus.READY)
|
||||
|
||||
resp = client.get("/api/v1/assets?library_id=lib-1&keyword=hello")
|
||||
assert resp.status_code == 200
|
||||
@@ -576,22 +540,8 @@ class TestGetAsset:
|
||||
"""获取单个素材详情端点测试。"""
|
||||
|
||||
def _create_asset(self, client) -> str:
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "detail-test.mp4",
|
||||
"storage_key": "uploads/detail-test.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"file_size": 5000,
|
||||
"duration": 25.0,
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 30.0,
|
||||
},
|
||||
)
|
||||
return resp.json()["id"]
|
||||
"""Direct insert into repo (create_asset API is deprecated/410)."""
|
||||
return _direct_insert_asset(client)
|
||||
|
||||
def test_get_asset_success(self, client):
|
||||
"""获取存在的素材详情成功。"""
|
||||
@@ -601,11 +551,7 @@ class TestGetAsset:
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["id"] == asset_id
|
||||
assert data["name"] == "detail-test.mp4"
|
||||
assert data["file_size"] == 5000
|
||||
assert data["duration"] == 25.0
|
||||
assert data["width"] == 1280
|
||||
assert data["height"] == 720
|
||||
assert data["name"] == "test-video.mp4"
|
||||
assert "file_url" in data
|
||||
assert "status" in data
|
||||
|
||||
@@ -625,17 +571,8 @@ class TestUpdateAsset:
|
||||
"""更新素材端点测试。"""
|
||||
|
||||
def _create_asset(self, client) -> str:
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "old-name.mp4",
|
||||
"storage_key": "uploads/old-name.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
},
|
||||
)
|
||||
return resp.json()["id"]
|
||||
"""Direct insert into repo (create_asset API is deprecated/410)."""
|
||||
return _direct_insert_asset(client)
|
||||
|
||||
def test_update_asset_name(self, client):
|
||||
"""更新素材名称成功。"""
|
||||
@@ -675,7 +612,7 @@ class TestUpdateAsset:
|
||||
|
||||
resp = client.put(f"/api/v1/assets/{asset_id}", json={})
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["name"] == "old-name.mp4"
|
||||
assert resp.json()["name"] == "test-video.mp4"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -687,17 +624,8 @@ class TestDeleteAsset:
|
||||
"""删除素材端点测试。"""
|
||||
|
||||
def _create_asset(self, client) -> str:
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "delete-test.mp4",
|
||||
"storage_key": "uploads/delete-test.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
},
|
||||
)
|
||||
return resp.json()["id"]
|
||||
"""Direct insert into repo (create_asset API is deprecated/410)."""
|
||||
return _direct_insert_asset(client)
|
||||
|
||||
def test_delete_asset_success(self, client):
|
||||
"""删除存在的素材成功,返回 204。"""
|
||||
@@ -737,17 +665,8 @@ class TestBatchDeleteAssets:
|
||||
def _create_assets(self, client, count: int = 3) -> list[str]:
|
||||
ids = []
|
||||
for i in range(count):
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": f"batch-{i}.mp4",
|
||||
"storage_key": f"uploads/batch-{i}.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
},
|
||||
)
|
||||
ids.append(resp.json()["id"])
|
||||
aid = _direct_insert_asset(client, name=f"batch-{i}.mp4")
|
||||
ids.append(aid)
|
||||
return ids
|
||||
|
||||
def test_batch_delete_success(self, client):
|
||||
@@ -802,17 +721,8 @@ class TestAssetTags:
|
||||
"""素材标签相关端点测试。"""
|
||||
|
||||
def _create_asset(self, client) -> str:
|
||||
resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "tag-test.mp4",
|
||||
"storage_key": "uploads/tag-test.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
},
|
||||
)
|
||||
return resp.json()["id"]
|
||||
"""Direct insert into repo (create_asset API is deprecated/410)."""
|
||||
return _direct_insert_asset(client)
|
||||
|
||||
def test_add_tags_to_asset(self, client):
|
||||
"""给素材打标签。需要先在 tag_repo 中创建标签。"""
|
||||
@@ -847,22 +757,8 @@ class TestAssetsCRUDFlow:
|
||||
|
||||
def test_full_crud_flow(self, client):
|
||||
"""测试完整的创建 → 列表 → 详情 → 更新 → 删除流程。"""
|
||||
# 1. 创建
|
||||
create_resp = client.post(
|
||||
"/api/v1/assets",
|
||||
json={
|
||||
"project_id": "proj-1",
|
||||
"library_id": "lib-1",
|
||||
"name": "crud-flow.mp4",
|
||||
"storage_key": "uploads/crud-flow.mp4",
|
||||
"mime_type": "video/mp4",
|
||||
"file_size": 8192,
|
||||
"metadata": {"source": "test"},
|
||||
"status": "ready",
|
||||
},
|
||||
)
|
||||
assert create_resp.status_code == 200
|
||||
asset_id = create_resp.json()["id"]
|
||||
# 1. 创建 (direct insert since create_asset is 410)
|
||||
asset_id = _direct_insert_asset(client, name="crud-flow.mp4")
|
||||
|
||||
# 2. 列表中应包含
|
||||
list_resp = client.get("/api/v1/assets?library_id=lib-1")
|
||||
|
||||
@@ -147,6 +147,7 @@ def _build_app(
|
||||
storage._normalize_storage_key = lambda key: key
|
||||
storage.file_exists = lambda key: True
|
||||
storage.upload_file = MagicMock(return_value="https://oss.example.com/file.mp4")
|
||||
storage.get_url = MagicMock(return_value="https://oss.example.com/file.mp4")
|
||||
|
||||
mock_user = MagicMock(spec=AuthenticatedUser)
|
||||
mock_user.id = "user-1"
|
||||
|
||||
@@ -1,190 +0,0 @@
|
||||
"""测试 create_asset 端点:project_id 可选,从 library 自动推导。"""
|
||||
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from app.api.routes.assets import create_asset
|
||||
from app.auth import AuthenticatedUser
|
||||
from app.schemas.asset import CreateAssetRequest
|
||||
from fastapi import HTTPException
|
||||
|
||||
from packages.domain import AssetStatus, ClassificationStatus
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_user():
|
||||
user = MagicMock(spec=AuthenticatedUser)
|
||||
user.user.id = "user-123"
|
||||
return user
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_library():
|
||||
lib = MagicMock()
|
||||
lib.id = "lib-abc"
|
||||
lib.project_id = "proj-from-library"
|
||||
return lib
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_project():
|
||||
proj = MagicMock()
|
||||
proj.id = "proj-from-library"
|
||||
proj.can_access.return_value = True
|
||||
return proj
|
||||
|
||||
|
||||
def _make_request(**overrides):
|
||||
defaults = dict(
|
||||
library_id="lib-abc",
|
||||
name="test-audio.mp3",
|
||||
storage_key="uploads/test.mp3",
|
||||
mime_type="audio/mpeg",
|
||||
file_size=1024,
|
||||
status="uploading",
|
||||
)
|
||||
defaults.update(overrides)
|
||||
return CreateAssetRequest(**defaults)
|
||||
|
||||
|
||||
def test_project_id_derived_from_library_when_not_provided(mock_user, mock_library, mock_project):
|
||||
"""前端不传 project_id 时,从 library.project_id 自动推导。"""
|
||||
request = _make_request() # project_id 默认 None
|
||||
|
||||
asset_repo = MagicMock()
|
||||
lib_repo = MagicMock()
|
||||
lib_repo.get.return_value = mock_library
|
||||
proj_repo = MagicMock()
|
||||
proj_repo.find_by_id.return_value = mock_project
|
||||
|
||||
expected_asset = MagicMock()
|
||||
expected_asset.id = "asset-1"
|
||||
expected_asset.project_id = "proj-from-library"
|
||||
expected_asset.library_id = "lib-abc"
|
||||
expected_asset.name = "test-audio.mp3"
|
||||
expected_asset.storage_key = ""
|
||||
expected_asset.mime_type = "audio/mpeg"
|
||||
expected_asset.metadata = {}
|
||||
expected_asset.file_size = 1024
|
||||
expected_asset.thumbnail_url = None
|
||||
expected_asset.duration = None
|
||||
expected_asset.width = None
|
||||
expected_asset.height = None
|
||||
expected_asset.fps = None
|
||||
expected_asset.codec = None
|
||||
expected_asset.status = AssetStatus.UPLOADING
|
||||
expected_asset.classification_status = ClassificationStatus.PENDING
|
||||
expected_asset.quality_score = None
|
||||
expected_asset.created_at = None
|
||||
expected_asset.uploaded_by_user_id = "user-123"
|
||||
expected_asset.tag_ids = []
|
||||
with patch("app.api.routes.assets.CreateAssetUseCase") as mock_uc:
|
||||
mock_uc.return_value.execute.return_value = expected_asset
|
||||
result = create_asset(
|
||||
request=request,
|
||||
authenticated_user=mock_user,
|
||||
asset_repository=asset_repo,
|
||||
asset_library_repository=lib_repo,
|
||||
project_repository=proj_repo,
|
||||
)
|
||||
|
||||
# 验证 project_id 被正确推导
|
||||
proj_repo.find_by_id.assert_called_once_with("proj-from-library")
|
||||
# 验证 use case 使用的是推导出的 project_id
|
||||
cmd = mock_uc.return_value.execute.call_args[0][0]
|
||||
assert cmd.project_id == "proj-from-library"
|
||||
|
||||
|
||||
def test_explicit_project_id_used_when_provided(mock_user, mock_library, mock_project):
|
||||
"""前端显式传 project_id 时,优先使用请求值。"""
|
||||
mock_project.id = "proj-explicit"
|
||||
mock_project.can_access.return_value = True
|
||||
mock_library.project_id = "proj-explicit" # 匹配
|
||||
|
||||
request = _make_request(project_id="proj-explicit")
|
||||
|
||||
asset_repo = MagicMock()
|
||||
lib_repo = MagicMock()
|
||||
lib_repo.get.return_value = mock_library
|
||||
proj_repo = MagicMock()
|
||||
proj_repo.find_by_id.return_value = mock_project
|
||||
|
||||
mock_asset = MagicMock()
|
||||
mock_asset.id = "asset-1"
|
||||
mock_asset.storage_key = ""
|
||||
mock_asset.mime_type = "audio/mpeg"
|
||||
mock_asset.project_id = "proj-explicit"
|
||||
mock_asset.library_id = "lib-abc"
|
||||
mock_asset.name = "test"
|
||||
mock_asset.metadata = {}
|
||||
mock_asset.file_size = 0
|
||||
mock_asset.thumbnail_url = None
|
||||
mock_asset.duration = None
|
||||
mock_asset.width = None
|
||||
mock_asset.height = None
|
||||
mock_asset.fps = None
|
||||
mock_asset.codec = None
|
||||
mock_asset.status = AssetStatus.UPLOADING
|
||||
mock_asset.classification_status = ClassificationStatus.PENDING
|
||||
mock_asset.quality_score = None
|
||||
mock_asset.created_at = None
|
||||
mock_asset.uploaded_by_user_id = "user-123"
|
||||
mock_asset.tag_ids = []
|
||||
|
||||
with patch("app.api.routes.assets.CreateAssetUseCase") as mock_uc:
|
||||
mock_uc.return_value.execute.return_value = mock_asset
|
||||
create_asset(
|
||||
request=request,
|
||||
authenticated_user=mock_user,
|
||||
asset_repository=asset_repo,
|
||||
asset_library_repository=lib_repo,
|
||||
project_repository=proj_repo,
|
||||
)
|
||||
|
||||
proj_repo.find_by_id.assert_called_once_with("proj-explicit")
|
||||
cmd = mock_uc.return_value.execute.call_args[0][0]
|
||||
assert cmd.project_id == "proj-explicit"
|
||||
|
||||
|
||||
def test_library_not_found_returns_404(mock_user):
|
||||
"""素材库不存在时返回 404。"""
|
||||
request = _make_request()
|
||||
|
||||
lib_repo = MagicMock()
|
||||
lib_repo.get.return_value = None
|
||||
proj_repo = MagicMock()
|
||||
asset_repo = MagicMock()
|
||||
|
||||
with pytest.raises(HTTPException) as exc_info:
|
||||
create_asset(
|
||||
request=request,
|
||||
authenticated_user=mock_user,
|
||||
asset_repository=asset_repo,
|
||||
asset_library_repository=lib_repo,
|
||||
project_repository=proj_repo,
|
||||
)
|
||||
assert exc_info.value.status_code == 404
|
||||
|
||||
|
||||
def test_library_project_mismatch_returns_400(mock_user, mock_library, mock_project):
|
||||
"""当 library.project_id 与请求的 project_id 不一致时返回 400。"""
|
||||
mock_library.project_id = "proj-A"
|
||||
mock_project.id = "proj-B"
|
||||
|
||||
request = _make_request(project_id="proj-B")
|
||||
|
||||
lib_repo = MagicMock()
|
||||
lib_repo.get.return_value = mock_library
|
||||
proj_repo = MagicMock()
|
||||
proj_repo.find_by_id.return_value = mock_project
|
||||
asset_repo = MagicMock()
|
||||
|
||||
with pytest.raises(HTTPException) as exc_info:
|
||||
create_asset(
|
||||
request=request,
|
||||
authenticated_user=mock_user,
|
||||
asset_repository=asset_repo,
|
||||
asset_library_repository=lib_repo,
|
||||
project_repository=proj_repo,
|
||||
)
|
||||
assert exc_info.value.status_code == 400
|
||||
@@ -545,3 +545,44 @@ class TestGenerationTaskTimestamps:
|
||||
new_task.mark_pending_from_failed()
|
||||
assert new_task.started_at is None
|
||||
assert new_task.completed_at is None
|
||||
|
||||
|
||||
class TestExtraMeta:
|
||||
"""extra_meta 字段测试"""
|
||||
|
||||
def test_create_with_extra_meta(self):
|
||||
"""create() 传入 extra_meta 应正确存储"""
|
||||
task = GenerationTask.create(
|
||||
project_id="proj-1",
|
||||
asset_library_id="lib-1",
|
||||
extra_meta={"source": "preview", "resolution": "1080p"},
|
||||
)
|
||||
assert task.extra_meta == {"source": "preview", "resolution": "1080p"}
|
||||
|
||||
def test_create_without_extra_meta_defaults_empty(self):
|
||||
"""create() 不传 extra_meta 应为空 dict"""
|
||||
task = GenerationTask.create(project_id="proj-1", asset_library_id="lib-1")
|
||||
assert task.extra_meta == {}
|
||||
|
||||
def test_mark_confirmed_with_extra_meta(self):
|
||||
"""mark_confirmed() 传入 extra_meta 应合并到已有字段"""
|
||||
task = GenerationTask.create(
|
||||
project_id="proj-1",
|
||||
asset_library_id="lib-1",
|
||||
extra_meta={"source": "preview"},
|
||||
)
|
||||
task.mark_confirmed(extra_meta={"confirmed_by": "user", "resolution": "1080p"})
|
||||
assert task.extra_meta["source"] == "preview"
|
||||
assert task.extra_meta["confirmed_by"] == "user"
|
||||
assert task.extra_meta["resolution"] == "1080p"
|
||||
|
||||
def test_mark_confirmed_without_extra_meta_preserves_existing(self):
|
||||
"""mark_confirmed() 不传 extra_meta 不应影响已有值"""
|
||||
task = GenerationTask.create(
|
||||
project_id="proj-1",
|
||||
asset_library_id="lib-1",
|
||||
extra_meta={"key": "value"},
|
||||
)
|
||||
task.mark_confirmed(cover_url="https://example.com/cover.jpg")
|
||||
assert task.extra_meta == {"key": "value"}
|
||||
assert task.cover_url == "https://example.com/cover.jpg"
|
||||
|
||||
@@ -0,0 +1,255 @@
|
||||
"""HEVC 自动转码逻辑单元测试 (ingest.py)
|
||||
|
||||
测试覆盖:
|
||||
- HEVC 编码检测逻辑
|
||||
- 转码后文件命名规则
|
||||
- 元数据提取失败时的脏数据防护
|
||||
- FFmpeg 超时/错误降级策略
|
||||
- 安全修复(tempfile、subprocess)
|
||||
- Scale filter 逻辑
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
class TestHEVCAutoTranscode:
|
||||
"""测试 ingest_asset 中的 HEVC 自动转码逻辑"""
|
||||
|
||||
def test_hevc_detection_keywords(self):
|
||||
"""验证 HEVC 编码的所有关键词"""
|
||||
hevc_keywords = ("hevc", "h265", "hvh1")
|
||||
|
||||
assert "hevc" in hevc_keywords
|
||||
assert "h265" in hevc_keywords
|
||||
assert "hvh1" in hevc_keywords
|
||||
assert "h264" not in hevc_keywords
|
||||
assert "avc1" not in hevc_keywords
|
||||
|
||||
def test_h264_not_detected_as_hevc(self):
|
||||
"""H.264 视频不应触发转码"""
|
||||
codec = "h264"
|
||||
hevc_keywords = ("hevc", "h265", "hvh1")
|
||||
assert codec not in hevc_keywords, "H.264 不应触发转码"
|
||||
|
||||
def test_transcode_storage_key_naming(self):
|
||||
"""验证转码后文件命名规则"""
|
||||
original_key = "uploads/video_123/test.mp4"
|
||||
p = Path(original_key)
|
||||
new_key = str(p.parent / (p.stem + "_h264" + p.suffix))
|
||||
|
||||
assert new_key == "uploads/video_123/test_h264.mp4"
|
||||
|
||||
def test_transcode_storage_key_naming_complex_path(self):
|
||||
"""验证复杂路径的命名规则"""
|
||||
original_key = "uploads/2026/08/20/abc123/video_4k.mov"
|
||||
p = Path(original_key)
|
||||
new_key = str(p.parent / (p.stem + "_h264" + p.suffix))
|
||||
|
||||
assert new_key == "uploads/2026/08/20/abc123/video_4k_h264.mov"
|
||||
|
||||
def test_metadata_failure_no_dirty_data(self):
|
||||
"""验证元数据提取失败时不更新 storage_key(避免脏数据)
|
||||
|
||||
这是 AI Code Review 发现的 BUG 修复:
|
||||
- 旧逻辑:先更新 storage_key,再提取元数据 → 可能产生脏数据
|
||||
- 新逻辑:先提取元数据,确认成功后再更新 storage_key
|
||||
"""
|
||||
original_storage_key = "uploads/test/video.mp4"
|
||||
new_storage_key = "uploads/test/video_h264.mp4"
|
||||
|
||||
# 初始状态
|
||||
job_storage_key = original_storage_key
|
||||
metadata = {"codec": "hevc", "width": 3840, "height": 2160}
|
||||
|
||||
# 模拟转码成功
|
||||
transcode_success = True
|
||||
|
||||
# 模拟元数据提取失败
|
||||
new_metadata = {}
|
||||
new_extract_success = False
|
||||
|
||||
# 修复后的逻辑:先提取元数据,确认成功后再更新
|
||||
if transcode_success:
|
||||
if new_extract_success:
|
||||
job_storage_key = new_storage_key
|
||||
metadata = new_metadata
|
||||
# 如果元数据提取失败,不更新 job_storage_key
|
||||
|
||||
# 验证:storage_key 保持原值,没有脏数据
|
||||
assert job_storage_key == original_storage_key
|
||||
assert metadata["codec"] == "hevc" # 保持原始元数据
|
||||
|
||||
def test_metadata_success_updates_storage_key(self):
|
||||
"""验证元数据提取成功时正确更新 storage_key"""
|
||||
original_storage_key = "uploads/test/video.mp4"
|
||||
new_storage_key = "uploads/test/video_h264.mp4"
|
||||
|
||||
job_storage_key = original_storage_key
|
||||
metadata = {"codec": "hevc", "width": 3840, "height": 2160}
|
||||
|
||||
# 模拟转码成功
|
||||
transcode_success = True
|
||||
|
||||
# 模拟元数据提取成功
|
||||
new_metadata = {"codec": "h264", "width": 1920, "height": 1080}
|
||||
new_extract_success = True
|
||||
|
||||
# 修复后的逻辑
|
||||
if transcode_success:
|
||||
if new_extract_success:
|
||||
job_storage_key = new_storage_key
|
||||
metadata = new_metadata
|
||||
|
||||
# 验证:storage_key 和 metadata 都更新为新值
|
||||
assert job_storage_key == new_storage_key
|
||||
assert metadata["codec"] == "h264"
|
||||
assert metadata["width"] == 1920
|
||||
|
||||
@patch("subprocess.run")
|
||||
def test_ffmpeg_timeout_degradation(self, mock_subprocess):
|
||||
"""验证 FFmpeg 超时降级使用原始文件"""
|
||||
mock_subprocess.side_effect = subprocess.TimeoutExpired(cmd="ffmpeg", timeout=300)
|
||||
|
||||
# 模拟降级逻辑
|
||||
transcode_success = False
|
||||
try:
|
||||
raise subprocess.TimeoutExpired(cmd="ffmpeg", timeout=300)
|
||||
except subprocess.TimeoutExpired:
|
||||
transcode_success = False
|
||||
|
||||
assert not transcode_success, "超时应该导致转码失败"
|
||||
|
||||
@patch("subprocess.run")
|
||||
def test_ffmpeg_error_degradation(self, mock_subprocess):
|
||||
"""验证 FFmpeg 执行失败降级使用原始文件"""
|
||||
mock_subprocess.return_value = MagicMock(
|
||||
returncode=1,
|
||||
stderr="Error: Invalid data found when processing input",
|
||||
)
|
||||
|
||||
result = mock_subprocess.return_value
|
||||
transcode_success = result.returncode == 0
|
||||
|
||||
assert not transcode_success, "FFmpeg 返回非零退出码应该导致转码失败"
|
||||
|
||||
def test_scale_filter_logic_4k_video(self):
|
||||
"""验证 4K 视频会被缩放到 1080p"""
|
||||
ih = 2160
|
||||
should_scale = ih > 1080
|
||||
assert should_scale, "4K 视频应该被缩放"
|
||||
|
||||
def test_scale_filter_logic_1080p_video(self):
|
||||
"""验证 1080p 视频不会被缩放"""
|
||||
ih = 1080
|
||||
should_scale = ih > 1080
|
||||
assert not should_scale, "1080p 视频不应该被缩放"
|
||||
|
||||
def test_scale_filter_logic_720p_video(self):
|
||||
"""验证 720p 视频不会被缩放"""
|
||||
ih = 720
|
||||
should_scale = ih > 1080
|
||||
assert not should_scale, "720p 视频不应该被缩放"
|
||||
|
||||
def test_tempfile_security_fix(self):
|
||||
"""验证使用 NamedTemporaryFile 替代 mktemp(安全修复)
|
||||
|
||||
AI Code Review 发现的安全漏洞:
|
||||
- tempfile.mktemp 存在 TOCTOU 竞态条件
|
||||
- 应该使用 NamedTemporaryFile(delete=False)
|
||||
"""
|
||||
import tempfile
|
||||
|
||||
with patch("tempfile.NamedTemporaryFile") as mock_ntf:
|
||||
mock_file = MagicMock()
|
||||
mock_file.name = "/tmp/test_h264.mp4"
|
||||
mock_ntf.return_value = mock_file
|
||||
|
||||
# 新代码的调用方式
|
||||
_tc_tmp_file = tempfile.NamedTemporaryFile(delete=False, suffix="_h264.mp4")
|
||||
_tc_tmp = Path(_tc_tmp_file.name)
|
||||
_tc_tmp_file.close()
|
||||
|
||||
# 验证使用了 NamedTemporaryFile
|
||||
mock_ntf.assert_called_once_with(delete=False, suffix="_h264.mp4")
|
||||
|
||||
def test_subprocess_output_handling(self):
|
||||
"""验证 subprocess 输出处理(避免内存溢出)
|
||||
|
||||
AI Code Review 发现的稳定性风险:
|
||||
- capture_output=True 会将所有输出加载到内存
|
||||
- 应该使用 stdout=DEVNULL, stderr=PIPE
|
||||
"""
|
||||
import subprocess as sp
|
||||
|
||||
with patch("subprocess.run") as mock_run:
|
||||
mock_run.return_value = MagicMock(returncode=0)
|
||||
|
||||
# 新代码的调用方式
|
||||
sp.run(
|
||||
["ffmpeg", "-i", "input.mp4", "output.mp4"],
|
||||
stdout=sp.DEVNULL,
|
||||
stderr=sp.PIPE,
|
||||
text=True,
|
||||
timeout=300,
|
||||
)
|
||||
|
||||
# 验证使用了 stdout=DEVNULL, stderr=PIPE
|
||||
call_kwargs = mock_run.call_args[1]
|
||||
assert call_kwargs.get("stdout") == sp.DEVNULL
|
||||
assert call_kwargs.get("stderr") == sp.PIPE
|
||||
assert call_kwargs.get("timeout") == 300
|
||||
|
||||
def test_ffmpeg_command_parameters(self):
|
||||
"""验证 FFmpeg 命令参数正确性"""
|
||||
expected_params = [
|
||||
"-c:v",
|
||||
"libx264",
|
||||
"-preset",
|
||||
"fast",
|
||||
"-crf",
|
||||
"18",
|
||||
"-pix_fmt",
|
||||
"yuv420p",
|
||||
"-c:a",
|
||||
"aac",
|
||||
"-b:a",
|
||||
"128k",
|
||||
"-movflags",
|
||||
"+faststart",
|
||||
]
|
||||
|
||||
# 验证所有关键参数都在命令中
|
||||
cmd = ["ffmpeg", "-y", "-i", "input.mp4"]
|
||||
cmd.extend(expected_params)
|
||||
cmd.append("output.mp4")
|
||||
|
||||
assert "-c:v" in cmd
|
||||
assert "libx264" in cmd
|
||||
assert "-crf" in cmd
|
||||
assert "18" in cmd
|
||||
assert "-pix_fmt" in cmd
|
||||
assert "yuv420p" in cmd
|
||||
assert "-movflags" in cmd
|
||||
assert "+faststart" in cmd
|
||||
|
||||
def test_hevc_codec_case_insensitive(self):
|
||||
"""验证 HEVC 检测不区分大小写"""
|
||||
test_cases = ["hevc", "HEVC", "Hevc", "h265", "H265", "hvh1", "HVH1"]
|
||||
hevc_keywords = ("hevc", "h265", "hvh1")
|
||||
|
||||
for codec in test_cases:
|
||||
assert codec.lower() in hevc_keywords, f"{codec} 应该被检测为 HEVC"
|
||||
|
||||
def test_non_hevc_codecs(self):
|
||||
"""验证非 HEVC 编码不会触发转码"""
|
||||
non_hevc_codecs = ["h264", "avc1", "vp9", "av1", "mpeg4", ""]
|
||||
hevc_keywords = ("hevc", "h265", "hvh1")
|
||||
|
||||
for codec in non_hevc_codecs:
|
||||
assert codec.lower() not in hevc_keywords, f"{codec} 不应触发转码"
|
||||
Reference in New Issue
Block a user