9c8fa9340c
apple / swift (push) Failing after 40s
audit / cargo-audit (push) Failing after 1m12s
windows-msix / package (push) Successful in 1m37s
windows / build (push) Successful in 1m14s
android / android (push) Successful in 4m48s
ci / web (push) Successful in 27s
ci / rust (push) Successful in 4m21s
ci / docs-site (push) Successful in 31s
ci / bench (push) Successful in 4m39s
decky / build-publish (push) Successful in 11s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 5s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 4s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 4s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 4s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 19s
deb / build-publish (push) Successful in 6m3s
flatpak / build-publish (push) Successful in 4m13s
rpm / build-publish (bazzite, punktfunk-fedora-rpm) (push) Successful in 8m15s
rpm / build-publish (fedora-44, punktfunk-fedora44-rpm) (push) Successful in 8m16s
docker / deploy-docs (push) Successful in 18s
Two bodies of work in one commit (the rename moved files the fixes also touched). Naming/structure cleanup (pre-launch): - Host modules m3.rs->punktfunk1.rs, m0.rs->spike.rs; CLI m3-host->punktfunk1-host, m0->spike; bare `punktfunk-host` now prints help. Types M3Options/M3Source-> Punktfunk1Options/Punktfunk1Source. - Clients consolidated out of crates/ into clients/: punktfunk-client-rs-> clients/probe (crate punktfunk-probe), client-linux->clients/linux, client-windows->clients/windows, punktfunk-android->clients/android/native (crate punktfunk-client-android; kept [lib] name=punktfunk_android so the JNI contract is unchanged). crates/ now holds only core + host. - Milestone codes M0-M4 purged from code/CLI/CLAUDE.md/README/docs/docs-site, kept only in docs/implementation-plan.md. docs/m2-plan.md-> docs/gamestream-host-plan.md. CI/gradle/flatpak paths updated. Client loss-recovery (video froze and never recovered after a brief drop): - Export punktfunk_connection_frames_dropped through the C ABI (the core already tracked it for the client keyframe-recovery loop; it was never reachable from the ABI clients). Regenerated punktfunk_core.h. - Apple (StreamPump + Stage2Pipeline) and Android (decode.rs) now poll frames_dropped and request a keyframe when it climbs -- the same loss-driven recovery Linux/Windows already had. Under infinite GOP the decoder silently conceals reference-missing frames, so the decode-error trigger rarely fires. Apple rumble robustness (worked then went spotty -- DualSense + Xbox): - Add CHHapticEngine stopped/reset handlers (rebuild on app background / audio interruption / server reset) and drop the permanent `broken` latch on a transient drive failure; latch only when the controller truly has no haptics. - Surface swallowed SDL set_rumble errors on Linux/Windows + diagnostic logging. Verified: cargo build/clippy/fmt --workspace, C-ABI harness, header drift. Not runnable on this box (verify in CI): Gitea workflows, gradle/Android, flatpak, Swift/decky. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
94 lines
4.3 KiB
Rust
94 lines
4.3 KiB
Rust
//! Desktop audio capture for the GameStream audio stream. On Linux: a PipeWire stream that
|
|
//! records the default sink's monitor (i.e. everything playing out of the system), delivered
|
|
//! as interleaved `f32` PCM at 48 kHz in the requested channel count (stereo, 5.1 or 7.1 —
|
|
//! GameStream surround order FL FR FC LFE RL RR [SL SR]). The audio data plane
|
|
//! (`gamestream::audio`) reframes this into fixed Opus frames, encodes, and sends it.
|
|
|
|
use anyhow::Result;
|
|
|
|
/// Opus/GameStream audio is 48 kHz.
|
|
pub const SAMPLE_RATE: u32 = 48_000;
|
|
/// Stereo channel count — the default and the punktfunk/1 audio plane's fixed layout.
|
|
pub const CHANNELS: usize = 2;
|
|
|
|
/// Produces interleaved `f32` PCM at [`SAMPLE_RATE`] in the channel count it was opened
|
|
/// with. Lives on its own thread; never blocks the capture loop (drops if the consumer
|
|
/// falls behind).
|
|
pub trait AudioCapturer: Send {
|
|
/// Block until the next chunk of interleaved samples is available (variable size). The
|
|
/// caller reframes into fixed Opus frames. An **empty** chunk means "no samples right now"
|
|
/// (e.g. a quiet sink that hit the internal idle timeout) — NOT an error: the caller keeps the
|
|
/// capturer. `Err` is reserved for a genuinely dead capture thread, signalling the caller to
|
|
/// reopen.
|
|
fn next_chunk(&mut self) -> Result<Vec<f32>>;
|
|
|
|
/// The interleaved channel count this capturer delivers (what it was opened with).
|
|
fn channels(&self) -> u32 {
|
|
CHANNELS as u32
|
|
}
|
|
|
|
/// Discard any buffered chunks (called when a persistent capturer is reused for a new
|
|
/// stream, so the client doesn't hear stale audio captured while idle). Default: no-op.
|
|
fn drain(&mut self) {}
|
|
}
|
|
|
|
/// Open a live capturer for the default sink monitor (system output) via PipeWire, asking
|
|
/// for `channels` interleaved channels. If the sink has fewer channels than requested,
|
|
/// PipeWire's channel-mixer fills the missing positions with silence (zero upmix).
|
|
#[cfg(target_os = "linux")]
|
|
pub fn open_audio_capture(channels: u32) -> Result<Box<dyn AudioCapturer>> {
|
|
linux::PwAudioCapturer::open(channels).map(|c| Box::new(c) as Box<dyn AudioCapturer>)
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
pub fn open_audio_capture(channels: u32) -> Result<Box<dyn AudioCapturer>> {
|
|
wasapi_cap::WasapiLoopbackCapturer::open(channels)
|
|
.map(|c| Box::new(c) as Box<dyn AudioCapturer>)
|
|
}
|
|
|
|
#[cfg(not(any(target_os = "linux", target_os = "windows")))]
|
|
pub fn open_audio_capture(_channels: u32) -> Result<Box<dyn AudioCapturer>> {
|
|
anyhow::bail!("audio capture requires Linux + PipeWire or Windows + WASAPI")
|
|
}
|
|
|
|
/// The inverse of [`AudioCapturer`]: a virtual microphone the host *produces*. It registers a
|
|
/// PipeWire `Audio/Source` node that host apps can record from; the host [`push`](Self::push)es
|
|
/// decoded client-mic PCM (interleaved `f32` at [`SAMPLE_RATE`]) into it, and PipeWire delivers
|
|
/// it to whichever app records the source — silence when no input is flowing. This is how the
|
|
/// client's microphone reaches host applications (mic passthrough).
|
|
pub trait VirtualMic: Send {
|
|
/// Push one chunk of interleaved `f32` PCM. Non-blocking — drops if PipeWire is behind
|
|
/// (mic audio is lossy/real-time; a stale chunk is worse than a dropped one).
|
|
fn push(&self, pcm: &[f32]);
|
|
|
|
/// The interleaved channel count the source was opened with.
|
|
fn channels(&self) -> u32 {
|
|
CHANNELS as u32
|
|
}
|
|
}
|
|
|
|
/// Open a virtual microphone with `channels` interleaved channels (1 or 2). Linux: a PipeWire
|
|
/// `Audio/Source`. Windows: writes into an existing virtual audio device's render endpoint (whose
|
|
/// capture endpoint apps see as a mic) — see [`wasapi_mic`].
|
|
#[cfg(target_os = "linux")]
|
|
pub fn open_virtual_mic(channels: u32) -> Result<Box<dyn VirtualMic>> {
|
|
linux::PwMicSource::open(channels).map(|m| Box::new(m) as Box<dyn VirtualMic>)
|
|
}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
pub fn open_virtual_mic(channels: u32) -> Result<Box<dyn VirtualMic>> {
|
|
wasapi_mic::WasapiVirtualMic::open(channels).map(|m| Box::new(m) as Box<dyn VirtualMic>)
|
|
}
|
|
|
|
#[cfg(not(any(target_os = "linux", target_os = "windows")))]
|
|
pub fn open_virtual_mic(_channels: u32) -> Result<Box<dyn VirtualMic>> {
|
|
anyhow::bail!("virtual mic requires Linux + PipeWire or Windows + a virtual audio device")
|
|
}
|
|
|
|
#[cfg(target_os = "linux")]
|
|
mod linux;
|
|
#[cfg(target_os = "windows")]
|
|
mod wasapi_cap;
|
|
#[cfg(target_os = "windows")]
|
|
mod wasapi_mic;
|