From 21eb17f086bbb64708a0716e2efeb03fa25bfba2 Mon Sep 17 00:00:00 2001 From: wjluoxiao <331030818@qq.com> Date: Thu, 29 Oct 2026 21:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E9=A2=91=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nodes_load_video.py | 105 ++++++++++++++++++++++++++++++++++++-------- xb_video_server.py | 42 ++++++++++++------ 2 files changed, 115 insertions(+), 32 deletions(-) diff --git a/nodes_load_video.py b/nodes_load_video.py index b4af7dc..d043539 100644 --- a/nodes_load_video.py +++ b/nodes_load_video.py @@ -11,6 +11,7 @@ XB-BOX 加载视频 （由 js/xb_video_preview.js 控制），节点宽高可自由缩放。 """ +import math import os import folder_paths @@ -29,6 +30,43 @@ def _video_files(): return sorted(folder_paths.filter_files_content_types(files, ["video"])) +def _probe_source(path): + """只读容器元数据（不解码）：(帧数, 帧率, 宽, 高)。帧数未知时按时长估算。""" + try: + import av + with av.open(path, mode="r") as container: + stream = container.streams.video[0] + fps = float(stream.average_rate or stream.guessed_rate or 0) or 0.0 + frames = int(stream.frames or 0) + if frames <= 0: + duration = float(container.duration or 0) / av.time_base + frames = int(round(duration * fps)) if duration > 0 and fps > 0 else 0 + return frames, fps, int(stream.codec_context.width or 0), int(stream.codec_context.height or 0) + except Exception: + return 0, 0.0, 0, 0 + + +def _check_peak_memory(frames, width, height, hint): + """int 帧解码会整段进内存，超了就是进程级崩溃。这里提前拦住并给出可操作的报错。""" + if frames <= 0 or width <= 0 or height <= 0: + return + # get_components 逐帧解成 float32 RGB（每像素 16 字节），列表转数组时还有一个峰值副本 + need = frames * width * height * 3 * 4 * 2 + try: + import psutil + free = psutil.virtual_memory().available + psutil.swap_memory().free + except Exception: + return + budget = free - (2 ** 27) # 留 128MB 给系统 + if need <= budget: + return + raise RuntimeError( + "视频过大，无法一次性解码：约 %d 帧 %dx%d 需要 %.1fGB 内存，当前只有 %.1fGB 可用。\n" + "请设置「帧数上限」（只解码需要的帧）或改用更短 / 更低分辨率的视频。%s" + % (frames, width, height, need / 1024 ** 3, max(budget, 0) / 1024 ** 3, hint) + ) + + def _resize(images, width, height): """0 表示按原始比例；两个都给则强制拉伸到指定尺寸。""" if images.shape[0] == 0 or not width and not height: @@ -122,7 +160,7 @@ class XB_LoadVideo(io.ComfyNode): max=BIGMAX, step=1, display_name="帧数上限", - tooltip="0 = 不限制，读取全部帧。", + tooltip="0 = 不限制；在「间隔取帧」之后生效，限制最终输出的帧数。", ), io.Int.Input( "skip_first_frames", @@ -140,7 +178,7 @@ class XB_LoadVideo(io.ComfyNode): max=BIGMAX, step=1, display_name="间隔取帧", - tooltip="每隔 N 帧取一帧，1 = 逐帧读取。", + tooltip="每隔 N 帧取一帧，1 = 逐帧读取；1 时不受影响。在「强制帧率」之后生效。", ), io.Boolean.Input( "autoplay", @@ -165,36 +203,65 @@ class XB_LoadVideo(io.ComfyNode): frame_load_cap=0, skip_first_frames=0, select_every_nth=1, autoplay=True): # autoplay 只给前端播放器用（js/xb_video_preview.js），后端无需处理 video_path = folder_paths.get_annotated_filepath(file) + + skip = max(0, int(skip_first_frames or 0)) + nth = max(1, int(select_every_nth or 1)) + cap = max(0, int(frame_load_cap or 0)) + rate = float(force_rate or 0.0) + + # 整段解码会把所有帧读进内存。有帧数上限时只解码「够用」的前缀， + # 没有上限时先算峰值内存，超了就报错（而不是让整个进程崩掉） + src_frames, src_fps, src_w, src_h = _probe_source(video_path) + decode_frames = 0 + if cap and src_frames and src_fps > 0: + target_rate = rate if rate > 0 else src_fps + need = int(math.ceil(cap * nth * src_fps / target_rate)) + 8 + decode_frames = min(src_frames, skip + need) + _check_peak_memory(decode_frames or src_frames, src_w, src_h, + "（已解码 %d 帧）" % decode_frames if decode_frames else "") + source = InputImpl.VideoFromFile(video_path) - components = source.get_components() + decode_source = source + if decode_frames and src_frames and decode_frames < src_frames: + trimmed = source.as_trimmed(0, decode_frames / src_fps, strict_duration=False) + if trimmed is not None: + decode_source = trimmed + components = decode_source.get_components() images = components.images audio = components.audio source_rate = float(components.frame_rate) or 1.0 - # 与 XB 视频加载器一致的顺序：跳过帧 → 间隔取帧 → 帧数上限 → 强制帧率 - skip = max(0, int(skip_first_frames or 0)) - nth = max(1, int(select_every_nth or 1)) - cap = max(0, int(frame_load_cap or 0)) - + # 顺序与 VHS 加载视频一致：跳过帧 → 强制帧率重采样 → 间隔取帧 → 帧数上限 + # （间隔取帧必须排在强制帧率之后，否则重采样会把帧数重新拉满，间隔取帧等于没设； + # 帧数上限必须排在最后，否则重采样后仍会超上限） if skip: images = images[skip:] + if images.shape[0] < 1: + raise RuntimeError( + "没有解出任何帧：跳过帧数 %d 已超过视频总帧数 %d。" % (skip, int(src_frames or 0)) + ) + + cur_rate = source_rate + if rate > 0: + if images.shape[0] > 1 and abs(rate - source_rate) > 1e-6: + # 向上取整：与「按时间重采样」一致（预览转码也按同样的帧数出片）， + # 用 round 会在 .5 上银行家舍入，导致预览比实际输出少一帧 + count = max(1, int(math.ceil(images.shape[0] * rate / source_rate - 1e-9))) + idx = torch.clamp( + (torch.arange(count, dtype=torch.float64) * source_rate / rate).round().long(), + 0, images.shape[0] - 1, + ) + images = images[idx] + cur_rate = rate + if nth > 1: images = images[::nth] + out_rate = cur_rate / nth + if cap and images.shape[0] > cap: images = images[:cap] - out_rate = source_rate / nth - rate = float(force_rate or 0.0) - if rate > 0 and images.shape[0] > 1 and abs(rate - out_rate) > 1e-6: - count = max(1, int(round(images.shape[0] * rate / out_rate))) - idx = torch.clamp( - (torch.arange(count, dtype=torch.float64) * out_rate / rate).round().long(), - 0, images.shape[0] - 1, - ) - images = images[idx] - out_rate = rate - images = _resize(images, int(custom_width or 0), int(custom_height or 0)) duration = images.shape[0] / out_rate if out_rate > 0 else 0.0 audio = _trim_audio(audio, skip / source_rate, duration) diff --git a/xb_video_server.py b/xb_video_server.py index e85ed83..30ce2e7 100644 --- a/xb_video_server.py +++ b/xb_video_server.py @@ -111,21 +111,33 @@ async def xb_video_preview(request): width = max(0, int(_num("custom_width"))) height = max(0, int(_num("custom_height"))) - start_time = skip / base_fps if skip else 0.0 - out_rate = force_rate if force_rate > 0 else base_fps / nth + # 与后端 XB_LoadVideo 完全一致：跳过帧 → 强制帧率重采样 → 每隔 nth 帧取一帧 + # 输出帧率 = (强制帧率 or 源帧率) / nth + target_rate = force_rate if force_rate > 0 else base_fps + out_rate = target_rate / nth - pre_seek, post_seek = [], [] - if start_time > 0: - if start_time > 4: - post_seek = ["-ss", "4"] - pre_seek = ["-ss", str(start_time - 4)] - else: - post_seek = ["-ss", str(start_time)] + # 跳过帧数用「按帧号裁剪」而不是 -ss：-ss 停在帧边界时会丢/多留一帧， + # 后端的 images[skip:] 是按帧号精确切的，这里必须一致 + start_frame = skip + if "start_time" in query: + try: + start_frame = max(0, int(round(float(query["start_time"]) * base_fps))) + except (TypeError, ValueError): + start_frame = skip - args = [_ffmpeg_path, "-v", "error"] + pre_seek + ["-i", filepath] + post_seek + args = [_ffmpeg_path, "-v", "error", "-i", filepath] - if out_rate > 0 and abs(out_rate - base_fps) > 1e-6: - args += ["-r", f"{out_rate:.6f}"] + rate_filters = [] + if start_frame > 0: + rate_filters.append(f"trim=start_frame={start_frame}") + rate_filters.append("setpts=PTS-STARTPTS") + if force_rate > 0 and abs(force_rate - base_fps) > 1e-6: + rate_filters.append(f"fps={force_rate:.6f}") + if nth > 1: + rate_filters.append(f"select=not(mod(n\\,{nth}))") + if force_rate > 0 or nth > 1: + # 重新打时间戳：每帧间隔 1/out_rate，时长与后端输出一致 + rate_filters.append(f"setpts=N/({out_rate:.6f}*TB)") def _even(v): return max(2, int(v) - int(v) % 2) @@ -148,7 +160,7 @@ async def xb_video_preview(request): ratio = PREVIEW_MAX / max(target_w, target_h) target_w, target_h = _even(round(target_w * ratio)), _even(round(target_h * ratio)) - vfilters = [] + vfilters = list(rate_filters) if crop_to_box: vfilters.append(f"scale={target_w}:{target_h}:force_original_aspect_ratio=increase") vfilters.append(f"crop={target_w}:{target_h}") @@ -163,6 +175,10 @@ async def xb_video_preview(request): vfilters.append("scale=trunc(iw/2)*2:trunc(ih/2)*2") args += ["-vf", ",".join(vfilters)] + if rate_filters: + # 帧已由 select/setpts 决定，禁止 ffmpeg 再按原始帧率补帧/丢帧 + args += ["-fps_mode", "passthrough"] + if cap > 0: args += ["-frames:v", str(cap)]