fix: keep the workspace green on macOS after the mic/touch/rich-input batch
The new features were Linux-built only and broke the documented macOS gate (cargo build/test/clippy --workspace) four ways, all fixed following the existing platform-gating conventions: - m3.rs: mic_service_thread split into the Linux worker and a non-Linux stub that drains and drops (sessions still count the datagrams) — opus/PipeWire are Linux-gated deps, same pattern as audio_thread. - punktfunk-client-rs: the new `opus` dependency moved into the Linux target table and --mic-test gated with a warn-and-skip stub (only the synthetic-tone test rig needs the encoder; the mic uplink itself is portable). - gamestream/audio.rs: SAMPLE_RATE import gated to any(linux, test) (the frame_sizing test uses it everywhere, the data plane only on Linux). - tests/c_abi.rs: the harness's macOS link flags gained Security + CoreFoundation — the quic feature now pulls rustls's platform verifier into the staticlib. Also: two clippy match-ref-pats lints in the new rich-input/HID-output decoders (clippy -D warnings is the repo gate), the regenerated punktfunk_core.h committed (the checked-in copy predated the rich-input/HID-output constants — CI fails on drift), and web's inlang cache dir gitignored. cargo build/test/clippy/fmt --workspace: green on macOS, 122 tests passing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -13,6 +13,10 @@ punktfunk-core = { path = "../punktfunk-core", features = ["quic"] }
|
|||||||
quinn = "0.11"
|
quinn = "0.11"
|
||||||
tokio = { version = "1", features = ["rt-multi-thread", "net", "time", "macros"] }
|
tokio = { version = "1", features = ["rt-multi-thread", "net", "time", "macros"] }
|
||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
opus = "0.3"
|
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||||
|
|
||||||
|
# Linux-only: --mic-test's Opus encoder (libopus). The mic UPLINK itself is portable —
|
||||||
|
# only this synthetic-tone test rig needs the encoder.
|
||||||
|
[target.'cfg(target_os = "linux")'.dependencies]
|
||||||
|
opus = "0.3"
|
||||||
|
|||||||
@@ -360,6 +360,11 @@ async fn session(args: Args) -> Result<()> {
|
|||||||
// Mic plane: stream a synthetic 440 Hz tone as the mic uplink (0xCB), Opus-encoded 5 ms
|
// Mic plane: stream a synthetic 440 Hz tone as the mic uplink (0xCB), Opus-encoded 5 ms
|
||||||
// stereo frames — proves client→host mic passthrough end to end without a real microphone
|
// stereo frames — proves client→host mic passthrough end to end without a real microphone
|
||||||
// (the host decodes it into its virtual PipeWire source; record that source to hear the tone).
|
// (the host decodes it into its virtual PipeWire source; record that source to hear the tone).
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
if args.mic_test {
|
||||||
|
tracing::warn!("--mic-test requires Linux (libopus) — skipped");
|
||||||
|
}
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
if args.mic_test {
|
if args.mic_test {
|
||||||
let conn2 = conn.clone();
|
let conn2 = conn.clone();
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
|
|||||||
@@ -690,15 +690,15 @@ impl RichInput {
|
|||||||
if b.first() != Some(&RICH_INPUT_MAGIC) {
|
if b.first() != Some(&RICH_INPUT_MAGIC) {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
match b.get(1)? {
|
match *b.get(1)? {
|
||||||
&RICH_TOUCHPAD if b.len() >= 9 => Some(RichInput::Touchpad {
|
RICH_TOUCHPAD if b.len() >= 9 => Some(RichInput::Touchpad {
|
||||||
pad: b[2],
|
pad: b[2],
|
||||||
finger: b[3],
|
finger: b[3],
|
||||||
active: b[4] != 0,
|
active: b[4] != 0,
|
||||||
x: u16::from_le_bytes([b[5], b[6]]),
|
x: u16::from_le_bytes([b[5], b[6]]),
|
||||||
y: u16::from_le_bytes([b[7], b[8]]),
|
y: u16::from_le_bytes([b[7], b[8]]),
|
||||||
}),
|
}),
|
||||||
&RICH_MOTION if b.len() >= 15 => {
|
RICH_MOTION if b.len() >= 15 => {
|
||||||
let i16at = |o: usize| i16::from_le_bytes([b[o], b[o + 1]]);
|
let i16at = |o: usize| i16::from_le_bytes([b[o], b[o + 1]]);
|
||||||
Some(RichInput::Motion {
|
Some(RichInput::Motion {
|
||||||
pad: b[2],
|
pad: b[2],
|
||||||
@@ -751,18 +751,18 @@ impl HidOutput {
|
|||||||
if b.first() != Some(&HIDOUT_MAGIC) {
|
if b.first() != Some(&HIDOUT_MAGIC) {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
match b.get(1)? {
|
match *b.get(1)? {
|
||||||
&HIDOUT_LED if b.len() >= 6 => Some(HidOutput::Led {
|
HIDOUT_LED if b.len() >= 6 => Some(HidOutput::Led {
|
||||||
pad: b[2],
|
pad: b[2],
|
||||||
r: b[3],
|
r: b[3],
|
||||||
g: b[4],
|
g: b[4],
|
||||||
b: b[5],
|
b: b[5],
|
||||||
}),
|
}),
|
||||||
&HIDOUT_PLAYER_LEDS if b.len() >= 4 => Some(HidOutput::PlayerLeds {
|
HIDOUT_PLAYER_LEDS if b.len() >= 4 => Some(HidOutput::PlayerLeds {
|
||||||
pad: b[2],
|
pad: b[2],
|
||||||
bits: b[3],
|
bits: b[3],
|
||||||
}),
|
}),
|
||||||
&HIDOUT_TRIGGER if b.len() >= 4 => Some(HidOutput::Trigger {
|
HIDOUT_TRIGGER if b.len() >= 4 => Some(HidOutput::Trigger {
|
||||||
pad: b[2],
|
pad: b[2],
|
||||||
which: b[3],
|
which: b[3],
|
||||||
effect: b[4..].to_vec(),
|
effect: b[4..].to_vec(),
|
||||||
|
|||||||
@@ -12,7 +12,16 @@ use std::process::Command;
|
|||||||
/// `rustc --print native-static-libs`.
|
/// `rustc --print native-static-libs`.
|
||||||
fn native_libs() -> &'static [&'static str] {
|
fn native_libs() -> &'static [&'static str] {
|
||||||
if cfg!(target_os = "macos") {
|
if cfg!(target_os = "macos") {
|
||||||
&["-liconv", "-lm"]
|
// The workspace build unifies features into the staticlib, and `quic` pulls
|
||||||
|
// rustls's platform verifier → Security/CoreFoundation.
|
||||||
|
&[
|
||||||
|
"-liconv",
|
||||||
|
"-lm",
|
||||||
|
"-framework",
|
||||||
|
"Security",
|
||||||
|
"-framework",
|
||||||
|
"CoreFoundation",
|
||||||
|
]
|
||||||
} else if cfg!(target_os = "linux") {
|
} else if cfg!(target_os = "linux") {
|
||||||
&["-lgcc_s", "-lutil", "-lrt", "-lpthread", "-lm", "-ldl"]
|
&["-lgcc_s", "-lutil", "-lrt", "-lpthread", "-lm", "-ldl"]
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
//! data packets are consumed immediately and missing parity only costs loss recovery — so
|
//! data packets are consumed immediately and missing parity only costs loss recovery — so
|
||||||
//! the validated stereo path stays byte-identical (data packets only, exactly as before).
|
//! the validated stereo path stays byte-identical (data packets only, exactly as before).
|
||||||
|
|
||||||
|
#[cfg(any(target_os = "linux", test))]
|
||||||
use crate::audio::SAMPLE_RATE;
|
use crate::audio::SAMPLE_RATE;
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
use {
|
use {
|
||||||
|
|||||||
@@ -806,10 +806,22 @@ impl MicService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Stub — mic passthrough needs Linux (PipeWire source + libopus); non-Linux dev builds
|
||||||
|
/// drain and drop the frames (sessions still count the datagrams), same as when the
|
||||||
|
/// source fails to open.
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
fn mic_service_thread(rx: std::sync::mpsc::Receiver<Vec<u8>>) {
|
||||||
|
tracing::warn!(
|
||||||
|
"punktfunk/1 mic passthrough requires Linux (PipeWire + libopus) — frames dropped"
|
||||||
|
);
|
||||||
|
for _ in rx {}
|
||||||
|
}
|
||||||
|
|
||||||
/// The host-lifetime mic worker: lazily open the virtual mic + decoder, then Opus-decode each
|
/// The host-lifetime mic worker: lazily open the virtual mic + decoder, then Opus-decode each
|
||||||
/// forwarded frame and push the PCM into the source. Reopen (after [`INJECTOR_REOPEN_BACKOFF`])
|
/// forwarded frame and push the PCM into the source. Reopen (after [`INJECTOR_REOPEN_BACKOFF`])
|
||||||
/// on open failure or a decode error. Exits when every session sender and the service's own
|
/// on open failure or a decode error. Exits when every session sender and the service's own
|
||||||
/// sender drop (host shutdown), tearing the PipeWire source down.
|
/// sender drop (host shutdown), tearing the PipeWire source down.
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
fn mic_service_thread(rx: std::sync::mpsc::Receiver<Vec<u8>>) {
|
fn mic_service_thread(rx: std::sync::mpsc::Receiver<Vec<u8>>) {
|
||||||
let mut mic: Option<Box<dyn crate::audio::VirtualMic>> = None;
|
let mut mic: Option<Box<dyn crate::audio::VirtualMic>> = None;
|
||||||
let mut decoder: Option<opus::Decoder> = None;
|
let mut decoder: Option<opus::Decoder> = None;
|
||||||
|
|||||||
@@ -137,7 +137,8 @@
|
|||||||
// Datagram wire tags. Video rides UDP; everything low-rate rides QUIC datagrams,
|
// Datagram wire tags. Video rides UDP; everything low-rate rides QUIC datagrams,
|
||||||
// demultiplexed by the first byte: input = [`crate::input::INPUT_MAGIC`] (0xC8, client→host),
|
// demultiplexed by the first byte: input = [`crate::input::INPUT_MAGIC`] (0xC8, client→host),
|
||||||
// audio = [`AUDIO_MAGIC`] (0xC9, host→client), rumble = [`RUMBLE_MAGIC`] (0xCA, host→client),
|
// audio = [`AUDIO_MAGIC`] (0xC9, host→client), rumble = [`RUMBLE_MAGIC`] (0xCA, host→client),
|
||||||
// mic = [`MIC_MAGIC`] (0xCB, client→host).
|
// mic = [`MIC_MAGIC`] (0xCB, client→host), rich-input = [`RICH_INPUT_MAGIC`] (0xCC, client→host),
|
||||||
|
// HID-output = [`HIDOUT_MAGIC`] (0xCD, host→client).
|
||||||
#define PUNKTFUNK_AUDIO_MAGIC 201
|
#define PUNKTFUNK_AUDIO_MAGIC 201
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -151,6 +152,20 @@
|
|||||||
#define MIC_MAGIC 203
|
#define MIC_MAGIC 203
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(PUNKTFUNK_FEATURE_QUIC)
|
||||||
|
// Rich client→host input: events too big for the fixed 18-byte [`InputEvent`]
|
||||||
|
// (crate::input::InputEvent) — the DualSense touchpad and motion sensors. Variable-length,
|
||||||
|
// kind-tagged (see [`RichInput`]).
|
||||||
|
#define RICH_INPUT_MAGIC 204
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(PUNKTFUNK_FEATURE_QUIC)
|
||||||
|
// HID output, host → client: DualSense feedback a game wrote to the host's virtual controller
|
||||||
|
// (lightbar, player LEDs, adaptive triggers) — the rich analog of [`RUMBLE_MAGIC`]. See
|
||||||
|
// [`HidOutput`].
|
||||||
|
#define HIDOUT_MAGIC 205
|
||||||
|
#endif
|
||||||
|
|
||||||
// Stable C ABI status codes. `Ok` is 0; all errors are negative so callers can
|
// Stable C ABI status codes. `Ok` is 0; all errors are negative so callers can
|
||||||
// test `rc < 0`. Do not renumber existing variants — only append.
|
// test `rc < 0`. Do not renumber existing variants — only append.
|
||||||
enum PunktfunkStatus
|
enum PunktfunkStatus
|
||||||
|
|||||||
@@ -12,3 +12,6 @@ src/paraglide
|
|||||||
|
|
||||||
# local env (PUNKTFUNK_UI_PASSWORD etc.)
|
# local env (PUNKTFUNK_UI_PASSWORD etc.)
|
||||||
.env
|
.env
|
||||||
|
|
||||||
|
# Paraglide/inlang machine-local cache:
|
||||||
|
project.inlang/cache
|
||||||
|
|||||||
Reference in New Issue
Block a user