GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-09-13 02:54:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(rustdesk): 降低视频直连延迟

Browse Source
This commit is contained in:
mofeng-git
2026-08-30 08:50:38 +08:00
parent 95a1fdf42d
commit b074aa5779
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/rustdesk/connection.rs
View File

@@ -300,7 +300,9 @@ impl Connection {
// Keep socket writes out of the input loop. A congested video path must // Keep socket writes out of the input loop. A congested video path must
// never prevent us from reading keyboard and mouse events. // never prevent us from reading keyboard and mouse events.
let (control_tx, control_rx) = mpsc::channel::<WriterCommand>(32); let (control_tx, control_rx) = mpsc::channel::<WriterCommand>(32);
let (video_tx, video_rx) = mpsc::channel::<Bytes>(1); // Absorb short encoder/socket scheduling bursts without treating a
// momentarily busy writer as a broken inter-frame sequence.
let (video_tx, video_rx) = mpsc::channel::<Bytes>(4);
let (audio_tx, audio_rx) = mpsc::channel::<Bytes>(8); let (audio_tx, audio_rx) = mpsc::channel::<Bytes>(8);
let mut writer_task = tokio::spawn(run_connection_writer( let mut writer_task = tokio::spawn(run_connection_writer(
writer, control_rx, video_rx, audio_rx, writer, control_rx, video_rx, audio_rx,
@@ -1405,6 +1407,8 @@ async fn run_connection_writer(
loop { loop {
let (data, encrypt) = tokio::select! { let (data, encrypt) = tokio::select! {
biased;
command = control_rx.recv() => { command = control_rx.recv() => {
match command { match command {
Some(WriterCommand::SetSessionKey(key)) => { Some(WriterCommand::SetSessionKey(key)) => {
@@ -1415,13 +1419,13 @@ async fn run_connection_writer(
Some(WriterCommand::Shutdown) | None => break, Some(WriterCommand::Shutdown) | None => break,
} }
} }
frame = audio_rx.recv() => { frame = video_rx.recv() => {
match frame { match frame {
Some(data) => (data, session_key.is_some()), Some(data) => (data, session_key.is_some()),
None => continue, None => continue,
} }
} }
frame = video_rx.recv() => { frame = audio_rx.recv() => {
match frame { match frame {
Some(data) => (data, session_key.is_some()), Some(data) => (data, session_key.is_some()),
None => continue, None => continue,
@@ -1874,27 +1878,13 @@ async fn run_video_streaming(
frame.pts_ms as u64, frame.pts_ms as u64,
); );
// Never queue a run of stale frames behind a slow socket. // A small bounded queue absorbs transient writer jitter.
// If the one-frame queue is full, wait for a fresh keyframe // Backpressure here cannot block input handling because the
// before resuming so the decoder cannot receive a broken GOP. // TCP reader and writer run independently.
match video_tx.try_send(msg_bytes) { if video_tx.send(msg_bytes).await.is_err() {
Ok(()) => {}
Err(mpsc::error::TrySendError::Full(_)) => {
waiting_for_keyframe = true;
let now = Instant::now();
if now.duration_since(last_keyframe_request) >= Duration::from_millis(200) {
if let Err(error) = video_manager.request_keyframe().await {
debug!("Failed to request recovery keyframe for connection {}: {}", conn_id, error);
}
last_keyframe_request = now;
}
continue;
}
Err(mpsc::error::TrySendError::Closed(_)) => {
debug!("Video channel closed for connection {}", conn_id); debug!("Video channel closed for connection {}", conn_id);
break 'subscribe_loop; break 'subscribe_loop;
} }
}
last_sequence = Some(frame.sequence); last_sequence = Some(frame.sequence);
encoded_count += 1; encoded_count += 1;