unom/punktfunk
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

fix(host/windows): rebuild the output fresh on every WGC↔DDA source switch

Browse Source 
Key insight (from the user): a fresh RECONNECT shows the secure desktop but the
live transition does not — so the difference is what a fresh session does that
the live switch skipped. A reconnect runs build() = REMOVE + fresh ADD of the
SudoVDA monitor + re-isolate + a fresh capturer; the live transition instead
reused the session-start output (created while on the NORMAL desktop), which goes
born-lost (ACCESS_LOST storm → black) on the secure desktop.

Fix: virtual_stream_relay now calls build() on EVERY source switch (both WGC→DDA
and DDA→WGC), then opens DDA on the new target for secure / uses the fresh helper
for normal. This makes each transition equivalent to the reconnect that works —
fixing both the WGC→DDA cutover (secure desktop now in the clean output state DDA
can duplicate) and the DDA→WGC cutover (a fresh helper's first frame is its
opening IDR, so await_idr clears immediately instead of waiting on a wedged
helper). Costs a ~1-2s rebuild per transition, acceptable for UAC/lock events.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Enrico Bühler
2026-06-16 10:40:55 +00:00
parent ef4786387e
commit 3f191ba2ea
2 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/punktfunk-host/src/m3.rs
+29 -15
View File
@@ -2453,26 +2453,40 @@ fn virtual_stream_relay(
},
"two-process: source switch"
);
// Rebuild the SudoVDA output FRESH on every source switch — the key insight: a fresh
// reconnect captures the secure desktop but the live transition (which reused the
// session-start output, created while on the NORMAL desktop) does not. `build` does the
// exact reconnect setup: REMOVE + fresh ADD of the virtual monitor + re-isolate + a fresh
// capturer, so the new output is in the clean state that DDA can duplicate on the secure
// desktop. Drop the old DDA (it's bound to the old target); reopen on the new one.
match build(&mut vd, cur_mode) {
Ok((ka, rl, tg, hz)) => {
relay = rl; // fresh helper (drops the old) ...
_keepalive = ka; // ... then releases the old output
target = tg;
effective_hz = hz;
interval = std::time::Duration::from_secs_f64(1.0 / hz.max(1) as f64);
}
Err(e) => {
tracing::error!(error = %format!("{e:#}"),
"two-process: source-switch rebuild failed — staying on the current source");
}
}
dda = None; // old DDA was on the old target
if secure {
if dda.is_none() {
match open_dda(&target, cur_mode.width, cur_mode.height, effective_hz) {
Ok(p) => dda = Some(p),
Err(e) => {
tracing::error!(error = %format!("{e:#}"),
"two-process: DDA open failed — secure desktop will freeze on last frame");
}
match open_dda(&target, cur_mode.width, cur_mode.height, effective_hz) {
Ok(mut p) => {
p.enc.request_keyframe();
dda = Some(p);
}
Err(e) => {
tracing::error!(error = %format!("{e:#}"),
"two-process: DDA open failed — secure desktop will freeze on last frame");
}
}
if let Some(d) = dda.as_mut() {
d.enc.request_keyframe();
}
next = std::time::Instant::now();
} else {
// Returning to the helper: drain stale buffered AUs (encoded while we ignored it) and
// force a fresh IDR; await_idr then skips the stale deltas until that IDR arrives.
while relay.try_recv().is_ok() {}
relay.request_keyframe();
}
// (normal: the fresh helper's first frame is its opening IDR — await_idr clears on it.)
}
if want_kf {
if secure {