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

android broadcast display changed immediately when change scale (#8219)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-05-31 16:44:42 +08:00 committed by GitHub
parent 68cabe596d
commit 1c00d7aa1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/video_service.rs
View File

@ -445,7 +445,10 @@ fn run(vs: VideoService) -> ResultType<()> {
#[cfg(feature = "vram")] #[cfg(feature = "vram")]
c.set_output_texture(encoder.input_texture()); c.set_output_texture(encoder.input_texture());
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
check_change_scale(encoder.is_hardware())?; if let Err(e) = check_change_scale(encoder.is_hardware()) {
try_broadcast_display_changed(&sp, display_idx, &c, true).ok();
bail!(e);
}
VIDEO_QOS.lock().unwrap().store_bitrate(encoder.bitrate()); VIDEO_QOS.lock().unwrap().store_bitrate(encoder.bitrate());
VIDEO_QOS VIDEO_QOS
.lock() .lock()
@ -501,7 +504,7 @@ fn run(vs: VideoService) -> ResultType<()> {
drop(video_qos); drop(video_qos);
if sp.is_option_true(OPTION_REFRESH) { if sp.is_option_true(OPTION_REFRESH) {
let _ = try_broadcast_display_changed(&sp, display_idx, &c); let _ = try_broadcast_display_changed(&sp, display_idx, &c, true);
log::info!("switch to refresh"); log::info!("switch to refresh");
bail!("SWITCH"); bail!("SWITCH");
} }
@ -541,7 +544,7 @@ fn run(vs: VideoService) -> ResultType<()> {
last_check_displays = now; last_check_displays = now;
// This check may be redundant, but it is better to be safe. // This check may be redundant, but it is better to be safe.
// The previous check in `sp.is_option_true(OPTION_REFRESH)` block may be enough. // The previous check in `sp.is_option_true(OPTION_REFRESH)` block may be enough.
try_broadcast_display_changed(&sp, display_idx, &c)?; try_broadcast_display_changed(&sp, display_idx, &c, false)?;
} }
frame_controller.reset(); frame_controller.reset();
@ -616,11 +619,9 @@ fn run(vs: VideoService) -> ResultType<()> {
} }
} }
Err(err) => { Err(err) => {
// Get display information again immediately after error.
crate::display_service::check_displays_changed().ok();
// This check may be redundant, but it is better to be safe. // This check may be redundant, but it is better to be safe.
// The previous check in `sp.is_option_true(OPTION_REFRESH)` block may be enough. // The previous check in `sp.is_option_true(OPTION_REFRESH)` block may be enough.
try_broadcast_display_changed(&sp, display_idx, &c)?; try_broadcast_display_changed(&sp, display_idx, &c, true)?;
#[cfg(windows)] #[cfg(windows)]
if !c.is_gdi() { if !c.is_gdi() {
@ -931,7 +932,12 @@ fn try_broadcast_display_changed(
sp: &GenericService, sp: &GenericService,
display_idx: usize, display_idx: usize,
cap: &CapturerInfo, cap: &CapturerInfo,
refresh: bool,
) -> ResultType<()> { ) -> ResultType<()> {
if refresh {
// Get display information immediately.
crate::display_service::check_displays_changed().ok();
}
if let Some(display) = check_display_changed( if let Some(display) = check_display_changed(
cap.ndisplay, cap.ndisplay,
cap.current, cap.current,