zobally/RustDesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
yuluo 2024-04-23 03:03:45 +08:00 • committed by GitHub
commit 369df12a5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
157 changed files with 6056 additions and 2087 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ui_interface.rs
View file

@ -862,15 +862,14 @@ pub fn get_api_server() -> String {
#[inline]
pub fn has_hwcodec() -> bool {
#[cfg(not(any(feature = "hwcodec", feature = "mediacodec")))]
return false;
#[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
return true;
// Has real hardware codec using gpu
(cfg!(feature = "hwcodec") && (cfg!(windows) || cfg!(target_os = "linux")))
|| cfg!(feature = "mediacodec")
}
#[inline]
pub fn has_gpucodec() -> bool {
cfg!(feature = "gpucodec")
pub fn has_vram() -> bool {
cfg!(feature = "vram")
}
#[cfg(feature = "flutter")]
@ -879,14 +878,14 @@ pub fn supported_hwdecodings() -> (bool, bool) {
let decoding = scrap::codec::Decoder::supported_decodings(None, true, None, &vec![]);
#[allow(unused_mut)]
let (mut h264, mut h265) = (decoding.ability_h264 > 0, decoding.ability_h265 > 0);
#[cfg(feature = "gpucodec")]
#[cfg(feature = "vram")]
{
// supported_decodings check runtime luid
let gpu = scrap::gpucodec::GpuDecoder::possible_available_without_check();
if gpu.0 {
let vram = scrap::vram::VRamDecoder::possible_available_without_check();
if vram.0 {
h264 = true;
}
if gpu.1 {
if vram.1 {
h265 = true;
}
}
@ -1348,3 +1347,14 @@ pub fn verify2fa(code: String) -> bool {
}
res
}
pub fn check_hwcodec() {
#[cfg(feature = "hwcodec")]
#[cfg(any(target_os = "windows", target_os = "linux"))]
{
scrap::hwcodec::start_check_process(true);
if crate::platform::is_installed() {
ipc::notify_server_to_check_hwcodec().ok();
}
}
}