TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-17 02:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Option allow-d3d-render and fix ios ci (#11107)

Browse Source 
* option `allow-d3d-render`, default false

Add this option because it fails on some machines

Signed-off-by: 21pages <sunboeasy@gmail.com>

* only add nokhwa to windows and linux dependencies

Signed-off-by: 21pages <sunboeasy@gmail.com>

---------

Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages
2025-03-13 09:34:13 +08:00
committed by GitHub
parent 1403c939db
commit d1c8b331c5
60 changed files with 204 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/video_service.rs
View File

@@ -503,6 +503,7 @@ fn run(vs: VideoService) -> ResultType<()> {
record_incoming,
last_portable_service_running,
vs.source,
display_idx,
) {
Ok(result) => result,
Err(err) => {
@@ -522,6 +523,7 @@ fn run(vs: VideoService) -> ResultType<()> {
record_incoming,
last_portable_service_running,
vs.source,
display_idx,
)?
}
};
@@ -791,6 +793,7 @@ fn setup_encoder(
record_incoming: bool,
last_portable_service_running: bool,
source: VideoSource,
display_idx: usize,
) -> ResultType<(
Encoder,
EncoderCfg,
@@ -808,7 +811,7 @@ fn setup_encoder(
);
Encoder::set_fallback(&encoder_cfg);
let codec_format = Encoder::negotiated_codec();
let recorder = get_recorder(record_incoming, name);
let recorder = get_recorder(record_incoming, display_idx, source == VideoSource::Camera);
let use_i444 = Encoder::use_i444(&encoder_cfg);
let encoder = Encoder::new(encoder_cfg.clone(), use_i444)?;
Ok((encoder, encoder_cfg, codec_format, use_i444, recorder))
@@ -891,7 +894,11 @@ fn get_encoder_config(
}
}
fn get_recorder(record_incoming: bool, video_service_name: String) -> Arc<Mutex<Option<Recorder>>> {
fn get_recorder(
record_incoming: bool,
display_idx: usize,
camera: bool,
) -> Arc<Mutex<Option<Recorder>>> {
#[cfg(windows)]
let root = crate::platform::is_root();
#[cfg(not(windows))]
@@ -910,7 +917,8 @@ fn get_recorder(record_incoming: bool, video_service_name: String) -> Arc<Mutex<
server: true,
id: Config::get_id(),
dir: crate::ui_interface::video_save_directory(root),
video_service_name,
display_idx,
camera,
tx,
})
.map_or(Default::default(), |r| Arc::new(Mutex::new(Some(r))))