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

x86 sciter set not support av1 due to slow (#7920)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2024-05-06 22:03:49 +08:00 committed by GitHub
parent ac04a032ad
commit 0af370d736
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,9 @@ impl Encoder {
} }
let vp8_useable = decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_vp8 > 0); let vp8_useable = decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_vp8 > 0);
let av1_useable = decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_av1 > 0); let av1_useable = decodings.len() > 0
&& decodings.iter().all(|(_, s)| s.ability_av1 > 0)
&& !disable_av1();
let _all_support_h264_decoding = let _all_support_h264_decoding =
decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_h264 > 0); decodings.len() > 0 && decodings.iter().all(|(_, s)| s.ability_h264 > 0);
let _all_support_h265_decoding = let _all_support_h265_decoding =
@ -250,8 +252,7 @@ impl Encoder {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut auto_codec = CodecName::VP9; let mut auto_codec = CodecName::VP9;
// aom is very slow for x86 sciter version on windows x64 if av1_useable {
if av1_useable && !(cfg!(windows) && std::env::consts::ARCH == "x86") {
auto_codec = CodecName::AV1; auto_codec = CodecName::AV1;
} }
let mut system = System::new(); let mut system = System::new();
@ -307,7 +308,7 @@ impl Encoder {
#[allow(unused_mut)] #[allow(unused_mut)]
let mut encoding = SupportedEncoding { let mut encoding = SupportedEncoding {
vp8: true, vp8: true,
av1: true, av1: !disable_av1(),
i444: Some(CodecAbility { i444: Some(CodecAbility {
vp9: true, vp9: true,
av1: true, av1: true,
@ -397,7 +398,7 @@ impl Decoder {
let mut decoding = SupportedDecoding { let mut decoding = SupportedDecoding {
ability_vp8: 1, ability_vp8: 1,
ability_vp9: 1, ability_vp9: 1,
ability_av1: 1, ability_av1: if disable_av1() { 0 } else { 1 },
i444: Some(CodecAbility { i444: Some(CodecAbility {
vp9: true, vp9: true,
av1: true, av1: true,
@ -914,3 +915,8 @@ pub fn codec_thread_num(limit: usize) -> usize {
} }
res res
} }
fn disable_av1() -> bool {
// aom is very slow for x86 sciter version on windows x64
cfg!(windows) && std::env::consts::ARCH == "x86"
}