MoxieCombine now exposes exactly images / audio / fps - the leftover
VIDEO and FILENAME_PREFIX outputs are gone, so the output file name is
chosen on easy saveVideo itself. The base easy multitrackProjectVideoCombine
keeps its VIDEO and FILENAME_PREFIX outputs for legacy workflows.
The shipped Moxie-consolidated template is rewired accordingly: fps/images
links follow the new slot indices (2/0), the filename_prefix link is replaced
by the same project-scoped literal the removed output produced, and the
TEMPLATE's save location is unchanged.
pytest: new schema/execute/blocker coverage for MoxieCombine via a
_load_moxie_combine helper; base-combine assertions untouched.
The compose step previously built the timeline at the manifest
resolution while staging segments are written at the (hidden) half-res
sampling size, so ffmpeg's overlay pasted the smaller segments into the
top-left quarter of a black full-res canvas and the combine's restore
gate saw frames already at the manifest size and never fired.
- compose_h3_project_video now probes the timeline segments and composes
at the size they all share (_uniform_probed_size; manifest dims remain
the fallback for mixed/unknown sizes)
- restore_project_video_resolution (utils/rtx_vsr.py) fast-probes the
composed file, and when it differs from the manifest decodes once,
upscales (RTX VSR, Lanczos fallback, exact size) and rebuilds the
video so VIDEO, images, audio and fps all carry the editor-selected
resolution; any failure keeps the original video
- the restore lives in the base combine so MoxieCombine (images slot)
and the legacy GetVideoComponents wiring are both covered; the
duplicated images gate in MoxieCombine is gone
Single-pass projects condition and sample at exactly half the
editor-selected resolution (plain integer halving, no dimension
policies). Moxie Project Video Combine restores the exact editor
resolution on the combined frames right before its images output,
driven by the fresh project manifest so a stale frontend widget can
never misgate it.
- utils/rtx_vsr.py: RTX VSR core (Apache 2.0, from
Comfy-Org/Nvidia_RTX_Nodes_ComfyUI) + Lanczos fallback; the gate is
simply 'frames differ from the manifest resolution'
- nodes/project.py: halve first-pass dims for single mode only;
dual-pass, SelfLift, passthrough and audio-only keep the editor size
- moxie_combine.py: restore before the images output
- scripts/test_rtx_upscale_integration.py: 17 standalone checks
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