1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
//! Media buffer implementation
//!
//! This file contains the implementation of the MediaBuffer trait.
use std::collections::VecDeque;
use std::sync::Arc;
use std::time::{Duration, Instant};
use tokio::sync::Notify;
use tokio::sync::{Mutex, RwLock};
use crate::api::common::buffer::{BufferStats, MediaBuffer, MediaBufferConfig};
use crate::api::common::error::BufferError;
use crate::api::common::frame::MediaFrame;
use crate::api::common::frame::MediaFrameType;
use crate::buffer::jitter::AdaptiveJitterBuffer;
use crate::buffer::transmit::TransmitBuffer;
/// Default implementation of MediaBuffer
#[allow(dead_code)] // retained (liveness/Drop hold or reserved); not read
pub struct DefaultMediaBuffer {
/// Jitter buffer for incoming frames. `parking_lot::Mutex`
/// because the `AdaptiveJitterBuffer::{add_packet, get_next_packet}`
/// bodies are sync (no `.await`), so the previous
/// `tokio::RwLock` was paying scheduler overhead with no benefit
/// — see C23b.
jitter_buffer: parking_lot::Mutex<AdaptiveJitterBuffer>,
/// Transmit buffer for outgoing frames
#[allow(dead_code)] // retained (liveness/Drop hold or reserved); not read
transmit_buffer: Option<Arc<TransmitBuffer>>,
/// Configuration for the buffer
config: RwLock<MediaBufferConfig>,
/// Queue for frames extracted from the jitter buffer
frame_queue: Mutex<VecDeque<MediaFrame>>,
/// Signal for frame availability
frame_signal: Arc<Notify>,
/// Statistics
stats: RwLock<BufferStats>,
}
impl DefaultMediaBuffer {
/// Create a new DefaultMediaBuffer
pub fn new(config: MediaBufferConfig) -> Result<Arc<Self>, BufferError> {
// Create jitter buffer configuration
let jitter_config = crate::buffer::jitter::JitterBufferConfig {
initial_size_ms: config.min_delay_ms,
min_size_ms: config.min_delay_ms,
max_size_ms: config.max_delay_ms,
max_out_of_order: config.max_packet_count,
adaptive: config.adaptive,
..Default::default()
};
// Create jitter buffer with configuration
let jitter_buffer = AdaptiveJitterBuffer::new(jitter_config);
// Create initial stats
let stats = BufferStats {
current_delay_ms: config.min_delay_ms,
packet_count: 0,
max_delay_seen_ms: 0,
min_delay_seen_ms: config.min_delay_ms,
late_packet_count: 0,
overflow_discard_count: 0,
average_occupancy: 0.0,
underrun_count: 0,
};
Ok(Arc::new(Self {
jitter_buffer: parking_lot::Mutex::new(jitter_buffer),
transmit_buffer: None, // Initialize if needed
config: RwLock::new(config),
frame_queue: Mutex::new(VecDeque::with_capacity(100)),
frame_signal: Arc::new(Notify::new()),
stats: RwLock::new(stats),
}))
}
/// Update statistics based on current state
async fn update_stats(&self) {
// Snapshot jitter stats under the parking_lot guard, then
// drop the guard before awaiting the async stats RwLock.
let jitter_stats = self.jitter_buffer.lock().get_stats();
let mut stats = self.stats.write().await;
// Update current delay
stats.current_delay_ms = jitter_stats.buffer_size_ms;
// Update packet count
stats.packet_count = jitter_stats.buffered_packets;
// Update max/min delay
stats.max_delay_seen_ms = stats.max_delay_seen_ms.max(stats.current_delay_ms);
stats.min_delay_seen_ms = stats.min_delay_seen_ms.min(stats.current_delay_ms);
// Update occupancy
let capacity = jitter_stats.buffered_packets;
let max_capacity = self.config.read().await.max_packet_count;
if max_capacity > 0 {
stats.average_occupancy = (stats.average_occupancy * 0.95)
+ (capacity as f32 / max_capacity as f32 * 100.0 * 0.05);
}
}
/// Convert a media frame to internal packet format
fn frame_to_packet(&self, frame: &MediaFrame) -> crate::packet::rtp::RtpPacket {
// Create header from frame data
let mut header = crate::packet::header::RtpHeader::new(
frame.payload_type,
frame.sequence,
frame.timestamp,
frame.ssrc,
);
header.marker = frame.marker;
// Create packet
crate::packet::rtp::RtpPacket::new(header, frame.data.clone())
}
/// Convert internal packet to media frame
fn packet_to_frame(
&self,
packet: crate::packet::rtp::RtpPacket,
frame_type: MediaFrameType,
) -> MediaFrame {
MediaFrame {
frame_type,
data: packet.payload,
timestamp: packet.header.timestamp,
sequence: packet.header.sequence_number,
marker: packet.header.marker,
payload_type: packet.header.payload_type,
ssrc: packet.header.ssrc,
csrcs: packet.header.csrc.clone(),
}
}
}
#[async_trait::async_trait]
impl MediaBuffer for DefaultMediaBuffer {
async fn put_frame(&self, frame: MediaFrame) -> Result<(), BufferError> {
// Convert frame to packet for internal jitter buffer
let packet = self.frame_to_packet(&frame);
// Put packet in jitter buffer. parking_lot guard is `!Send`
// so we scope it tightly — added/dropped before any `.await`.
let added = self.jitter_buffer.lock().add_packet(packet);
if added {
self.frame_signal.notify_one();
self.update_stats().await;
Ok(())
} else {
let mut stats = self.stats.write().await;
stats.overflow_discard_count += 1;
Err(BufferError::BufferFull)
}
}
async fn get_frame(&self, timeout: Duration) -> Result<MediaFrame, BufferError> {
// Check if we already have frames queued
{
let mut queue = self.frame_queue.lock().await;
if let Some(frame) = queue.pop_front() {
return Ok(frame);
}
}
// No frames queued, try to get from jitter buffer
let start_time = Instant::now();
loop {
// Check if we've exceeded the timeout
if start_time.elapsed() >= timeout {
// Timeout occurred without getting a frame
let mut stats = self.stats.write().await;
stats.underrun_count += 1;
return Err(BufferError::BufferEmpty);
}
// Try to get a packet from the jitter buffer. Scope the
// parking_lot guard inside this block so it can't be held
// across the await below.
let next = self.jitter_buffer.lock().get_next_packet();
match next {
Some(packet) => {
// Determine frame type based on payload type (simplified)
let frame_type = {
if packet.header.payload_type >= 96 {
// Dynamic payload types
MediaFrameType::Video
} else {
// Static payload types
MediaFrameType::Audio
}
};
// Convert to media frame
let frame = self.packet_to_frame(packet, frame_type);
return Ok(frame);
}
None => {
// Wait for notification or timeout
let remaining = timeout
.checked_sub(start_time.elapsed())
.unwrap_or(Duration::from_millis(1));
// Wait for notification or timeout
tokio::select! {
_ = self.frame_signal.notified() => {
// A frame might be available now, loop and try again
continue;
}
_ = tokio::time::sleep(remaining) => {
// Timeout occurred
let mut stats = self.stats.write().await;
stats.underrun_count += 1;
return Err(BufferError::BufferEmpty);
}
}
}
}
}
}
async fn get_stats(&self) -> BufferStats {
// Update stats first
self.update_stats().await;
// Return a copy of the current stats
self.stats.read().await.clone()
}
async fn reset(&self) -> Result<(), BufferError> {
// Reset jitter buffer
{
let mut jitter = self.jitter_buffer.lock();
jitter.reset();
}
// Clear frame queue
{
let mut queue = self.frame_queue.lock().await;
queue.clear();
}
// Reset stats
{
let mut stats = self.stats.write().await;
let config = self.config.read().await;
stats.current_delay_ms = config.min_delay_ms;
stats.packet_count = 0;
stats.average_occupancy = 0.0;
// Don't reset counters, just current state
}
Ok(())
}
async fn flush(&self) -> Result<Vec<MediaFrame>, BufferError> {
let mut frames = Vec::new();
// First add any queued frames
{
let mut queue = self.frame_queue.lock().await;
frames.extend(queue.drain(..));
}
// Then drain the jitter buffer
{
let mut jitter = self.jitter_buffer.lock();
// Keep getting packets until empty
while let Some(packet) = jitter.get_next_packet() {
// Determine frame type based on payload type (simplified)
let frame_type = {
if packet.header.payload_type >= 96 {
// Dynamic payload types
MediaFrameType::Video
} else {
// Static payload types
MediaFrameType::Audio
}
};
// Convert to media frame
let frame = self.packet_to_frame(packet, frame_type);
frames.push(frame);
}
}
// Update stats
self.update_stats().await;
Ok(frames)
}
async fn update_config(&self, config: MediaBufferConfig) -> Result<(), BufferError> {
// Validate configuration
if config.min_delay_ms > config.max_delay_ms {
return Err(BufferError::ConfigurationError(
"Minimum delay must be less than or equal to maximum delay".to_string(),
));
}
if config.max_packet_count == 0 {
return Err(BufferError::ConfigurationError(
"Maximum packet count must be greater than zero".to_string(),
));
}
// Create new jitter buffer configuration
let jitter_config = crate::buffer::jitter::JitterBufferConfig {
initial_size_ms: config.min_delay_ms,
min_size_ms: config.min_delay_ms,
max_size_ms: config.max_delay_ms,
max_out_of_order: config.max_packet_count,
adaptive: config.adaptive,
..Default::default()
};
// Update jitter buffer configuration - recreate it with new config
{
let mut jitter = self.jitter_buffer.lock();
*jitter = AdaptiveJitterBuffer::new(jitter_config);
}
// Store new configuration
{
let mut cfg = self.config.write().await;
*cfg = config;
}
// Update stats
self.update_stats().await;
Ok(())
}
}