fix: 视频时间语义修正 — 绝对时间戳偏移换算 + mtime 起点修正 + 直传超时
三处时间语义 bug(时区统一排查的延伸发现): 1. NVIDIA 集锦偏移语义: frame_timestamps 是绝对时间 'YYYY-MM-DD HH:MM:SS'(当日秒 77474s)被直接当视频内偏移用, seek 超出 30 分钟视频 → 0 帧 → 集锦恒为空 → 视频模式永远降级。 修复: analyze_video 增加 event_start_time 参数,偏移 = 帧时间 - 视频开始时间(跨午夜 +86400);orchestrator 两处 调用点透传。另加 ffprobe 时长过滤跳过超界片段(日志明示), fps=15 统一 CFR 输出。 2. NAS dispatcher event_start_time: 原用文件 mtime(=录制结束 时刻),真实开始时间应为 mtime - 视频时长,事件时间整体偏移 一个视频周期(~30min)。新增 _probe_duration 用 ffmpeg 解析 Duration(NAS 无独立 ffprobe)。 3. 直传超时: 压缩后 ~19MB 略低于 20MB 分块阈值走直传, timeout(10,120) 在 1Mbps 下传 19MB 需 ~152s 必超时(task 42 三连败 FAILED)。加大到 (10, 300)。 测试数据陷阱记录: 两轮 0KB/9.47s 集锦异常均为测试时间戳超出 视频时长所致(1801s>1800s),单输入/多输入 concat 行为本身正常。
This commit is contained in:
@@ -98,20 +98,42 @@ class NvidiaVisionAdapter(BaseModelAdapter):
|
||||
except ValueError:
|
||||
return -1.0
|
||||
|
||||
def _build_highlight_video(self, video_path: str,
|
||||
frame_timestamps: List[str]) -> Optional[str]:
|
||||
@staticmethod
|
||||
def _probe_duration(video_path: str) -> float:
|
||||
"""ffprobe 解析视频时长,失败返回 0"""
|
||||
try:
|
||||
r = subprocess.run(
|
||||
['ffprobe', '-v', 'quiet', '-show_entries', 'format=duration',
|
||||
'-of', 'csv=p=0', video_path],
|
||||
capture_output=True, timeout=30)
|
||||
return float(r.stdout.decode().strip() or 0)
|
||||
except (subprocess.TimeoutExpired, OSError, ValueError):
|
||||
return 0.0
|
||||
|
||||
def _build_highlight_video(self, video_path: str, frame_timestamps: List[str],
|
||||
event_start_time: str = '') -> Optional[str]:
|
||||
"""按关键帧时间点截取 ±pad 秒片段,叠加时间戳后拼接集锦视频
|
||||
|
||||
时间戳以 00-05-00 形式叠加(连字符避免 ffmpeg drawtext 冒号转义)。
|
||||
时间戳以 2026-08-20 04-34-10 形式叠加(连字符避免 ffmpeg drawtext 冒号转义)。
|
||||
偏移换算: 绝对时间戳 - 视频开始时间(event_start_time 缺失时,
|
||||
时间戳值本身须已是视频内偏移,如 HH:MM:SS 相对时间)。
|
||||
"""
|
||||
start_sec = self._ts_to_seconds(event_start_time) if event_start_time else 0.0
|
||||
duration = self._probe_duration(video_path)
|
||||
clips = []
|
||||
for ts in frame_timestamps:
|
||||
sec = self._ts_to_seconds(ts)
|
||||
if sec < 0:
|
||||
continue
|
||||
start = max(0.0, sec - VIDEO_SEGMENT_PAD)
|
||||
label = str(ts).replace(':', '-')
|
||||
clips.append((start, label))
|
||||
if start_sec > 0:
|
||||
sec -= start_sec
|
||||
if sec < 0:
|
||||
sec += 86400 # 跨午夜
|
||||
if duration > 0 and (sec < -VIDEO_SEGMENT_PAD
|
||||
or sec > duration - 0.5):
|
||||
logger.info(f"NVIDIA 跳过超界片段: {ts} -> {sec:.1f}s (视频 {duration:.0f}s)")
|
||||
continue
|
||||
clips.append((sec, str(ts).replace(':', '-')))
|
||||
if not clips:
|
||||
return None
|
||||
|
||||
@@ -123,12 +145,13 @@ class NvidiaVisionAdapter(BaseModelAdapter):
|
||||
parts = []
|
||||
for i, (_, label) in enumerate(clips):
|
||||
parts.append(
|
||||
f"[{i}:v]scale={HIGHLIGHT_WIDTH}:-2,"
|
||||
f"[{i}:v]fps=15,scale={HIGHLIGHT_WIDTH}:-2,"
|
||||
f"drawtext=text='ts {label}':x=8:y=8:fontsize=22:"
|
||||
f"fontcolor=white:box=1:boxcolor=black@0.6[v{i}]")
|
||||
concat_in = ''.join(f'[v{i}]' for i in range(len(clips)))
|
||||
parts.append(f'{concat_in}concat=n={len(clips)}:v=1:a=0[out]')
|
||||
cmd += ['-filter_complex', ';'.join(parts), '-map', '[out]',
|
||||
'-r', '15',
|
||||
'-c:v', 'libx264', '-preset', 'veryfast', '-crf', '28',
|
||||
'-an', out_path]
|
||||
try:
|
||||
@@ -147,7 +170,8 @@ class NvidiaVisionAdapter(BaseModelAdapter):
|
||||
|
||||
def analyze_video(self, video_path: str,
|
||||
frame_timestamps: List[str],
|
||||
known_members_context: str) -> Optional[Dict]:
|
||||
known_members_context: str,
|
||||
event_start_time: str = '') -> Optional[Dict]:
|
||||
"""原生视频输入分析: 集锦片段 -> video_url 单次调用"""
|
||||
if self._cb.is_open():
|
||||
logger.warning("NVIDIA 熔断器 OPEN,跳过视频分析")
|
||||
@@ -156,7 +180,8 @@ class NvidiaVisionAdapter(BaseModelAdapter):
|
||||
logger.warning("NVIDIA 客户端未初始化,跳过视频分析")
|
||||
return None
|
||||
|
||||
highlight = self._build_highlight_video(video_path, frame_timestamps)
|
||||
highlight = self._build_highlight_video(
|
||||
video_path, frame_timestamps, event_start_time)
|
||||
if not highlight:
|
||||
logger.warning("NVIDIA 集锦视频不可用,降级逐帧模式")
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user