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

Revert "disable ffmpeg ram codec temporarily" (#6928)

Browse Source
This commit is contained in:
RustDesk 2024-01-20 17:20:08 +08:00 committed by GitHub
parent 267342e7e6
commit 804f035a87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3079,7 +3079,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]] [[package]]
name = "hwcodec" name = "hwcodec"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/21pages/hwcodec?branch=stable#42cfa3f9e5138d3dbdea83ea87d4c4bf798fef51" source = "git+https://github.com/21pages/hwcodec?branch=stable#da8aec8e8abb6a5506e027484023e6e2ad1f47eb"
dependencies = [ dependencies = [
"bindgen 0.59.2", "bindgen 0.59.2",
"cc", "cc",

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

@ -708,17 +708,10 @@ impl Decoder {
#[cfg(any(feature = "hwcodec", feature = "mediacodec"))] #[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
pub fn enable_hwcodec_option() -> bool { pub fn enable_hwcodec_option() -> bool {
#[cfg(feature = "hwcodec")]
{
return false;
}
#[cfg(feature = "mediacodec")]
{
if let Some(v) = Config2::get().options.get("enable-hwcodec") { if let Some(v) = Config2::get().options.get("enable-hwcodec") {
return v != "N"; return v != "N";
} }
return true; // default is true return true; // default is true
}
} }
#[cfg(feature = "gpucodec")] #[cfg(feature = "gpucodec")]
pub fn enable_gpucodec_option() -> bool { pub fn enable_gpucodec_option() -> bool {

2
libs/scrap/src/common/hwcodec.rs
View File

@ -381,7 +381,6 @@ pub fn check_available_hwcodec() {
} }
pub fn hwcodec_new_check_process() { pub fn hwcodec_new_check_process() {
/*
use std::sync::Once; use std::sync::Once;
let f = || { let f = || {
// Clear to avoid checking process errors // Clear to avoid checking process errors
@ -424,5 +423,4 @@ pub fn hwcodec_new_check_process() {
ONCE.call_once(|| { ONCE.call_once(|| {
std::thread::spawn(f); std::thread::spawn(f);
}); });
*/
} }