hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video_ack_required for web

Browse Source
This commit is contained in:
rustdesk 2022-02-04 22:18:48 +08:00
parent eb49af843c
commit 5a0f8d008e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/hbb_common/protos/message.proto
View File

@ -381,6 +381,7 @@ message Misc {
string close_reason = 9; string close_reason = 9;
bool refresh_video = 10; bool refresh_video = 10;
OptionResponse option_response = 11; OptionResponse option_response = 11;
bool video_received = 12;
} }
} }

12
src/server/connection.rs
View File

@ -63,6 +63,7 @@ pub struct Connection {
disable_clipboard: bool, // by peer disable_clipboard: bool, // by peer
disable_audio: bool, // by peer disable_audio: bool, // by peer
tx_input: std_mpsc::Sender<MessageInput>, // handle input messages tx_input: std_mpsc::Sender<MessageInput>, // handle input messages
video_ack_required: bool,
} }
impl Subscriber for ConnInner { impl Subscriber for ConnInner {
@ -142,6 +143,7 @@ impl Connection {
disable_audio: false, disable_audio: false,
disable_clipboard: false, disable_clipboard: false,
tx_input, tx_input,
video_ack_required: false,
}; };
tokio::spawn(async move { tokio::spawn(async move {
if let Err(err) = start_ipc(rx_to_cm, tx_from_cm).await { if let Err(err) = start_ipc(rx_to_cm, tx_from_cm).await {
@ -271,7 +273,9 @@ impl Connection {
} }
}, },
Some((instant, value)) = rx_video.recv() => { Some((instant, value)) = rx_video.recv() => {
video_service::notify_video_frame_feched(id, Some(instant.into())); if !conn.video_ack_required {
video_service::notify_video_frame_feched(id, Some(instant.into()));
}
if let Err(err) = conn.stream.send(&value as &Message).await { if let Err(err) = conn.stream.send(&value as &Message).await {
conn.on_close(&err.to_string(), false); conn.on_close(&err.to_string(), false);
break; break;
@ -927,6 +931,12 @@ impl Connection {
super::video_service::refresh(); super::video_service::refresh();
} }
} }
Some(misc::Union::video_received(_)) => {
if !self.video_ack_required {
self.video_ack_required = true;
}
video_service::notify_video_frame_feched(self.inner.id, Some(Instant::now().into()));
}
_ => {} _ => {}
}, },
_ => {} _ => {}