Commit Graph

6 Commits

Author SHA1 Message Date
Z User
46617b71b8 fix: snap the half-res first pass onto the even-latent grid
Multi-segment projects crashed on the first continuation segment with
RuntimeError: shape '[1, 24, 1, 1, 8, 2, 15, 2]' is invalid for input of
size 12240 (patchify_video). The hidden half-resolution first pass
declared its size with plain integer halving, so a 1920x1080 editor
sampled at 960x540 - and a latent encoded from 540px carries an odd
17-row count. Odd latents sample fine, but when the segment tail comes
back as motion-context keyframes on the next segment, the model's
patchify_video (2x2 latent patches) cannot reshape them.

The first pass now snaps onto the nearest 64px grid (h3_even_latent_size)
so every latent in the pipeline keeps even row/column counts:

- 1920x1080 editor samples at 960x512 (was 960x540 -> 17 rows)
- 1344x768 samples at 704x384 (672 had odd latent columns)
- 3840x2160 is unchanged at 1920x1088 - the size the VAE already rounds
  up to, so the 4K-editor trick behaves identically

Outputs and second-pass dimensions are unchanged; only continuation
segments that previously crashed now run. Also updates the stale
single-task expansion test, which still expected pre-half-res-trick
conditioning dimensions (editor size instead of the sampled size).
2026-10-15 02:05:48 +00:00
Z User
4dccb4fb4c fix: surface the real FFmpeg compose failure instead of a generic error
merge_video_track_with_ffmpeg returned None for every failure mode (FFmpeg
missing, empty timeline, odd canvas, missing segment/locked-audio files,
spawn errors, non-zero exit), which collapsed into the useless
'FFmpeg could not compose the H3 project video' message users saw in the
ComfyUI error dialog.

Add an opt-in failure_reason collector: callers that need to surface the
cause (compose_h3_project_video) now pass a list and receive one specific
human-readable entry per failed precondition, or the FFmpeg stderr tail
(e.g. 'Unknown encoder libx264') when the command itself fails. The
nodes/basic.py tensor-merge fallback still uses the silent None contract
and is unchanged.

Verified with scripts/test_merge_failure_reason.py (16 stubbed checks:
every return-None path records a reason, compose propagates it).
2026-09-29 05:52:23 +00:00
Z User
8ede97ab11 feat: revert editor to pristine upstream, drop format label mapping and T2V==R2V, fix editor delivery
- frontend/src + messages restored byte-identical to upstream v1.3.3:
  format normalization shims, isMoxieEditorFormat gates, bundle marker,
  tooltip reword, and their tests all removed; editor bundle rebuilt from
  that pristine source so the editor behaves exactly like upstream
- format combo shows 'MiniMax' again (options=[MiniMax]); legacy queued
  'Moxie Multimedia' values still normalized to MiniMax at execution
- T2V resolves natively again: t2v stays t2v in h3_task_type,
  _multitrack_task_type and getMultiTrackTaskType; generation-mode t2v
  mapping and the zero-media cloud fallback removed (upstream behavior);
  Python tests and stub scripts updated accordingly
- editor delivery fix: core lets WEB_DIRECTORY overwrite the pack's
  EXTENSION_WEB_DIRS entry, so the /extensions listing never contained
  dist/release and a fresh browser never imported the editor (it only
  ever appeared from stale browser cache). web/js/editor-loader.js now
  imports the editor entry from the pack's own static mount, which
  serves index.js with no-cache (chunks stay cacheable); the
  /extensions/<pack>/index.js route was removed as a 404 trap
- shipped Moxie*.json templates carry format value MiniMax

Verified: frontend diff vs upstream = 0; bundle string checks + chunk
refs; vitest 565/566 (same pre-existing jsdom URL.revokeObjectURL env
failure); py_compile; test_t2v_r2v_and_loader.py ALL PASS;
test_rtx_upscale_integration.py ALL PASS
2026-09-27 21:24:56 +00:00
Z User
0c4987d090 T2V resolves to the same value as R2V; loader shows a single model
- T2V selections (editor default mode, explicit [start-end,t2v] override
  tags, raw t2v values) now resolve to r2v in every task-type resolver
  (h3_task_type, _multitrack_task_type, frontend getMultiTrackTaskType);
  h3_generation_mode maps raw t2v to reference conditioning as belt and
  braces. Reference-mode with zero reference media renders text-only
  locally; the cloud path falls back to its native t2va request instead
  of raising. i2v/l2v/v2v/edit flows unchanged.
- MoxieMultimediaLoader now presents a single model picker: LoRA, video
  VAE, audio VAE, and CLIP widgets removed and auto-selected from the
  pack's models/ folders (first sorted file, loud error when missing,
  LoRA applied at strength 1.0 when bundled). Outputs and load order
  unchanged; saved workflows keep working (extra widget values ignored).

Verified: py_compile; scripts/test_t2v_r2v_and_loader.py 50/50;
frontend vitest 566/567 (one pre-existing env failure on HEAD);
bun run build; scripts/test_rtx_upscale_integration.py all pass.
2026-09-27 05:50:35 +00:00
Z User
22310bef00 fix: compose the project timeline at its native size and restore full resolution before any combine output
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
2026-09-27 02:18:11 +00:00
4ea8431cd0 init
Some checks are pending
Publish to Comfy registry / Publish Custom Node to registry (push) Waiting to run
2026-09-26 11:11:23 -07:00