Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cb26ccb147 | |||
| b094346bf6 | |||
| a0cac1b75d | |||
| acca081149 | |||
| ffed853f6e | |||
| f0cf4f50dc |
@@ -13,6 +13,7 @@ from app.api.routes.generated_videos import router as generated_videos_router
|
||||
from app.api.routes.generation_tasks import router as generation_tasks_router
|
||||
from app.api.routes.health import router as health_check_router
|
||||
from app.api.routes.ingest_jobs import router as ingest_jobs_router
|
||||
from app.api.routes.internal_render import router as internal_render_router
|
||||
from app.api.routes.jobs import router as jobs_router
|
||||
from app.api.routes.projects import router as projects_router
|
||||
from app.api.routes.recipes import router as recipes_router
|
||||
@@ -156,3 +157,7 @@ api_router.include_router(
|
||||
feature_flags_router,
|
||||
tags=["Internal"],
|
||||
)
|
||||
api_router.include_router(
|
||||
internal_render_router,
|
||||
tags=["Internal"],
|
||||
)
|
||||
|
||||
Executable
+120
@@ -0,0 +1,120 @@
|
||||
"""渲染结果内部下载接口。
|
||||
|
||||
通过内部 API Key 鉴权,为灰度对比工具等内部系统提供渲染结果下载能力。
|
||||
|
||||
API:
|
||||
GET /api/v1/internal/render/videos/{video_id}/download-url - 获取单个视频下载URL
|
||||
GET /api/v1/internal/render/tasks/{task_id}/videos - 获取任务下所有视频及下载URL
|
||||
|
||||
鉴权:X-API-Key header,走内部 API Key 验证
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from typing import Any
|
||||
|
||||
from app.api.routes.auth import _verify_internal_api_key
|
||||
from app.core.storage import OSSStorageService, get_storage_service
|
||||
from app.dependencies import get_generated_video_repository
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from pydantic import BaseModel
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter(prefix="/internal/render", tags=["Internal"])
|
||||
|
||||
|
||||
class InternalRenderVideoItem(BaseModel):
|
||||
"""内部渲染视频项。"""
|
||||
|
||||
video_id: str
|
||||
generation_task_id: str
|
||||
project_id: str
|
||||
name: str
|
||||
file_url: str
|
||||
file_size: int | None = None
|
||||
duration: float | None = None
|
||||
width: int | None = None
|
||||
height: int | None = None
|
||||
fps: float | None = None
|
||||
status: str
|
||||
download_url: str
|
||||
|
||||
|
||||
class InternalRenderTaskVideosResponse(BaseModel):
|
||||
"""任务下所有渲染视频响应。"""
|
||||
|
||||
task_id: str
|
||||
count: int
|
||||
videos: list[InternalRenderVideoItem]
|
||||
|
||||
|
||||
class InternalRenderDownloadUrlResponse(BaseModel):
|
||||
"""单个视频下载URL响应。"""
|
||||
|
||||
video_id: str
|
||||
download_url: str
|
||||
|
||||
|
||||
def _video_to_item(video: Any, download_url: str) -> InternalRenderVideoItem:
|
||||
"""将 GeneratedVideo 领域对象转为响应项。"""
|
||||
return InternalRenderVideoItem(
|
||||
video_id=video.id,
|
||||
generation_task_id=video.generation_task_id,
|
||||
project_id=video.project_id,
|
||||
name=video.name,
|
||||
file_url=video.file_url,
|
||||
file_size=getattr(video, "file_size", None),
|
||||
duration=getattr(video, "duration", None),
|
||||
width=getattr(video, "width", None),
|
||||
height=getattr(video, "height", None),
|
||||
fps=getattr(video, "fps", None),
|
||||
status=video.status,
|
||||
download_url=download_url,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/videos/{video_id}/download-url", response_model=InternalRenderDownloadUrlResponse)
|
||||
def get_render_video_download_url(
|
||||
video_id: str,
|
||||
_: bool = Depends(_verify_internal_api_key),
|
||||
generated_video_repository: Any = Depends(get_generated_video_repository),
|
||||
storage_service: OSSStorageService = Depends(get_storage_service),
|
||||
) -> InternalRenderDownloadUrlResponse:
|
||||
"""获取单个渲染视频的下载URL(预签名)。"""
|
||||
video = generated_video_repository.get(video_id)
|
||||
if video is None:
|
||||
raise HTTPException(status_code=404, detail=f"GeneratedVideo {video_id} not found")
|
||||
|
||||
download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
|
||||
logger.info("内部渲染下载URL生成: video_id=%s", video_id)
|
||||
return InternalRenderDownloadUrlResponse(video_id=video_id, download_url=download_url)
|
||||
|
||||
|
||||
@router.get("/tasks/{task_id}/videos", response_model=InternalRenderTaskVideosResponse)
|
||||
def get_render_task_videos(
|
||||
task_id: str,
|
||||
status: str | None = Query(None, description="按状态筛选,如 completed/failed"),
|
||||
_: bool = Depends(_verify_internal_api_key),
|
||||
generated_video_repository: Any = Depends(get_generated_video_repository),
|
||||
storage_service: OSSStorageService = Depends(get_storage_service),
|
||||
) -> InternalRenderTaskVideosResponse:
|
||||
"""获取生成任务下所有渲染视频及下载URL。"""
|
||||
videos = generated_video_repository.list_by_generation_task(task_id)
|
||||
|
||||
# 状态筛选
|
||||
if status:
|
||||
videos = [v for v in videos if v.status == status]
|
||||
|
||||
items = []
|
||||
for video in videos:
|
||||
download_url = storage_service.get_download_url(video.file_url, expires_seconds=86400)
|
||||
items.append(_video_to_item(video, download_url))
|
||||
|
||||
logger.info("内部渲染任务视频查询: task_id=%s count=%d", task_id, len(items))
|
||||
return InternalRenderTaskVideosResponse(
|
||||
task_id=task_id,
|
||||
count=len(items),
|
||||
videos=items,
|
||||
)
|
||||
@@ -42,6 +42,10 @@ XFADE_TRANSITION_MAP: dict[str, str] = {
|
||||
|
||||
DEFAULT_TRANSITION_DURATION = 0.5
|
||||
|
||||
# FFmpeg 执行默认超时(秒),防止 FFmpeg hang 住导致 worker 永久阻塞
|
||||
# 默认 30 分钟,足够处理大部分短视频渲染;超长视频可单独传参覆盖
|
||||
DEFAULT_FFMPEG_TIMEOUT = 1800
|
||||
|
||||
|
||||
# ── FFmpeg 执行 ───────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -50,12 +54,14 @@ def run_ffmpeg(
|
||||
command: list[str],
|
||||
*,
|
||||
capture_output: bool = True,
|
||||
timeout: int | None = DEFAULT_FFMPEG_TIMEOUT,
|
||||
) -> tuple[str, str]:
|
||||
"""执行 FFmpeg 命令。
|
||||
|
||||
Args:
|
||||
command: 完整的 ffmpeg 命令列表(含 "ffmpeg" 本身)
|
||||
capture_output: 是否捕获 stdout/stderr
|
||||
timeout: 超时时间(秒),默认 1800s(30分钟);None 表示不设超时(不推荐)
|
||||
|
||||
Returns:
|
||||
(stdout, stderr) 元组
|
||||
@@ -63,6 +69,7 @@ def run_ffmpeg(
|
||||
Raises:
|
||||
subprocess.CalledProcessError: 命令执行失败时抛出,
|
||||
异常信息包含完整 stderr 以便排查。
|
||||
subprocess.TimeoutExpired: 超时未完成时抛出,FFmpeg 进程会被 kill。
|
||||
"""
|
||||
try:
|
||||
result = subprocess.run( # nosec B603
|
||||
@@ -71,8 +78,16 @@ def run_ffmpeg(
|
||||
stdout=subprocess.PIPE if capture_output else None,
|
||||
stderr=subprocess.PIPE if capture_output else None,
|
||||
text=True,
|
||||
timeout=timeout,
|
||||
)
|
||||
return (result.stdout or "", result.stderr or "")
|
||||
except subprocess.TimeoutExpired as e:
|
||||
logger.error(
|
||||
"FFmpeg 命令超时 (%ds): command=%s",
|
||||
timeout or -1,
|
||||
" ".join(str(c) for c in command[:20]),
|
||||
)
|
||||
raise
|
||||
except subprocess.CalledProcessError as e:
|
||||
# 把完整 stderr 打到日志,方便排查 exit code 183 等问题
|
||||
stderr_text = (e.stderr or "").strip()
|
||||
@@ -148,10 +163,14 @@ def probe_duration(local_path: str | Path) -> float:
|
||||
|
||||
|
||||
def probe_video_info(video_path: str) -> dict[str, Any]:
|
||||
"""获取视频信息(宽、高、时长、fps)。
|
||||
"""获取视频信息(宽、高、时长、fps、编码、像素格式)。
|
||||
|
||||
Returns:
|
||||
{"width": int, "height": int, "duration": float, "fps": float}
|
||||
{
|
||||
"width": int, "height": int, "duration": float, "fps": float,
|
||||
"video_codec": str, "audio_codec": str, "pix_fmt": str,
|
||||
"has_audio": bool,
|
||||
}
|
||||
失败时返回默认值。
|
||||
"""
|
||||
try:
|
||||
@@ -160,10 +179,8 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
|
||||
FFPROBE_BIN,
|
||||
"-v",
|
||||
"error",
|
||||
"-select_streams",
|
||||
"v:0",
|
||||
"-show_entries",
|
||||
"stream=width,height,r_frame_rate,duration",
|
||||
"stream=width,height,r_frame_rate,duration,codec_name,codec_type,pix_fmt",
|
||||
"-show_entries",
|
||||
"format=duration",
|
||||
"-of",
|
||||
@@ -174,19 +191,25 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
text=True,
|
||||
timeout=15,
|
||||
)
|
||||
|
||||
import json
|
||||
|
||||
info = json.loads(result.stdout)
|
||||
stream = info.get("streams", [{}])[0]
|
||||
streams = info.get("streams", [])
|
||||
fmt = info.get("format", {})
|
||||
|
||||
width = int(stream.get("width", DEFAULT_OUTPUT_WIDTH))
|
||||
height = int(stream.get("height", DEFAULT_OUTPUT_HEIGHT))
|
||||
video_stream = next((s for s in streams if s.get("codec_type") == "video"), {})
|
||||
audio_stream = next((s for s in streams if s.get("codec_type") == "audio"), {})
|
||||
|
||||
width = int(video_stream.get("width", DEFAULT_OUTPUT_WIDTH))
|
||||
height = int(video_stream.get("height", DEFAULT_OUTPUT_HEIGHT))
|
||||
video_codec = video_stream.get("codec_name", "") or ""
|
||||
pix_fmt = video_stream.get("pix_fmt", "") or ""
|
||||
|
||||
# 解析帧率
|
||||
fps_str = stream.get("r_frame_rate", "25/1")
|
||||
fps_str = video_stream.get("r_frame_rate", "25/1")
|
||||
if "/" in fps_str:
|
||||
num, den = fps_str.split("/")
|
||||
fps = float(num) / float(den) if float(den) > 0 else DEFAULT_FPS
|
||||
@@ -194,13 +217,20 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
|
||||
fps = float(fps_str) if fps_str else DEFAULT_FPS
|
||||
|
||||
# 时长
|
||||
duration = float(fmt.get("duration", 0)) or float(stream.get("duration", 0))
|
||||
duration = float(fmt.get("duration", 0)) or float(video_stream.get("duration", 0))
|
||||
|
||||
has_audio = bool(audio_stream)
|
||||
audio_codec = audio_stream.get("codec_name", "") or ""
|
||||
|
||||
return {
|
||||
"width": width,
|
||||
"height": height,
|
||||
"duration": duration,
|
||||
"fps": round(fps, 2),
|
||||
"video_codec": video_codec,
|
||||
"audio_codec": audio_codec,
|
||||
"pix_fmt": pix_fmt,
|
||||
"has_audio": has_audio,
|
||||
}
|
||||
except Exception as e:
|
||||
logger.warning("获取视频信息失败: %s, error: %s", video_path, e)
|
||||
@@ -209,6 +239,10 @@ def probe_video_info(video_path: str) -> dict[str, Any]:
|
||||
"height": DEFAULT_OUTPUT_HEIGHT,
|
||||
"duration": 0.0,
|
||||
"fps": DEFAULT_FPS,
|
||||
"video_codec": "",
|
||||
"audio_codec": "",
|
||||
"pix_fmt": "",
|
||||
"has_audio": True,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
import time
|
||||
from dataclasses import dataclass, field
|
||||
@@ -296,7 +295,7 @@ WrapStyle: 2
|
||||
Encoding: UTF-8
|
||||
|
||||
[V4+ Styles]
|
||||
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
|
||||
Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding # noqa: E501
|
||||
{chr(10).join(styles)}
|
||||
|
||||
[Events]
|
||||
@@ -460,12 +459,25 @@ class UnifiedRenderService:
|
||||
|
||||
is_pass_through = self._can_use_pass_through(layers)
|
||||
pass_through_has_audio = False
|
||||
used_stream_copy = False
|
||||
|
||||
if is_pass_through:
|
||||
# 直通优化:单clip场景一次FFmpeg同时处理视频+音频,省去提取+合并两次调用
|
||||
pass_through_has_audio = self._render_pass_through(
|
||||
# 先尝试 stream copy 优化(无重编码,性能提升 10 倍+)
|
||||
# 条件不满足或失败时回退到带滤镜的直通渲染
|
||||
stream_copy_ok = self._try_render_stream_copy(
|
||||
layers, output_path, ass_path=ass_path, video_duration=video_duration
|
||||
)
|
||||
if stream_copy_ok:
|
||||
used_stream_copy = True
|
||||
# stream copy 模式下,直接探测输出是否有音频
|
||||
clip = layers[0].clips[0]
|
||||
info = probe_video_info(str(clip.local_path))
|
||||
pass_through_has_audio = info.get("has_audio", True)
|
||||
else:
|
||||
# 回退到带滤镜的直通渲染
|
||||
pass_through_has_audio = self._render_pass_through(
|
||||
layers, output_path, ass_path=ass_path, video_duration=video_duration
|
||||
)
|
||||
else:
|
||||
filter_complex, input_args = self._build_filter_complex(layers, ass_path=ass_path)
|
||||
self._execute_ffmpeg(filter_complex, input_args, video_only_path)
|
||||
@@ -473,10 +485,11 @@ class UnifiedRenderService:
|
||||
t_video_end = time.time()
|
||||
video_render_ms = int((t_video_end - t_video_start) * 1000)
|
||||
logger.info(
|
||||
"[unified-render] video render done: plan_id=%s duration_ms=%d pass_through=%s",
|
||||
"[unified-render] video render done: plan_id=%s duration_ms=%d pass_through=%s stream_copy=%s",
|
||||
self.plan.id,
|
||||
video_render_ms,
|
||||
is_pass_through,
|
||||
used_stream_copy,
|
||||
)
|
||||
|
||||
# 6. 音频后处理混音(直通场景已合并处理,跳过)
|
||||
@@ -619,6 +632,176 @@ class UnifiedRenderService:
|
||||
return False
|
||||
return True
|
||||
|
||||
def _can_use_stream_copy(
|
||||
self,
|
||||
clip: ResolvedClip,
|
||||
*,
|
||||
ass_path: Path | None = None,
|
||||
video_duration: float = 0.0,
|
||||
) -> tuple[bool, str]:
|
||||
"""判断是否可以走 stream copy(流拷贝,不重编码)。
|
||||
|
||||
性能提升:10 倍以上(典型场景从 20s → 1-2s)。
|
||||
|
||||
条件:
|
||||
1. 视频编码为 h264(输出目标也是 h264)
|
||||
2. 像素格式为 yuv420p
|
||||
3. 分辨率与输出一致(不需要 scale/crop)
|
||||
4. 帧率与输出一致(误差 < 0.1fps)
|
||||
5. 无字幕叠加(字幕需要滤镜)
|
||||
6. 无 trim 需求(或 trim 后恰好等于原时长)
|
||||
7. 无转场、无特效(单 clip 直通已保证)
|
||||
|
||||
Returns:
|
||||
(是否可以 copy, 原因说明)
|
||||
"""
|
||||
# 有字幕 → 需要滤镜 → 不能 copy
|
||||
if ass_path is not None:
|
||||
return False, "有字幕叠加"
|
||||
|
||||
# 探测输入视频参数
|
||||
info = probe_video_info(str(clip.local_path))
|
||||
|
||||
# 编码必须是 h264
|
||||
if info.get("video_codec", "") != "h264":
|
||||
return False, f"视频编码不是h264: {info.get('video_codec', 'unknown')}"
|
||||
|
||||
# 像素格式必须是 yuv420p
|
||||
if info.get("pix_fmt", "") != "yuv420p":
|
||||
return False, f"像素格式不是yuv420p: {info.get('pix_fmt', 'unknown')}"
|
||||
|
||||
# 分辨率必须一致
|
||||
if info.get("width", 0) != self.output_width or info.get("height", 0) != self.output_height:
|
||||
return False, (
|
||||
f"分辨率不匹配: "
|
||||
f"{info.get('width', 0)}x{info.get('height', 0)} "
|
||||
f"vs {self.output_width}x{self.output_height}"
|
||||
)
|
||||
|
||||
# 帧率必须一致(误差 < 0.1fps)
|
||||
fps_diff = abs(info.get("fps", 0) - self.output_fps)
|
||||
if fps_diff > 0.1:
|
||||
return False, f"帧率不匹配: {info.get('fps', 0)} vs {self.output_fps}"
|
||||
|
||||
# 检查是否需要 trim
|
||||
effective_duration = UnifiedRenderService._clip_effective_duration(clip)
|
||||
if effective_duration > 0:
|
||||
# 有 trim 需求但视频时长足够,可用 -ss/-t 实现 copy trim
|
||||
input_duration = info.get("duration", 0)
|
||||
if input_duration <= 0:
|
||||
return False, "无法探测输入时长"
|
||||
# trim 起始点 + 目标时长 <= 输入时长
|
||||
start_time = getattr(clip, "start_time", 0) or 0
|
||||
if start_time + effective_duration > input_duration + 0.1:
|
||||
return False, "trim 超出输入时长"
|
||||
|
||||
# video_duration 截断
|
||||
if video_duration > 0 and effective_duration > 0:
|
||||
final_duration = min(effective_duration, video_duration)
|
||||
if final_duration != effective_duration:
|
||||
# 也需要截断,但 -t 可以 copy 模式下用
|
||||
pass
|
||||
|
||||
return True, "所有条件满足"
|
||||
|
||||
def _try_render_stream_copy(
|
||||
self,
|
||||
layers: list[RenderLayer],
|
||||
output_path: Path,
|
||||
*,
|
||||
ass_path: Path | None = None,
|
||||
video_duration: float = 0.0,
|
||||
) -> bool:
|
||||
"""尝试 stream copy 渲染,成功返回 True,失败返回 False(调用方回退到重编码)。
|
||||
|
||||
stream copy 模式:不重编码,直接拷贝视频/音频流,性能提升 10 倍+。
|
||||
仅用于单 clip 直通场景且满足 copy 条件。
|
||||
"""
|
||||
clip = layers[0].clips[0]
|
||||
role = layers[0].role
|
||||
|
||||
# 判断是否满足 copy 条件
|
||||
can_copy, reason = self._can_use_stream_copy(clip, ass_path=ass_path, video_duration=video_duration)
|
||||
if not can_copy:
|
||||
logger.info(
|
||||
"[unified-render] stream_copy 跳过: plan_id=%s reason=%s",
|
||||
self.plan.id,
|
||||
reason,
|
||||
)
|
||||
return False
|
||||
|
||||
# 构建 copy 命令
|
||||
command = [
|
||||
FFMPEG_BIN,
|
||||
"-y",
|
||||
]
|
||||
|
||||
# trim 支持(-ss 放在 -i 前 = input seeking,速度更快但精度稍差;
|
||||
# 放在 -i 后 = output seeking,精度高但慢)
|
||||
# 这里用 output seeking 保证精度,反正 copy 模式已经很快了
|
||||
start_time = getattr(clip, "start_time", 0) or 0
|
||||
effective_duration = UnifiedRenderService._clip_effective_duration(clip)
|
||||
|
||||
command.extend(["-i", str(clip.local_path)])
|
||||
|
||||
if start_time > 0:
|
||||
command.extend(["-ss", f"{start_time:.3f}"])
|
||||
|
||||
# 计算最终时长
|
||||
final_duration = effective_duration
|
||||
if video_duration > 0 and (final_duration <= 0 or final_duration > video_duration):
|
||||
final_duration = video_duration
|
||||
if final_duration > 0:
|
||||
command.extend(["-t", f"{final_duration:.3f}"])
|
||||
|
||||
# 流拷贝
|
||||
command.extend(
|
||||
[
|
||||
"-c:v",
|
||||
"copy",
|
||||
"-c:a",
|
||||
"copy",
|
||||
"-movflags",
|
||||
"+faststart",
|
||||
str(output_path),
|
||||
]
|
||||
)
|
||||
|
||||
logger.info(
|
||||
"[unified-render] stream_copy 渲染: plan_id=%s clip=%s role=%s duration=%.2fs",
|
||||
self.plan.id,
|
||||
clip.clip_id,
|
||||
role,
|
||||
final_duration,
|
||||
)
|
||||
|
||||
try:
|
||||
run_ffmpeg(command)
|
||||
# 验证输出文件存在且有大小
|
||||
if output_path.exists() and output_path.stat().st_size > 0:
|
||||
logger.info(
|
||||
"[unified-render] stream_copy 成功: plan_id=%s size=%d",
|
||||
self.plan.id,
|
||||
output_path.stat().st_size,
|
||||
)
|
||||
return True
|
||||
else:
|
||||
logger.warning("[unified-render] stream_copy 输出为空: plan_id=%s", self.plan.id)
|
||||
return False
|
||||
except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
|
||||
logger.warning(
|
||||
"[unified-render] stream_copy 失败,回退到重编码: plan_id=%s error=%s",
|
||||
self.plan.id,
|
||||
str(e)[:200],
|
||||
)
|
||||
# 清理可能的损坏输出文件
|
||||
if output_path.exists():
|
||||
try:
|
||||
output_path.unlink()
|
||||
except OSError:
|
||||
pass
|
||||
return False
|
||||
|
||||
def _render_pass_through(
|
||||
self,
|
||||
layers: list[RenderLayer],
|
||||
@@ -797,7 +980,6 @@ class UnifiedRenderService:
|
||||
|
||||
# 计算 PiP 位置
|
||||
pip_width = int(self.output_width * _PIP_SCALE)
|
||||
pip_height = int(self.output_height * _PIP_SCALE)
|
||||
margin = 20 # 边距
|
||||
|
||||
if "overlay" in layer_map:
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
"""FFmpeg 超时保护测试。
|
||||
|
||||
验证 run_ffmpeg / probe_video_info 的超时保护机制,
|
||||
防止 FFmpeg hang 住导致 worker 永久阻塞。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import subprocess
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from video_processing.ffmpeg_utils import (
|
||||
DEFAULT_FFMPEG_TIMEOUT,
|
||||
probe_video_info,
|
||||
run_ffmpeg,
|
||||
)
|
||||
|
||||
# ── run_ffmpeg 超时保护 ──────────────────────────────────────────────────────
|
||||
|
||||
|
||||
class TestRunFFmpegTimeout:
|
||||
"""run_ffmpeg 超时保护测试。"""
|
||||
|
||||
def test_default_timeout_is_set(self):
|
||||
"""默认超时应为 1800 秒(30分钟)。"""
|
||||
assert DEFAULT_FFMPEG_TIMEOUT == 1800
|
||||
|
||||
def test_timeout_expired_is_raised(self):
|
||||
"""超时未完成时 TimeoutExpired 异常被传播。"""
|
||||
with patch("video_processing.ffmpeg_utils.subprocess.run") as mock_run:
|
||||
mock_run.side_effect = subprocess.TimeoutExpired(cmd=["ffmpeg", "test"], timeout=1)
|
||||
with pytest.raises(subprocess.TimeoutExpired):
|
||||
run_ffmpeg(["ffmpeg", "test"])
|
||||
|
||||
def test_custom_timeout(self):
|
||||
"""支持自定义超时时间。"""
|
||||
with patch("video_processing.ffmpeg_utils.subprocess.run") as mock_run:
|
||||
mock_run.side_effect = subprocess.TimeoutExpired(cmd=["ffmpeg"], timeout=5)
|
||||
with pytest.raises(subprocess.TimeoutExpired):
|
||||
run_ffmpeg(["ffmpeg", "test"], timeout=5)
|
||||
|
||||
def test_none_timeout_disables_protection(self):
|
||||
"""timeout=None 可以禁用超时保护(不推荐)。"""
|
||||
with patch("video_processing.ffmpeg_utils.subprocess.run") as mock_run:
|
||||
mock_result = MagicMock()
|
||||
mock_result.stdout = ""
|
||||
mock_result.stderr = ""
|
||||
mock_run.return_value = mock_result
|
||||
run_ffmpeg(["ffmpeg", "test"], timeout=None)
|
||||
# 验证 timeout=None 被传递
|
||||
call_kwargs = mock_run.call_args.kwargs
|
||||
assert call_kwargs["timeout"] is None
|
||||
|
||||
def test_called_process_error_still_raised(self):
|
||||
"""超时异常不影响原有 CalledProcessError 的抛出。"""
|
||||
with patch("video_processing.ffmpeg_utils.subprocess.run") as mock_run:
|
||||
mock_run.side_effect = subprocess.CalledProcessError(returncode=1, cmd=["ffmpeg"], stderr="error msg")
|
||||
with pytest.raises(subprocess.CalledProcessError):
|
||||
run_ffmpeg(["ffmpeg", "test"])
|
||||
|
||||
|
||||
# ── probe_video_info 超时保护 ────────────────────────────────────────────────
|
||||
|
||||
|
||||
class TestProbeVideoInfoTimeout:
|
||||
"""probe_video_info 超时保护测试。"""
|
||||
|
||||
def test_probe_uses_timeout(self):
|
||||
"""probe_video_info 调用 ffprobe 时应设置 timeout=15。"""
|
||||
with patch("video_processing.ffmpeg_utils.subprocess.run") as mock_run:
|
||||
mock_run.side_effect = subprocess.TimeoutExpired(cmd=["ffprobe"], timeout=15)
|
||||
# 超时异常被捕获,返回默认值
|
||||
result = probe_video_info("/tmp/test.mp4")
|
||||
assert result["width"] == 1280 # DEFAULT_OUTPUT_WIDTH
|
||||
assert result["height"] == 720 # DEFAULT_OUTPUT_HEIGHT
|
||||
|
||||
def test_probe_success(self):
|
||||
"""正常情况应解析 ffprobe JSON 输出。"""
|
||||
fake_output = """
|
||||
{
|
||||
"streams": [{"width": 1920, "height": 1080, "r_frame_rate": "30/1", "duration": "10.5"}],
|
||||
"format": {"duration": "10.5"}
|
||||
}
|
||||
"""
|
||||
with patch("video_processing.ffmpeg_utils.subprocess.run") as mock_run:
|
||||
mock_result = MagicMock()
|
||||
mock_result.stdout = fake_output
|
||||
mock_run.return_value = mock_result
|
||||
result = probe_video_info("/tmp/test.mp4")
|
||||
assert result["width"] == 1920
|
||||
assert result["height"] == 1080
|
||||
assert abs(result["duration"] - 10.5) < 0.01
|
||||
@@ -0,0 +1,190 @@
|
||||
"""渲染结果内部下载接口单元测试。
|
||||
|
||||
测试 internal_render 路由的核心逻辑,mock 掉 repository 和 storage 依赖。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from unittest.mock import MagicMock
|
||||
|
||||
import pytest
|
||||
from app.api.routes.internal_render import (
|
||||
InternalRenderDownloadUrlResponse,
|
||||
InternalRenderTaskVideosResponse,
|
||||
_video_to_item,
|
||||
get_render_task_videos,
|
||||
get_render_video_download_url,
|
||||
)
|
||||
|
||||
# ── Helpers ────────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
class MockVideo:
|
||||
"""模拟 GeneratedVideo 领域对象。"""
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
self.id = kwargs.get("id", "video-1")
|
||||
self.generation_task_id = kwargs.get("generation_task_id", "task-1")
|
||||
self.project_id = kwargs.get("project_id", "proj-1")
|
||||
self.name = kwargs.get("name", "test_video.mp4")
|
||||
self.file_url = kwargs.get("file_url", "videos/test/output.mp4")
|
||||
self.file_size = kwargs.get("file_size", 1024000)
|
||||
self.duration = kwargs.get("duration", 30.5)
|
||||
self.width = kwargs.get("width", 1080)
|
||||
self.height = kwargs.get("height", 1920)
|
||||
self.fps = kwargs.get("fps", 30.0)
|
||||
self.status = kwargs.get("status", "completed")
|
||||
|
||||
|
||||
# ── _video_to_item 测试 ────────────────────────────────────────────────────
|
||||
|
||||
|
||||
class TestVideoToItem:
|
||||
"""测试视频对象转响应项。"""
|
||||
|
||||
def test_basic_conversion(self):
|
||||
video = MockVideo(id="v1", generation_task_id="t1", status="completed")
|
||||
item = _video_to_item(video, "https://oss.example.com/download?v1")
|
||||
assert item.video_id == "v1"
|
||||
assert item.generation_task_id == "t1"
|
||||
assert item.status == "completed"
|
||||
assert item.download_url == "https://oss.example.com/download?v1"
|
||||
|
||||
def test_missing_optional_fields(self):
|
||||
"""缺可选字段时返回 None。"""
|
||||
video = MockVideo()
|
||||
# 去掉可选字段
|
||||
del video.file_size
|
||||
del video.duration
|
||||
item = _video_to_item(video, "https://example.com/dl")
|
||||
assert item.file_size is None
|
||||
assert item.duration is None
|
||||
assert item.width == 1080 # 还在
|
||||
|
||||
|
||||
# ── 路由函数测试 ────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
class TestGetRenderVideoDownloadUrl:
|
||||
"""测试单个视频下载URL接口。"""
|
||||
|
||||
def test_video_exists(self):
|
||||
video = MockVideo(id="v-abc", file_url="videos/abc/out.mp4")
|
||||
mock_repo = MagicMock()
|
||||
mock_repo.get.return_value = video
|
||||
mock_storage = MagicMock()
|
||||
mock_storage.get_download_url.return_value = "https://oss.test/signed?v=abc"
|
||||
|
||||
result = get_render_video_download_url(
|
||||
video_id="v-abc",
|
||||
_=True,
|
||||
generated_video_repository=mock_repo,
|
||||
storage_service=mock_storage,
|
||||
)
|
||||
|
||||
assert isinstance(result, InternalRenderDownloadUrlResponse)
|
||||
assert result.video_id == "v-abc"
|
||||
assert result.download_url == "https://oss.test/signed?v=abc"
|
||||
mock_repo.get.assert_called_once_with("v-abc")
|
||||
mock_storage.get_download_url.assert_called_once()
|
||||
|
||||
def test_video_not_found_raises_404(self):
|
||||
from fastapi import HTTPException
|
||||
|
||||
mock_repo = MagicMock()
|
||||
mock_repo.get.return_value = None
|
||||
mock_storage = MagicMock()
|
||||
|
||||
with pytest.raises(HTTPException) as exc_info:
|
||||
get_render_video_download_url(
|
||||
video_id="nonexistent",
|
||||
_=True,
|
||||
generated_video_repository=mock_repo,
|
||||
storage_service=mock_storage,
|
||||
)
|
||||
assert exc_info.value.status_code == 404
|
||||
|
||||
def test_download_url_long_expiry(self):
|
||||
"""过期时间应为 24 小时(86400s)。"""
|
||||
video = MockVideo(id="v1")
|
||||
mock_repo = MagicMock()
|
||||
mock_repo.get.return_value = video
|
||||
mock_storage = MagicMock()
|
||||
mock_storage.get_download_url.return_value = "https://oss.test/signed"
|
||||
|
||||
get_render_video_download_url(
|
||||
video_id="v1",
|
||||
_=True,
|
||||
generated_video_repository=mock_repo,
|
||||
storage_service=mock_storage,
|
||||
)
|
||||
|
||||
# 验证 expires_seconds=86400
|
||||
call_kwargs = mock_storage.get_download_url.call_args
|
||||
assert call_kwargs.kwargs.get("expires_seconds") == 86400 or call_kwargs[1].get("expires_seconds") == 86400
|
||||
|
||||
|
||||
class TestGetRenderTaskVideos:
|
||||
"""测试任务视频列表接口。"""
|
||||
|
||||
def test_list_multiple_videos(self):
|
||||
videos = [
|
||||
MockVideo(id="v1", status="completed"),
|
||||
MockVideo(id="v2", status="completed"),
|
||||
MockVideo(id="v3", status="failed"),
|
||||
]
|
||||
mock_repo = MagicMock()
|
||||
mock_repo.list_by_generation_task.return_value = videos
|
||||
mock_storage = MagicMock()
|
||||
mock_storage.get_download_url.return_value = "https://oss.test/signed"
|
||||
|
||||
result = get_render_task_videos(
|
||||
task_id="task-1",
|
||||
status=None,
|
||||
_=True,
|
||||
generated_video_repository=mock_repo,
|
||||
storage_service=mock_storage,
|
||||
)
|
||||
|
||||
assert isinstance(result, InternalRenderTaskVideosResponse)
|
||||
assert result.task_id == "task-1"
|
||||
assert result.count == 3
|
||||
assert len(result.videos) == 3
|
||||
|
||||
def test_filter_by_status(self):
|
||||
videos = [
|
||||
MockVideo(id="v1", status="completed"),
|
||||
MockVideo(id="v2", status="completed"),
|
||||
MockVideo(id="v3", status="failed"),
|
||||
]
|
||||
mock_repo = MagicMock()
|
||||
mock_repo.list_by_generation_task.return_value = videos
|
||||
mock_storage = MagicMock()
|
||||
mock_storage.get_download_url.return_value = "https://oss.test/signed"
|
||||
|
||||
result = get_render_task_videos(
|
||||
task_id="task-1",
|
||||
status="completed",
|
||||
_=True,
|
||||
generated_video_repository=mock_repo,
|
||||
storage_service=mock_storage,
|
||||
)
|
||||
|
||||
assert result.count == 2
|
||||
assert all(v.status == "completed" for v in result.videos)
|
||||
|
||||
def test_empty_task(self):
|
||||
mock_repo = MagicMock()
|
||||
mock_repo.list_by_generation_task.return_value = []
|
||||
mock_storage = MagicMock()
|
||||
|
||||
result = get_render_task_videos(
|
||||
task_id="empty-task",
|
||||
status=None,
|
||||
_=True,
|
||||
generated_video_repository=mock_repo,
|
||||
storage_service=mock_storage,
|
||||
)
|
||||
|
||||
assert result.count == 0
|
||||
assert result.videos == []
|
||||
@@ -1399,3 +1399,239 @@ class TestAudioMixing:
|
||||
assert r1 is True and r2 is True and r3 is True
|
||||
# 实际只探测了 1 次
|
||||
assert mock_probe.call_count == 1
|
||||
|
||||
|
||||
# ── 测试 stream copy 流拷贝优化 ───────────────────────────────────────────────
|
||||
|
||||
|
||||
class TestStreamCopy:
|
||||
"""stream copy 流拷贝优化测试。"""
|
||||
|
||||
def _make_single_clip_service(self):
|
||||
clips = [_make_clip("c1", "main", order=0, duration=5.0)]
|
||||
svc = _make_service(clips)
|
||||
with _patch_path_exists(), patch("video_processing.unified_render_service.probe_duration", return_value=5.0):
|
||||
resolved = svc._resolve_clips()
|
||||
layers = svc._group_clips_into_layers(resolved)
|
||||
return svc, resolved[0], layers
|
||||
|
||||
def test_can_use_stream_copy_all_conditions_met(self):
|
||||
"""所有条件满足 → 可以 stream copy。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 25.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
with patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
):
|
||||
can_copy, reason = svc._can_use_stream_copy(clip, ass_path=None, video_duration=0)
|
||||
assert can_copy is True
|
||||
assert "所有条件满足" in reason
|
||||
|
||||
def test_cannot_copy_with_subtitles(self):
|
||||
"""有字幕 → 不能 stream copy。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
can_copy, reason = svc._can_use_stream_copy(clip, ass_path=Path("/tmp/sub.ass"), video_duration=0)
|
||||
assert can_copy is False
|
||||
assert "字幕" in reason
|
||||
|
||||
def test_cannot_copy_wrong_codec(self):
|
||||
"""编码不是 h264 → 不能 stream copy。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 25.0,
|
||||
"video_codec": "hevc",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
with patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
):
|
||||
can_copy, reason = svc._can_use_stream_copy(clip, ass_path=None, video_duration=0)
|
||||
assert can_copy is False
|
||||
assert "编码" in reason
|
||||
|
||||
def test_cannot_copy_wrong_resolution(self):
|
||||
"""分辨率不匹配 → 不能 stream copy。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1920,
|
||||
"height": 1080,
|
||||
"fps": 25.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
with patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
):
|
||||
can_copy, reason = svc._can_use_stream_copy(clip, ass_path=None, video_duration=0)
|
||||
assert can_copy is False
|
||||
assert "分辨率" in reason
|
||||
|
||||
def test_cannot_copy_wrong_fps(self):
|
||||
"""帧率不匹配 → 不能 stream copy。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 30.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
with patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
):
|
||||
can_copy, reason = svc._can_use_stream_copy(clip, ass_path=None, video_duration=0)
|
||||
assert can_copy is False
|
||||
assert "帧率" in reason
|
||||
|
||||
def test_cannot_copy_wrong_pix_fmt(self):
|
||||
"""像素格式不匹配 → 不能 stream copy。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 25.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv422p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
with patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
):
|
||||
can_copy, reason = svc._can_use_stream_copy(clip, ass_path=None, video_duration=0)
|
||||
assert can_copy is False
|
||||
assert "像素格式" in reason
|
||||
|
||||
def test_try_render_stream_copy_success(self):
|
||||
"""stream copy 渲染成功 → 返回 True。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 25.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
output_path = Path("/tmp/test_output.mp4")
|
||||
|
||||
def fake_stat():
|
||||
m = MagicMock()
|
||||
m.st_size = 1024000
|
||||
return m
|
||||
|
||||
with (
|
||||
patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
),
|
||||
patch("video_processing.unified_render_service.run_ffmpeg") as mock_run,
|
||||
patch("pathlib.Path.exists", return_value=True),
|
||||
patch("pathlib.Path.stat", side_effect=fake_stat),
|
||||
):
|
||||
result = svc._try_render_stream_copy(layers, output_path, ass_path=None, video_duration=0)
|
||||
|
||||
assert result is True
|
||||
mock_run.assert_called_once()
|
||||
cmd = mock_run.call_args[0][0]
|
||||
assert "-c:v" in cmd
|
||||
assert "copy" in cmd
|
||||
assert "-c:a" in cmd
|
||||
|
||||
def test_try_render_stream_copy_fallback_on_ffmpeg_error(self):
|
||||
"""stream copy FFmpeg 失败 → 返回 False(调用方回退到重编码)。"""
|
||||
svc, clip, layers = self._make_single_clip_service()
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 25.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
output_path = Path("/tmp/test_output.mp4")
|
||||
|
||||
import subprocess as sp
|
||||
|
||||
with (
|
||||
patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
),
|
||||
patch(
|
||||
"video_processing.unified_render_service.run_ffmpeg",
|
||||
side_effect=sp.CalledProcessError(1, ["ffmpeg"], stderr="copy failed"),
|
||||
),
|
||||
patch("pathlib.Path.exists", return_value=False),
|
||||
):
|
||||
result = svc._try_render_stream_copy(layers, output_path, ass_path=None, video_duration=0)
|
||||
|
||||
assert result is False
|
||||
|
||||
def test_render_uses_stream_copy_when_eligible(self):
|
||||
"""完整渲染流程:满足条件时走 stream copy。"""
|
||||
clips = [_make_clip("c1", "main", order=0, duration=5.0)]
|
||||
svc = _make_service(clips)
|
||||
|
||||
probe_result = {
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"fps": 25.0,
|
||||
"video_codec": "h264",
|
||||
"pix_fmt": "yuv420p",
|
||||
"duration": 5.0,
|
||||
"has_audio": True,
|
||||
"audio_codec": "aac",
|
||||
}
|
||||
|
||||
def fake_stat():
|
||||
m = MagicMock()
|
||||
m.st_size = 1024000
|
||||
return m
|
||||
|
||||
with (
|
||||
_patch_path_exists(),
|
||||
patch("video_processing.unified_render_service.probe_duration", return_value=5.0),
|
||||
patch(
|
||||
"video_processing.unified_render_service.probe_video_info",
|
||||
return_value=probe_result,
|
||||
),
|
||||
patch("video_processing.unified_render_service.run_ffmpeg") as mock_run,
|
||||
patch("pathlib.Path.stat", side_effect=fake_stat),
|
||||
patch("shutil.copy2"),
|
||||
):
|
||||
result = svc.render()
|
||||
|
||||
assert mock_run.call_count == 1
|
||||
cmd = mock_run.call_args[0][0]
|
||||
assert "copy" in cmd
|
||||
assert isinstance(result.output_path, Path)
|
||||
|
||||
Reference in New Issue
Block a user