Skip to content

fix(harmony): reconcile approved M14 into current main without losing dropout/bypass reliability - #509

Closed
masarray wants to merge 3 commits into
mainfrom
fix/harmony-main-reconcile-dropout-bypass-20261110
Closed

masarray wants to merge 3 commits into
mainfrom
fix/harmony-main-reconcile-dropout-bypass-20261110

Conversation

@masarray

@masarray masarray commented Nov 10, 2026 •

Copy link
Copy Markdown
Owner

Critical cross-thread reconciliation — DRAFT, DO NOT AUTO-MERGE

This is the minimal forward-port of Harmony fixes missing from current main into a fresh branch based on merge commit 6bcf88af30629d2e20026bfa8e0a84163c06c29e. It deliberately excludes the old QA branch history and isolates 3 files only. No changes to Player, WIRE, ASIO4ALL device recovery, Compressor, Vocal Throw, .smix, installer, or web UI.

Why this PR exists

On 2026-11-10 main advanced by merge commit 6bcf88af which merged #487 and #499, while the previously safe drafts #503/#506 remained separate. main already contains Music key scoring/hold policy, the 9-way WET/Space matrix and warm bypass; do not cherry-pick entire old QA branches or revert mixed M14 changes. Two specific fixes were missing from main:

  1. 8ms bypass envelope at actual device rate: native ChannelHarmonyProcessor::prepareToPlay() previously never reported the rate to JUCE metadata, so FxInstance captured 0 and used 64 frames instead of 384 at 48k or 768 at 96k. Set metadata once OFF realtime before the lease is constructed.
  2. Music guide source dropout: after >2 seconds without music ChannelId PCM, Manual fallback occurred but the old detector history remained. Reset it once at the timeout to prevent immediate stale key flash when source PCM resumes.

Real PCM regressions (not browser-only)

  • Extend harmony_music_bank_test.cpp: live singer at 220Hz during guide dropout, exact untouched source PCM, first resumed A-minor block must not republish stale C-major; after acquiring fresh evidence it must report A minor.
  • Extend harmony_bypass_reliability_test.cpp: assert native JUCE processor rate and actual lease bypassFade 8ms across nine WET/Space combinations, 48/96 kHz and 64/128/256 periods, in addition to existing continuous wet/off/on exact PDC tests.

Guardrails for parallel threads / release

Single cross-thread checkpoint

Canonical reconciliation and owner review gates: P0 integration contract #510. All workstreams must read it before carrying forward Harmony/PCM into release or modifying these files. This is advisory; enable branch rules for enforceable protection.

@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Nov 10, 2026 •

Copy link
Copy Markdown

Deploying arsonmix with  Cloudflare Pages  Cloudflare Pages

Latest commit: 618cb67
Status: ✅  Deploy successful!
Preview URL: https://76b3c08f.arsonmix.pages.dev
Branch Preview URL: https://experiment-harmonice-p1-late.arsonmix.pages.dev

View logs

Copy link
Copy Markdown
Owner Author

/arsonmix-ci fat 618cb67

Copy link
Copy Markdown
Owner Author

Exact source Windows qualification underway (same SHA; no code changes)

Previous #506 db2bcf8c Windows full MSVC/FAT #42730552143 SUCCESS: exact-source build, 80/80 CTest including NativeHarmonyMusicFromOtherChannelIdAndStateMigration (#9), NativeHarmonyWarmBypassRackSlotAndLatencyParity (#10), mixer pipeline (#20–30), ASIO native (#38–56), Compressor (#75/76), Vocal Throw native (#77–79); FAT preview and installer artifacts uploaded. Those results are not a pass for new source SHA.

Targeted current-main #509 exact SHA 618cb67c476ffe41904175cc87890f075c9c3b21: one Windows full MSVC CTest / FAT / Inno run #42735079669 triggered through owner-authorized dispatcher. Quick preflight succeeded, Windows native job in progress. Keep draft/no merge pending this run + owner physical ASIO/singer evidence. Vocal Throw M15 owner reports bad audio and remains a separate unapproved draft #507; zero M15 source changes in this 3-file Harmony PR.

Copy link
Copy Markdown
Owner Author

Cross-thread forward-port note: PR #512 selectively contains this PR's 3-file Harmony correction and PCM tests on latest main, plus previously missing ASIO recovery. Its exact combined source SHA is 378ffbc2aba4b3de421f723270951365c563b981. Please preserve this original draft for traceability, but avoid a duplicate independent whole-branch merge; compare live #512 first. Physical singer/ASIO proof still pending.

Copy link
Copy Markdown
Owner Author

Superseded and integrated into current main@70cd7604d808c6152803bc377839ff6c8353e393 through branded #518 after #517. Verified all three affected files from this original #509: tests/harmony_bypass_reliability_test.cpp and tests/harmony_music_bank_test.cpp are byte-identical on main; ChannelHarmonyProcessor.h is identical after preserving the approved getName() = Harmonice display name instead of old ArSon Harmony. Full exact-head Windows MSVC/CTest 42767569601 80/80 PASS. Closing this obsolete draft unmerged to prevent duplicate patch / obsolete brand reintroduction. No engine recovery content lost. Separate ASIO recovery #512 remains open; it must reconcile with main before merge.

@masarray masarray closed this Nov 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant