T6 wiring: Trunking in relay hot path - TrunkedForwarder wraps transport with TrunkBatcher - run_participant uses 5ms flush timer when trunking enabled - send_trunk/recv_trunk on QuinnTransport - --trunking flag on relay config - 2 new tests: forwarder batches, auto-flush on full T7 wiring: Mini-frames in encoder/decoder - MediaPacket::encode_compact/decode_compact with MiniFrameContext - CallEncoder sends mini-headers for consecutive frames (full every 50th) - CallDecoder auto-detects full vs mini on receive - mini_frames_enabled in CallConfig (default true) - 3 new tests: encode/decode sequence, periodic full, disabled mode Noise suppression (nnnoiseless/RNNoise) - NoiseSupressor in wzp-codec: pure Rust ML-based noise removal - Processes 960-sample frames as two 480-sample halves - Integrated in CallEncoder before silence detection - noise_suppression in CallConfig (default true) - 4 new tests: creation, processing, SNR improvement, passthrough T1-S4: Adaptive playout delay - AdaptivePlayoutDelay: EMA-based jitter tracking (NetEq-inspired) - Computes target_delay from observed inter-arrival jitter - JitterBuffer::new_adaptive() uses adaptive delay - adaptive_jitter in CallConfig (default true) - 5 new tests: stable, jitter increase, recovery, clamping, estimate 272 tests passing across all crates. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
173 lines
5.7 KiB
Rust
173 lines
5.7 KiB
Rust
//! `QuinnTransport` — implements `MediaTransport` trait from wzp-proto.
|
|
//!
|
|
//! Wraps a `quinn::Connection` and provides unreliable media (DATAGRAM frames)
|
|
//! and reliable signaling (QUIC streams).
|
|
|
|
use async_trait::async_trait;
|
|
use std::sync::Mutex;
|
|
|
|
use wzp_proto::packet::TrunkFrame;
|
|
use wzp_proto::{MediaPacket, MediaTransport, PathQuality, SignalMessage, TransportError};
|
|
|
|
use crate::datagram;
|
|
use crate::path_monitor::PathMonitor;
|
|
use crate::reliable;
|
|
|
|
/// QUIC-based transport implementing the `MediaTransport` trait.
|
|
pub struct QuinnTransport {
|
|
connection: quinn::Connection,
|
|
path_monitor: Mutex<PathMonitor>,
|
|
}
|
|
|
|
impl QuinnTransport {
|
|
/// Create a new transport wrapping an established QUIC connection.
|
|
pub fn new(connection: quinn::Connection) -> Self {
|
|
Self {
|
|
connection,
|
|
path_monitor: Mutex::new(PathMonitor::new()),
|
|
}
|
|
}
|
|
|
|
/// Get a reference to the underlying QUIC connection.
|
|
pub fn connection(&self) -> &quinn::Connection {
|
|
&self.connection
|
|
}
|
|
|
|
/// Get the maximum datagram payload size, if datagrams are supported.
|
|
pub fn max_datagram_size(&self) -> Option<usize> {
|
|
datagram::max_datagram_payload(&self.connection)
|
|
}
|
|
|
|
/// Send an encoded [`TrunkFrame`] as a single QUIC datagram.
|
|
pub fn send_trunk(&self, frame: &TrunkFrame) -> Result<(), TransportError> {
|
|
let data = frame.encode();
|
|
|
|
if let Some(max_size) = self.connection.max_datagram_size() {
|
|
if data.len() > max_size {
|
|
return Err(TransportError::DatagramTooLarge {
|
|
size: data.len(),
|
|
max: max_size,
|
|
});
|
|
}
|
|
}
|
|
|
|
self.connection.send_datagram(data).map_err(|e| {
|
|
TransportError::Internal(format!("send trunk datagram error: {e}"))
|
|
})?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Receive a single QUIC datagram and decode it as a [`TrunkFrame`].
|
|
///
|
|
/// Returns `Ok(None)` on connection close, `Ok(Some(frame))` on success,
|
|
/// or an error on malformed data / transport failure.
|
|
pub async fn recv_trunk(&self) -> Result<Option<TrunkFrame>, TransportError> {
|
|
let data = match self.connection.read_datagram().await {
|
|
Ok(data) => data,
|
|
Err(quinn::ConnectionError::ApplicationClosed(_)) => return Ok(None),
|
|
Err(quinn::ConnectionError::LocallyClosed) => return Ok(None),
|
|
Err(e) => {
|
|
return Err(TransportError::Internal(format!(
|
|
"recv trunk datagram error: {e}"
|
|
)))
|
|
}
|
|
};
|
|
|
|
TrunkFrame::decode(&data)
|
|
.map(Some)
|
|
.ok_or_else(|| TransportError::Internal("malformed trunk frame".into()))
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl MediaTransport for QuinnTransport {
|
|
async fn send_media(&self, packet: &MediaPacket) -> Result<(), TransportError> {
|
|
let data = datagram::serialize_media(packet);
|
|
|
|
// Check MTU
|
|
if let Some(max_size) = self.connection.max_datagram_size() {
|
|
if data.len() > max_size {
|
|
return Err(TransportError::DatagramTooLarge {
|
|
size: data.len(),
|
|
max: max_size,
|
|
});
|
|
}
|
|
}
|
|
|
|
// Record send observation
|
|
{
|
|
let mut monitor = self.path_monitor.lock().unwrap();
|
|
monitor.observe_sent(packet.header.seq, packet.header.timestamp as u64);
|
|
}
|
|
|
|
self.connection.send_datagram(data).map_err(|e| {
|
|
TransportError::Internal(format!("send datagram error: {e}"))
|
|
})?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
async fn recv_media(&self) -> Result<Option<MediaPacket>, TransportError> {
|
|
let data = match self.connection.read_datagram().await {
|
|
Ok(data) => data,
|
|
Err(quinn::ConnectionError::ApplicationClosed(_)) => return Ok(None),
|
|
Err(quinn::ConnectionError::LocallyClosed) => return Ok(None),
|
|
Err(e) => {
|
|
return Err(TransportError::Internal(format!(
|
|
"recv datagram error: {e}"
|
|
)))
|
|
}
|
|
};
|
|
|
|
match datagram::deserialize_media(data) {
|
|
Some(packet) => {
|
|
// Record receive observation
|
|
{
|
|
let mut monitor = self.path_monitor.lock().unwrap();
|
|
monitor.observe_received(
|
|
packet.header.seq,
|
|
packet.header.timestamp as u64,
|
|
);
|
|
}
|
|
Ok(Some(packet))
|
|
}
|
|
None => {
|
|
tracing::warn!("received malformed media datagram");
|
|
Ok(None)
|
|
}
|
|
}
|
|
}
|
|
|
|
async fn send_signal(&self, msg: &SignalMessage) -> Result<(), TransportError> {
|
|
reliable::send_signal(&self.connection, msg).await
|
|
}
|
|
|
|
async fn recv_signal(&self) -> Result<Option<SignalMessage>, TransportError> {
|
|
match self.connection.accept_bi().await {
|
|
Ok((_send, mut recv)) => {
|
|
let msg = reliable::recv_signal(&mut recv).await?;
|
|
Ok(Some(msg))
|
|
}
|
|
Err(quinn::ConnectionError::ApplicationClosed(_)) => Ok(None),
|
|
Err(quinn::ConnectionError::LocallyClosed) => Ok(None),
|
|
Err(e) => Err(TransportError::Internal(format!(
|
|
"accept stream error: {e}"
|
|
))),
|
|
}
|
|
}
|
|
|
|
fn path_quality(&self) -> PathQuality {
|
|
let monitor = self.path_monitor.lock().unwrap();
|
|
monitor.quality()
|
|
}
|
|
|
|
async fn close(&self) -> Result<(), TransportError> {
|
|
self.connection.close(
|
|
quinn::VarInt::from_u32(0),
|
|
b"normal close",
|
|
);
|
|
Ok(())
|
|
}
|
|
}
|