278a6330de
A stock Moonlight client now gets video + full input + AUDIO from the from-scratch GameStream host (verified live end-to-end on a macOS client). Audio (audio.rs, audio/linux.rs, gamestream/audio.rs): - Capture the default PipeWire sink's monitor (system output) as interleaved f32 stereo @ 48kHz via stream.capture.sink, on its own thread. - Opus-encode 5ms/240-sample stereo frames (RESTRICTED_LOWDELAY, CBR) and send as GameStream RTP audio: 12-byte BE RTP_PACKET (packetType 97, seq+1/pkt, timestamp += packetDuration, ssrc 0) on UDP 48000, after learning the client endpoint from its port-learning ping. - Encrypt the Opus payload with AES-128-CBC (PKCS7), key = launch rikey, IV = BE32(rikeyid + seq) in [0..4]. Like the control stream, modern Moonlight always decrypts audio regardless of the negotiated flags — plaintext makes it log "Failed to decrypt audio packet" and play silence (diagnosed from the client log). RTP header stays in the clear. Scheme cross-checked against Sunshine stream.cpp/crypto.cpp + moonlight AudioStream.c. - Pace each frame to its 5ms slot (PipeWire delivers ~1024-frame buffers) to avoid bursts the client's jitter buffer hears as glitches. LUMEN_AUDIO_GAIN applies optional linear gain for quiet sources. - DESCRIBE SDP advertises the stereo Opus config (a=fmtp:97 surround-params). Video (stream.rs): pace at a steady ≤60fps, re-encoding the last captured frame when the compositor produces none. wlroots only emits on damage, so a static or slow-updating desktop previously starved the client into a "network too slow" abort; an unchanged frame costs a near-empty P-frame. Adds a non-blocking Capturer::try_latest (portal drains to the freshest queued frame). Misc: serialize pipewire init across the video + audio capture threads (pwinit.rs, std::sync::Once) to avoid a concurrent pw_init race. Deps: opus, cbc; libopus-dev in bootstrap-ubuntu.sh. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
144 lines
5.5 KiB
Rust
144 lines
5.5 KiB
Rust
//! The video data plane: on RTSP PLAY, learn the client's UDP endpoint (it pings the video
|
|
//! port), then run capture → NVENC encode → [`VideoPacketizer`] → UDP send. The source is
|
|
//! either real portal desktop capture (`LUMEN_VIDEO_SOURCE=portal`, the M0 PipeWire path) or
|
|
//! a synthetic test pattern (default). Runs on its own native thread.
|
|
|
|
use super::video::{FrameType, VideoPacketizer};
|
|
use super::VIDEO_PORT;
|
|
use crate::capture::{self, Capturer, FastSyntheticCapturer};
|
|
use crate::encode::{self, Codec};
|
|
use anyhow::{Context, Result};
|
|
use std::net::UdpSocket;
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
use std::sync::Arc;
|
|
use std::time::{Duration, Instant};
|
|
|
|
/// Negotiated video parameters from the RTSP ANNOUNCE.
|
|
#[derive(Clone, Copy, Debug)]
|
|
pub struct StreamConfig {
|
|
pub width: u32,
|
|
pub height: u32,
|
|
pub fps: u32,
|
|
pub packet_size: usize,
|
|
pub bitrate_kbps: u32,
|
|
pub codec: Codec,
|
|
}
|
|
|
|
/// Spawn the video stream thread (idempotent via `running`). Stops when `running` clears.
|
|
pub fn start(cfg: StreamConfig, running: Arc<AtomicBool>) {
|
|
let _ = std::thread::Builder::new()
|
|
.name("lumen-video".into())
|
|
.spawn(move || {
|
|
tracing::info!(?cfg, "video stream starting");
|
|
if let Err(e) = run(cfg, &running) {
|
|
tracing::error!(error = %format!("{e:#}"), "video stream failed");
|
|
}
|
|
running.store(false, Ordering::SeqCst);
|
|
tracing::info!("video stream stopped");
|
|
});
|
|
}
|
|
|
|
fn run(cfg: StreamConfig, running: &AtomicBool) -> Result<()> {
|
|
let sock = UdpSocket::bind(("0.0.0.0", VIDEO_PORT)).context("bind video UDP")?;
|
|
// The client pings the video port so we learn where to send; it re-pings until video
|
|
// flows, so a missed early ping is fine.
|
|
sock.set_read_timeout(Some(Duration::from_secs(10)))?;
|
|
tracing::info!(
|
|
port = VIDEO_PORT,
|
|
"video: awaiting client ping to learn endpoint"
|
|
);
|
|
let mut probe = [0u8; 256];
|
|
let (_, client) = sock
|
|
.recv_from(&mut probe)
|
|
.context("video: no client ping within 10s")?;
|
|
sock.connect(client)
|
|
.context("connect client video endpoint")?;
|
|
tracing::info!(%client, "video: client endpoint learned");
|
|
|
|
let use_portal = std::env::var("LUMEN_VIDEO_SOURCE").is_ok_and(|v| v == "portal");
|
|
let mut capturer: Box<dyn Capturer> = if use_portal {
|
|
tracing::info!("video source: portal desktop capture");
|
|
capture::open_portal_monitor().context("open portal capturer")?
|
|
} else {
|
|
tracing::info!("video source: synthetic test pattern");
|
|
Box::new(FastSyntheticCapturer::new(cfg.width, cfg.height))
|
|
};
|
|
|
|
// The first frame establishes the authoritative size/format for the encoder.
|
|
let mut frame = capturer.next_frame().context("capture first frame")?;
|
|
if frame.width != cfg.width || frame.height != cfg.height {
|
|
tracing::warn!(
|
|
captured = ?(frame.width, frame.height),
|
|
negotiated = ?(cfg.width, cfg.height),
|
|
"captured size != negotiated size — Moonlight expects the negotiated size; resize the output"
|
|
);
|
|
}
|
|
let mut enc = encode::open_video(
|
|
cfg.codec,
|
|
frame.format,
|
|
frame.width,
|
|
frame.height,
|
|
cfg.fps,
|
|
cfg.bitrate_kbps as u64 * 1000,
|
|
)
|
|
.context("open NVENC for stream")?;
|
|
let mut pk = VideoPacketizer::new(cfg.packet_size);
|
|
|
|
// Pace at a steady rate (capped at 60fps), re-encoding the last captured frame when the
|
|
// compositor produced no new one. wlroots only emits frames on damage, so a static or
|
|
// slow-updating desktop would otherwise starve the client into a "network too slow" abort.
|
|
// Re-encoding an unchanged frame is cheap — NVENC emits a near-empty P-frame.
|
|
let target_fps = cfg.fps.clamp(1, 60);
|
|
let frame_interval = Duration::from_secs_f64(1.0 / target_fps as f64);
|
|
let mut sent_pkts: u64 = 0;
|
|
let mut fps_count: u32 = 0;
|
|
let mut fps_t = Instant::now();
|
|
let stream_start = Instant::now();
|
|
|
|
while running.load(Ordering::SeqCst) {
|
|
let tick = Instant::now();
|
|
// Advance to the freshest captured frame if one arrived; otherwise reuse the last.
|
|
if let Some(f) = capturer.try_latest().context("capture frame")? {
|
|
frame = f;
|
|
}
|
|
enc.submit(&frame).context("encoder submit")?;
|
|
|
|
// 90 kHz RTP timestamp from wall-clock, so a variable capture rate stays correct.
|
|
let ts = (stream_start.elapsed().as_secs_f64() * 90_000.0) as u32;
|
|
let mut client_gone = false;
|
|
while let Some(au) = enc.poll().context("encoder poll")? {
|
|
let ft = if au.keyframe {
|
|
FrameType::Idr
|
|
} else {
|
|
FrameType::P
|
|
};
|
|
for pkt in pk.packetize(&au.data, ft, ts) {
|
|
if sock.send(&pkt).is_err() {
|
|
client_gone = true;
|
|
break;
|
|
}
|
|
sent_pkts += 1;
|
|
}
|
|
if client_gone {
|
|
break;
|
|
}
|
|
}
|
|
if client_gone {
|
|
tracing::info!(sent_pkts, "video: client unreachable — stopping stream");
|
|
break;
|
|
}
|
|
|
|
fps_count += 1;
|
|
if fps_t.elapsed() >= Duration::from_secs(1) {
|
|
tracing::info!(fps = fps_count, sent_pkts, "video: streaming");
|
|
fps_count = 0;
|
|
fps_t = Instant::now();
|
|
}
|
|
let elapsed = tick.elapsed();
|
|
if elapsed < frame_interval {
|
|
std::thread::sleep(frame_interval - elapsed);
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|