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

add snapshot before sending SwitchDisplay (#6760)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-12-28 21:34:54 +08:00 committed by GitHub
parent 20b4ce3213
commit 3e78aacc7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/video_service.rs
View File

@ -741,6 +741,14 @@ fn try_broadcast_display_changed(
) { ) {
log::info!("Display {} changed", display); log::info!("Display {} changed", display);
if let Some(msg_out) = make_display_changed_msg(display_idx, Some(display)) { if let Some(msg_out) = make_display_changed_msg(display_idx, Some(display)) {
// switch display may occur before the first video frame, add snapshot to ensure successful send
sp.snapshot(|sps| {
// so that new sub and old sub share the same encoder after switch
if sps.has_subscribes() {
bail!("SWITCH");
}
Ok(())
})?;
sp.send(msg_out); sp.send(msg_out);
bail!("SWITCH"); bail!("SWITCH");
} }