bd4e15b68d
- native: the 756-line session.rs becomes session/{mod,connect,input,planes}.rs
around a SessionHandle (connect lifecycle + trust, input plane shims, plane
start/stop + stats drain).
- Decode-stats sampling is HUD-gated (nativeSetVideoStatsEnabled): with the
overlay hidden the decode thread skips the per-AU clock read + lock; enabling
resets the measurement window.
- audio: the AAudio open path is a per-sharing-mode try_open closure — the
realtime callback state (ring, prime, free-list) is rebuilt per attempt, so a
failed exclusive-mode try can't leak state into the shared-mode retry.
- Kotlin: ConnectScreen/StreamScreen slimmed by extracting ConnectDialogs,
StatsOverlay and TouchInput.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
249 lines
11 KiB
Rust
249 lines
11 KiB
Rust
//! Android microphone uplink (android-only): capture mic PCM via AAudio (LowLatency **input**),
|
|
//! Opus-encode 20 ms stereo frames, and push them to the host over the connector's mic plane
|
|
//! (`send_mic` → 0xCB datagram). The mirror of [`crate::audio`] in reverse: AAudio's realtime input
|
|
//! callback hands captured interleaved f32 to a channel; a worker thread we own does the Opus
|
|
//! encode + send (encoding is too heavy for the realtime callback, exactly as decode is on the
|
|
//! playback side). Like the playback path, the realtime callback is allocation-free: captured
|
|
//! bursts are copied into pre-allocated buffers from a recycle free-list (pool empty = drop the
|
|
//! chunk, never allocate on the capture thread). Format matches the host decoder + the Linux
|
|
//! client: 48 kHz **stereo**, 20 ms, Opus VOIP.
|
|
|
|
use ndk::audio::{
|
|
AudioCallbackResult, AudioDirection, AudioFormat, AudioPerformanceMode, AudioSharingMode,
|
|
AudioStream, AudioStreamBuilder,
|
|
};
|
|
use punktfunk_core::client::NativeClient;
|
|
use std::collections::VecDeque;
|
|
use std::ffi::c_void;
|
|
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
|
use std::sync::mpsc::{sync_channel, Receiver, RecvTimeoutError, SyncSender, TrySendError};
|
|
use std::sync::Arc;
|
|
use std::time::{Duration, SystemTime, UNIX_EPOCH};
|
|
|
|
const CHANNELS: usize = 2;
|
|
const SAMPLE_RATE: i32 = 48_000;
|
|
/// 20 ms per channel @ 48 kHz — the Linux client's frame; the host accepts ≤ 120 ms.
|
|
const FRAME_SAMPLES: usize = 960;
|
|
/// Captured-chunk hand-off depth (each ~ one burst); drops on overflow (best-effort uplink).
|
|
const RING_CHUNKS: usize = 64;
|
|
/// Free-list buffer capacity, in interleaved f32 samples: comfortably above a LowLatency input
|
|
/// burst (typically ≤ ~480 frames). A device with larger bursts costs each buffer a one-time grow
|
|
/// on the capture thread, after which the steady state is allocation-free again.
|
|
const CHUNK_CAP_SAMPLES: usize = 1920; // 20 ms stereo
|
|
/// Opus VOIP target bitrate (speech; tunable).
|
|
const MIC_BITRATE: i32 = 64_000;
|
|
|
|
/// Owned by [`crate::session::SessionHandle`]: the live AAudio input stream + the encode thread.
|
|
pub struct MicCapture {
|
|
_stream: AudioStream, // dropping it stops + closes the AAudio input stream
|
|
shutdown: Arc<AtomicBool>,
|
|
join: Option<std::thread::JoinHandle<()>>,
|
|
}
|
|
|
|
impl MicCapture {
|
|
/// Open AAudio (LowLatency, 48 kHz/stereo/f32) for **input** with a realtime callback that
|
|
/// forwards captured PCM to a channel, then spawn the Opus encode + uplink thread. `None` on
|
|
/// failure (the caller leaves the rest of the session streaming).
|
|
pub fn start(client: Arc<NativeClient>) -> Option<MicCapture> {
|
|
let captured = Arc::new(AtomicU64::new(0));
|
|
// Chunks discarded on the capture thread (free-list empty / encoder lagging); logged
|
|
// throttled from the encode worker.
|
|
let dropped = Arc::new(AtomicU64::new(0));
|
|
|
|
// One open attempt at a given sharing mode (same pattern as [`crate::audio`]: `open_stream`
|
|
// consumes the builder AND the callback, so each try rebuilds the channels it captures).
|
|
let try_open = |sharing: AudioSharingMode| -> ndk::audio::Result<(
|
|
AudioStream,
|
|
Receiver<Vec<f32>>,
|
|
SyncSender<Vec<f32>>,
|
|
)> {
|
|
let (tx, rx) = sync_channel::<Vec<f32>>(RING_CHUNKS);
|
|
// Recycle free-list, mirroring the playback path: the realtime capture callback must
|
|
// not touch the allocator (Android's Scudo has unbounded malloc/free tail latency — an
|
|
// allocation here is a missed burst), so it pops a pre-allocated buffer, copies the
|
|
// burst in and sends it; the encode worker returns drained buffers. Pool empty = DROP
|
|
// the chunk (counted) rather than allocate.
|
|
let (free_tx, free_rx) = sync_channel::<Vec<f32>>(RING_CHUNKS);
|
|
for _ in 0..RING_CHUNKS {
|
|
let _ = free_tx.try_send(Vec::with_capacity(CHUNK_CAP_SAMPLES));
|
|
}
|
|
let cb_captured = captured.clone();
|
|
let cb_dropped = dropped.clone();
|
|
let cb_free_tx = free_tx.clone(); // returns the buffer when the data channel is full
|
|
|
|
let callback = move |_s: &AudioStream, data: *mut c_void, num_frames: i32| {
|
|
let n = num_frames as usize * CHANNELS;
|
|
// SAFETY: for an input stream AAudio provides `num_frames * channel_count` captured
|
|
// F32 samples at `data` (read-only for us).
|
|
let inp = unsafe { std::slice::from_raw_parts(data as *const f32, n) };
|
|
cb_captured.fetch_add(num_frames as u64, Ordering::Relaxed);
|
|
match free_rx.try_recv() {
|
|
Ok(mut buf) => {
|
|
buf.clear();
|
|
buf.extend_from_slice(inp); // retained capacity — no realloc past the first
|
|
match tx.try_send(buf) {
|
|
Ok(()) => {}
|
|
Err(TrySendError::Full(buf)) => {
|
|
// Encoder lagging: drop the chunk, hand the buffer straight back.
|
|
let _ = cb_free_tx.try_send(buf);
|
|
cb_dropped.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
Err(TrySendError::Disconnected(_)) => return AudioCallbackResult::Stop,
|
|
}
|
|
}
|
|
// Pool empty (every buffer in flight): drop, never allocate on this thread.
|
|
Err(_) => {
|
|
cb_dropped.fetch_add(1, Ordering::Relaxed);
|
|
}
|
|
}
|
|
AudioCallbackResult::Continue
|
|
};
|
|
|
|
let stream = AudioStreamBuilder::new()?
|
|
.direction(AudioDirection::Input)
|
|
.sample_rate(SAMPLE_RATE)
|
|
.channel_count(CHANNELS as i32)
|
|
.format(AudioFormat::PCM_Float)
|
|
.performance_mode(AudioPerformanceMode::LowLatency)
|
|
.sharing_mode(sharing)
|
|
.data_callback(Box::new(callback))
|
|
.error_callback(Box::new(|_s, e| {
|
|
log::warn!("mic: AAudio error (device reroute/disconnect?): {e:?}");
|
|
}))
|
|
.open_stream()?;
|
|
Ok((stream, rx, free_tx))
|
|
};
|
|
|
|
// Exclusive first — MMAP-exclusive is AAudio's lowest-latency path — falling back to Shared
|
|
// when the device refuses (no MMAP, mic claimed, …). The started-log below prints the mode
|
|
// the device actually GRANTED (`share=`).
|
|
let (stream, rx, free_tx) = match try_open(AudioSharingMode::Exclusive) {
|
|
Ok(opened) => opened,
|
|
Err(e) => {
|
|
log::info!("mic: Exclusive open failed ({e}) — retrying Shared");
|
|
match try_open(AudioSharingMode::Shared) {
|
|
Ok(opened) => opened,
|
|
Err(e) => {
|
|
log::error!("mic: open_stream (RECORD_AUDIO granted?): {e}");
|
|
return None;
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
if let Err(e) = stream.request_start() {
|
|
log::error!("mic: request_start: {e}");
|
|
return None;
|
|
}
|
|
log::info!(
|
|
"mic: AAudio input started rate={} ch={} fmt={:?} share={:?}",
|
|
stream.sample_rate(),
|
|
stream.channel_count(),
|
|
stream.format(),
|
|
stream.sharing_mode(),
|
|
);
|
|
|
|
let shutdown = Arc::new(AtomicBool::new(false));
|
|
let sd = shutdown.clone();
|
|
let join = std::thread::Builder::new()
|
|
.name("pf-mic".into())
|
|
.spawn(move || encode_loop(client, rx, free_tx, sd, captured, dropped))
|
|
.ok();
|
|
|
|
Some(MicCapture {
|
|
_stream: stream,
|
|
shutdown,
|
|
join,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl Drop for MicCapture {
|
|
fn drop(&mut self) {
|
|
self.shutdown.store(true, Ordering::SeqCst);
|
|
if let Some(j) = self.join.take() {
|
|
let _ = j.join();
|
|
}
|
|
// `_stream` drops here → AAudio request_stop + close.
|
|
}
|
|
}
|
|
|
|
/// Consumer: drain captured f32 → accumulate → Opus `encode_float` 20 ms stereo frames → `send_mic`.
|
|
/// Drained chunk buffers go back to the callback's free-list; the encode scratch is reused across
|
|
/// frames (only the packet Vec handed to `send_mic` is allocated per frame — it's sent away owned).
|
|
fn encode_loop(
|
|
client: Arc<NativeClient>,
|
|
rx: Receiver<Vec<f32>>,
|
|
free_tx: SyncSender<Vec<f32>>,
|
|
shutdown: Arc<AtomicBool>,
|
|
captured: Arc<AtomicU64>,
|
|
dropped: Arc<AtomicU64>,
|
|
) {
|
|
let mut enc = match opus::Encoder::new(
|
|
SAMPLE_RATE as u32,
|
|
opus::Channels::Stereo,
|
|
opus::Application::Voip,
|
|
) {
|
|
Ok(e) => e,
|
|
Err(e) => {
|
|
log::error!("mic: opus encoder init: {e} — mic disabled");
|
|
return;
|
|
}
|
|
};
|
|
let _ = enc.set_bitrate(opus::Bitrate::Bits(MIC_BITRATE));
|
|
|
|
let frame = FRAME_SAMPLES * CHANNELS;
|
|
let mut ring: VecDeque<f32> = VecDeque::with_capacity(frame * 4);
|
|
let mut pcm = vec![0f32; frame]; // reusable encode scratch (one 20 ms frame)
|
|
let mut out = vec![0u8; 4000]; // max Opus packet for a 20 ms frame fits easily
|
|
let mut seq: u32 = 0;
|
|
let mut sent: u64 = 0;
|
|
let mut peak = 0f32; // loudest |sample| since the last log — tells speech from silence
|
|
|
|
while !shutdown.load(Ordering::Relaxed) {
|
|
match rx.recv_timeout(Duration::from_millis(100)) {
|
|
Ok(mut chunk) => {
|
|
// `drain(..)` keeps the Vec's capacity; hand the emptied buffer back to the
|
|
// callback's free-list (dropped only if the pool is momentarily full).
|
|
ring.extend(chunk.drain(..));
|
|
let _ = free_tx.try_send(chunk);
|
|
}
|
|
Err(RecvTimeoutError::Timeout) => continue, // wake to re-check shutdown
|
|
Err(RecvTimeoutError::Disconnected) => break,
|
|
}
|
|
while ring.len() >= frame {
|
|
for (dst, src) in pcm.iter_mut().zip(ring.drain(..frame)) {
|
|
*dst = src;
|
|
}
|
|
for &s in &pcm {
|
|
peak = peak.max(s.abs());
|
|
}
|
|
match enc.encode_float(&pcm, &mut out) {
|
|
Ok(len) => {
|
|
let pts = SystemTime::now()
|
|
.duration_since(UNIX_EPOCH)
|
|
.map(|d| d.as_nanos() as u64)
|
|
.unwrap_or(0);
|
|
let _ = client.send_mic(seq, pts, out[..len].to_vec());
|
|
seq = seq.wrapping_add(1);
|
|
sent += 1;
|
|
if sent % 250 == 0 {
|
|
log::info!(
|
|
"mic: sent={sent} captured_frames={} dropped_chunks={} peak={peak:.3}",
|
|
captured.load(Ordering::Relaxed),
|
|
dropped.load(Ordering::Relaxed),
|
|
);
|
|
peak = 0.0;
|
|
}
|
|
}
|
|
Err(e) => log::debug!("mic: opus encode: {e}"),
|
|
}
|
|
}
|
|
}
|
|
log::info!(
|
|
"mic: stopped (sent={sent} captured_frames={} dropped_chunks={})",
|
|
captured.load(Ordering::Relaxed),
|
|
dropped.load(Ordering::Relaxed),
|
|
);
|
|
}
|