weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

disable hwcodec if causing crash

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-04-04 20:35:04 +08:00
parent 8b78510ea7
commit f2aeff974c
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/scrap/src/common/codec.rs
View File

@@ -109,6 +109,7 @@ impl Encoder {
}),
Err(e) => {
check_config_process(true);
*CODEC_NAME.lock().unwrap() = CodecName::VP9;
Err(e)
}
},
@@ -144,16 +145,18 @@ impl Encoder {
let mut h265_name = None;
#[cfg(feature = "hwcodec")]
{
let best = HwEncoder::best();
let h264_useable =
decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_h264 > 0);
let h265_useable =
decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_h265 > 0);
if h264_useable {
h264_name = best.h264.map_or(None, |c| Some(c.name));
}
if h265_useable {
h265_name = best.h265.map_or(None, |c| Some(c.name));
if enable_hwcodec_option() {
let best = HwEncoder::best();
let h264_useable =
decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_h264 > 0);
let h265_useable =
decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_h265 > 0);
if h264_useable {
h264_name = best.h264.map_or(None, |c| Some(c.name));
}
if h265_useable {
h265_name = best.h265.map_or(None, |c| Some(c.name));
}
}
}