Single-pass MultiTrack projects now condition and sample at half the editor-selected resolution; Moxie Project Video Combine restores the exact editor resolution on the combined frames before export, so the editor resolution remains what the user sees and gets. - utils/rtx_vsr.py (new): RTX Video Super Resolution core adapted from Comfy-Org/Nvidia_RTX_Nodes_ComfyUI (Apache 2.0) driving the optional nvidia-vfx package per frame, with automatic Lanczos fallback and exact-size correction; owns the sampling-dimension policy and the project_data gating so only half-res signatures are upscaled - nodes/project.py: gate half-res conditioning/sampling to single-pass mode (dual-pass, SelfLift, passthrough, audio-only unchanged) - moxie_combine.py: restore editor resolution right before the images output; VIDEO preview output passthrough unchanged - scripts/test_rtx_upscale_integration.py: standalone sanity checks (no ComfyUI/torch needed) for the dimension policy and gating
64 lines
2.4 KiB
Python
64 lines
2.4 KiB
Python
from __future__ import annotations
|
|
|
|
from comfy_api.latest import io
|
|
from comfy_execution.graph_utils import ExecutionBlocker
|
|
|
|
from .nodes.project import EasyMultiTrackProjectVideoCombine, TYPE_PROJECT_DATA
|
|
from .utils.rtx_vsr import upscale_images_to_output_resolution
|
|
|
|
|
|
class MoxieCombine(EasyMultiTrackProjectVideoCombine):
|
|
"""MultiTrack Project Video Combine + Get Video Components.
|
|
|
|
Consolidates `easy multitrackProjectVideoCombine` and core
|
|
`GetVideoComponents`: one node emits the FILENAME_PREFIX plus the
|
|
images / audio / fps needed by `easy saveVideo`.
|
|
"""
|
|
|
|
@classmethod
|
|
def define_schema(cls) -> io.Schema:
|
|
return io.Schema(
|
|
node_id="MoxieCombine",
|
|
display_name="Moxie Project Video Combine",
|
|
category="EasyUse/MultiTrackEditor",
|
|
description=(
|
|
"Preview and combine the active videos from a MultiTrack project, "
|
|
"then expose the combined frames, audio and frame rate directly."
|
|
),
|
|
inputs=[
|
|
io.String.Input("project_name", force_input=True,
|
|
tooltip="PROJECT_NAME output of the Moxie MultiTrack Project node."),
|
|
TYPE_PROJECT_DATA.Input("project_data"),
|
|
],
|
|
hidden=[io.Hidden.unique_id],
|
|
outputs=[
|
|
io.Video.Output("VIDEO"),
|
|
io.String.Output("FILENAME_PREFIX"),
|
|
io.Image.Output("images"),
|
|
io.Audio.Output("audio"),
|
|
io.Float.Output("fps"),
|
|
],
|
|
not_idempotent=True,
|
|
)
|
|
|
|
@classmethod
|
|
def execute(cls, project_name: str, project_data) -> io.NodeOutput:
|
|
out = super().execute(project_name=project_name, project_data=project_data)
|
|
video, prefix = out[0], out[1]
|
|
|
|
if isinstance(video, ExecutionBlocker):
|
|
return io.NodeOutput(video, video, video, video, video)
|
|
|
|
components = video.get_components()
|
|
# Hidden half-res sampling contract: restore the editor-selected
|
|
# resolution right before the frames leave this node. Frames without
|
|
# the half-res signature pass through untouched.
|
|
images = upscale_images_to_output_resolution(components.images, project_data)
|
|
return io.NodeOutput(
|
|
video,
|
|
prefix,
|
|
images,
|
|
components.audio,
|
|
float(components.frame_rate),
|
|
)
|