From 804f035a871987f0ce1277f61d09c17181faa116 Mon Sep 17 00:00:00 2001
From: RustDesk <71636191+rustdesk@users.noreply.github.com>
Date: Sat, 20 Jan 2024 17:20:08 +0800
Subject: [PATCH] Revert "disable ffmpeg ram codec temporarily" (#6928)

---
 Cargo.lock                       |  2 +-
 libs/scrap/src/common/codec.rs   | 13 +++----------
 libs/scrap/src/common/hwcodec.rs |  2 --
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33961f027..60617f7a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3079,7 +3079,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 [[package]]
 name = "hwcodec"
 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 = [
  "bindgen 0.59.2",
  "cc",
diff --git a/libs/scrap/src/common/codec.rs b/libs/scrap/src/common/codec.rs
index ffdd6bf01..e3e973de8 100644
--- a/libs/scrap/src/common/codec.rs
+++ b/libs/scrap/src/common/codec.rs
@@ -708,17 +708,10 @@ impl Decoder {
 
 #[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
 pub fn enable_hwcodec_option() -> bool {
-    #[cfg(feature = "hwcodec")]
-    {
-        return false;
-    }
-    #[cfg(feature = "mediacodec")]
-    {
-        if let Some(v) = Config2::get().options.get("enable-hwcodec") {
-            return v != "N";
-        }
-        return true; // default is true
+    if let Some(v) = Config2::get().options.get("enable-hwcodec") {
+        return v != "N";
     }
+    return true; // default is true
 }
 #[cfg(feature = "gpucodec")]
 pub fn enable_gpucodec_option() -> bool {
diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs
index e42c111c9..bf49373a9 100644
--- a/libs/scrap/src/common/hwcodec.rs
+++ b/libs/scrap/src/common/hwcodec.rs
@@ -381,7 +381,6 @@ pub fn check_available_hwcodec() {
 }
 
 pub fn hwcodec_new_check_process() {
-    /*
     use std::sync::Once;
     let f = || {
         // Clear to avoid checking process errors
@@ -424,5 +423,4 @@ pub fn hwcodec_new_check_process() {
     ONCE.call_once(|| {
         std::thread::spawn(f);
     });
-    */
 }