flutter desktop Codec Preference

src/flutter_ffi.rs

@@ -754,8 +754,8 @@ pub fn main_remove_peer(id: String) {
     PeerConfig::remove(&id);
 }
 
-pub fn main_has_hwcodec() -> bool {
-    has_hwcodec()
+pub fn main_has_hwcodec() -> SyncReturn<bool> {
+    SyncReturn(has_hwcodec())
 }
 
 pub fn session_send_mouse(id: String, msg: String) {
@@ -816,6 +816,22 @@ pub fn session_send_note(id: String, note: String) {
     }
 }
 
+pub fn session_supported_hwcodec(id: String) -> String {
+    if let Some(session) = SESSIONS.read().unwrap().get(&id) {
+        let (h264, h265) = session.supported_hwcodec();
+        let msg = HashMap::from([("h264", h264), ("h265", h265)]);
+        serde_json::ser::to_string(&msg).unwrap_or("".to_owned())
+    } else {
+        String::new()
+    }
+}
+
+pub fn session_change_prefer_codec(id: String) {
+    if let Some(session) = SESSIONS.read().unwrap().get(&id) {
+        session.change_prefer_codec();
+    }
+}
+
 pub fn main_set_home_dir(home: String) {
     *config::APP_HOME_DIR.write().unwrap() = home;
 }

src/ui/remote.rs

@@ -449,27 +449,11 @@ impl SciterSession {
     }
 
     fn supported_hwcodec(&self) -> Value {
-        #[cfg(feature = "hwcodec")]
-        {
-            let mut v = Value::array(0);
-            let decoder = scrap::codec::Decoder::video_codec_state(&self.id);
-            let mut h264 = decoder.score_h264 > 0;
-            let mut h265 = decoder.score_h265 > 0;
-            if let Some((encoding_264, encoding_265)) = self.lc.read().unwrap().supported_encoding {
-                h264 = h264 && encoding_264;
-                h265 = h265 && encoding_265;
-            }
-            v.push(h264);
-            v.push(h265);
-            v
-        }
-        #[cfg(not(feature = "hwcodec"))]
-        {
-            let mut v = Value::array(0);
-            v.push(false);
-            v.push(false);
-            v
-        }
+        let (h264, h265) = self.0.supported_hwcodec();
+        let mut v = Value::array(0);
+        v.push(h264);
+        v.push(h265);
+        v
     }
 
     fn save_size(&mut self, x: i32, y: i32, w: i32, h: i32) {
@@ -721,4 +705,4 @@ pub fn make_fd(id: i32, entries: &Vec<FileEntry>, only_count: bool) -> Value {
     m.set_item("num_entries", entries.len() as i32);
     m.set_item("total_size", n as f64);
     m
-}
+}

src/ui_session_interface.rs

@@ -11,9 +11,9 @@ use async_trait::async_trait;
 use hbb_common::config::{Config, LocalConfig, PeerConfig};
 use hbb_common::rendezvous_proto::ConnType;
 use hbb_common::tokio::{self, sync::mpsc};
-use rdev::{Event, EventType::*, Key as RdevKey, KeyboardState};
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 use rdev::Keyboard as RdevKeyboard;
+use rdev::{Event, EventType::*, Key as RdevKey, KeyboardState};
 
 use hbb_common::{allow_err, message_proto::*};
 use hbb_common::{fs, get_version_number, log, Stream};
@@ -143,6 +143,25 @@ impl<T: InvokeUiSession> Session<T> {
         return true;
     }
 
+    pub fn supported_hwcodec(&self) -> (bool, bool) {
+        #[cfg(feature = "hwcodec")]
+        {
+            let decoder = scrap::codec::Decoder::video_codec_state(&self.id);
+            let mut h264 = decoder.score_h264 > 0;
+            let mut h265 = decoder.score_h265 > 0;
+            if let Some((encoding_264, encoding_265)) = self.lc.read().unwrap().supported_encoding {
+                h264 = h264 && encoding_264;
+                h265 = h265 && encoding_265;
+            }
+            return (h264, h265);
+        }
+        #[cfg(feature = "mediacodec")]
+        {
+            todo!();
+        }
+        (false, false)
+    }
+
     pub fn change_prefer_codec(&self) {
         let msg = self.lc.write().unwrap().change_prefer_codec();
         self.send(Data::Message(msg));
@@ -658,18 +677,20 @@ impl<T: InvokeUiSession> Session<T> {
                 }
                 self.map_keyboard_mode(down_or_up, key, Some(evt));
             }
-            KeyboardMode::Legacy => {
+            KeyboardMode::Legacy =>
+            {
                 #[cfg(not(any(target_os = "android", target_os = "ios")))]
                 self.legacy_keyboard_mode(down_or_up, key, evt)
-            },
+            }
             KeyboardMode::Translate => {
                 #[cfg(not(any(target_os = "android", target_os = "ios")))]
                 self.translate_keyboard_mode(down_or_up, key, evt);
             }
-            _ => {
+            _ =>
+            {
                 #[cfg(not(any(target_os = "android", target_os = "ios")))]
                 self.legacy_keyboard_mode(down_or_up, key, evt)
-            },
+            }
         }
     }
 
@@ -1178,7 +1199,7 @@ impl<T: InvokeUiSession> Session<T> {
         if self.is_port_forward() || self.is_file_transfer() {
             return;
         }
-        if !KEYBOARD_HOOKED.load(Ordering::SeqCst){
+        if !KEYBOARD_HOOKED.load(Ordering::SeqCst) {
             return;
         }
         log::info!("keyboard hooked");