add enable directx option, android software encoding half resolution option (#8435)

* add option enable directx capture screen, default true

Signed-off-by: 21pages <sunboeasy@gmail.com>

* option android software encoding half scale, check isStart flag

Signed-off-by: 21pages <sunboeasy@gmail.com>

---------

Signed-off-by: 21pages <sunboeasy@gmail.com>

src/lang/ar.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/bg.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ca.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/cn.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "从不"),
         ("During controlled", "被控期间"),
         ("During service is on", "服务开启期间"),
+        ("Capture screen using DirectX", "使用 DirectX 捕获屏幕"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Nikdy"),
         ("During controlled", "Během řízeného"),
         ("During service is on", "Během služby je v provozu"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Niemals"),
         ("During controlled", "Wenn kontrolliert"),
         ("During service is on", "Wenn der Dienst läuft"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/el.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Nunca"),
         ("During controlled", "Mientras está siendo controlado"),
         ("During service is on", "Mientras el servicio está activo"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/et.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/he.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/hr.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Mai"),
         ("During controlled", "Durante il controllo"),
         ("During service is on", "Quando il servizio è attivo"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/lt.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/lv.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Nekad"),
         ("During controlled", "Lietošanas laikā"),
         ("During service is on", "Kamēr pakalpojums ir ieslēgts"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/nb.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/nl.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ro.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -125,7 +125,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Good image quality", "Лучшее качество изображения"),
         ("Balanced", "Баланс между качеством и откликом"),
         ("Optimize reaction time", "Лучшее время отклика"),
-        ("Custom", "Заданное пользователем"), 
+        ("Custom", "Заданное пользователем"),
         ("Show remote cursor", "Показывать удалённый курсор"),
         ("Show quality monitor", "Показывать монитор качества"),
         ("Disable clipboard", "Отключить буфер обмена"),
@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Нет"),
         ("During controlled", "При управлении"),
         ("During service is on", "При запущенной службе"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "Nikdy"),
         ("During controlled", "Počas kontrolovaného"),
         ("During service is on", "Počas služby je v prevádzke"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/sl.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/sq.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/sr.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/sv.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/th.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/tw.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", "從不"),
         ("During controlled", "被控期間"),
         ("During service is on", "服務開啟期間"),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/ua.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/lang/vn.rs

@@ -621,5 +621,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Never", ""),
         ("During controlled", ""),
         ("During service is on", ""),
+        ("Capture screen using DirectX", ""),
     ].iter().cloned().collect();
 }

src/server/video_service.rs

@@ -407,7 +407,11 @@ fn run(vs: VideoService) -> ResultType<()> {
     let display_idx = vs.idx;
     let sp = vs.sp;
     let mut c = get_capturer(display_idx, last_portable_service_running)?;
-
+    #[cfg(windows)]
+    if !scrap::codec::enable_directx_capture() && !c.is_gdi() {
+        log::info!("disable dxgi with option, fall back to gdi");
+        c.set_gdi();
+    }
     let mut video_qos = VIDEO_QOS.lock().unwrap();
     video_qos.refresh(None);
     let mut spf;
@@ -837,16 +841,33 @@ fn get_recorder(
 
 #[cfg(target_os = "android")]
 fn check_change_scale(hardware: bool) -> ResultType<()> {
+    use hbb_common::config::keys::OPTION_ENABLE_ANDRIOD_SOFTWARE_ENCODING_HALF_SCALE as SCALE_SOFT;
+
+    // isStart flag is set at the end of startCapture() in Android, wait it to be set.
+    for i in 0..6 {
+        if scrap::is_start() == Some(true) {
+            log::info!("start flag is set");
+            break;
+        }
+        log::info!("wait for start, {i}");
+        std::thread::sleep(Duration::from_millis(50));
+        if i == 5 {
+            log::error!("wait for start timeout");
+        }
+    }
     let screen_size = scrap::screen_size();
-    log::info!("hardware: {hardware}, screen_size: {screen_size:?}",);
+    let scale_soft = hbb_common::config::option2bool(SCALE_SOFT, &Config::get_option(SCALE_SOFT));
+    let half_scale = !hardware && scale_soft;
+    log::info!("hardware: {hardware}, scale_soft: {scale_soft}, screen_size: {screen_size:?}",);
     scrap::android::call_main_service_set_by_name(
-        "is_hardware_codec",
-        Some(hardware.to_string().as_str()),
+        "half_scale",
+        Some(half_scale.to_string().as_str()),
         None,
     )
     .ok();
     let old_scale = screen_size.2;
     let new_scale = scrap::screen_size().2;
+    log::info!("old_scale: {old_scale}, new_scale: {new_scale}");
     if old_scale != new_scale {
         log::info!("switch due to scale changed, {old_scale} -> {new_scale}");
         // switch is not a must, but it is better to do so.