[*] fix: share screen disable audio causes error

Author: heng30

lib/recorder/examples/share_screen_demo.rs

@@ -44,22 +44,22 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     .with_share_screen_config(
         ShareScreenConfig::new("0.0.0.0:9090".to_string())
             .with_save_mp4(true)
-            .with_disable_host_ipv6(true)
-            // .with_enable_https(true)
-            // .with_cert_file(Some("../wrtc/data/ca.crt".to_string()))
-            // .with_key_file(Some("../wrtc/data/ca.key".to_string()))
-            // start turnserver: `turnserver -c ./turnserver.conf -v`
-            // .with_turn_server(Some(RTCIceServer {
-            //     urls: vec!["turn:192.168.10.8:3478".to_string()],
-            //     username: "foo".to_string(),
-            //     credential: "123456".to_string(),
-            // })) // NOTE: change or remove it
-            // .with_stun_server(Some(RTCIceServer {
-            //     urls: vec!["stun:192.168.10.8:3478".to_string()],
-            //     username: "foo".to_string(),
-            //     credential: "123456".to_string(),
-            // })) // NOTE: change or remove it
-            .with_host_ips(vec!["192.168.10.8".to_string()]), // NOTE: change or remove it
+            .with_disable_host_ipv6(true),
+        // .with_enable_https(true)
+        // .with_cert_file(Some("../wrtc/data/ca.crt".to_string()))
+        // .with_key_file(Some("../wrtc/data/ca.key".to_string()))
+        // start turnserver: `turnserver -c ./turnserver.conf -v`
+        // .with_turn_server(Some(RTCIceServer {
+        //     urls: vec!["turn:192.168.10.8:3478".to_string()],
+        //     username: "foo".to_string(),
+        //     credential: "123456".to_string(),
+        // })) // NOTE: change or remove it
+        // .with_stun_server(Some(RTCIceServer {
+        //     urls: vec!["stun:192.168.10.8:3478".to_string()],
+        //     username: "foo".to_string(),
+        //     credential: "123456".to_string(),
+        // })) // NOTE: change or remove it
+        // .with_host_ips(vec!["192.168.10.8".to_string()]), // NOTE: change or remove it
     )
     .with_enable_recording_speaker(true)
     // .with_audio_device_name(Some(default_input.name))

lib/recorder/src/process_mode.rs

@@ -458,10 +458,8 @@ impl RecordingSession {
             .with_video(video_info)
             .with_disable_host_ipv6(self.config.share_screen_config.disable_host_ipv6);
 
-        if self.config.share_screen_config.stun_server.is_some()
-            || self.config.share_screen_config.turn_server.is_some()
-        {
-            media_info.ice_servers.clear();
+        if self.config.share_screen_config.stun_server.is_some() {
+            media_info.ice_servers.clear(); // contain default stun serever
         }
 
         if let Some(ref stun) = self.config.share_screen_config.stun_server {

lib/wrtc/src/client.rs

@@ -101,7 +101,7 @@ impl WHEPClient {
                 }
             };
 
-        info!("ice servers: {:#?}", media_info);
+        info!("media_info: {:#?}", media_info);
 
         Ok(Self {
             config,
@@ -182,19 +182,16 @@ impl WHEPClient {
         };
 
         let peer_connection = Arc::new(api.new_peer_connection(config).await?);
+        peer_connection
+            .add_transceiver_from_kind(RTPCodecType::Video, None)
+            .await?;
 
         if self.media_info.audio.is_some() {
             peer_connection
                 .add_transceiver_from_kind(RTPCodecType::Audio, None)
                 .await?;
         }
 
-        if self.media_info.audio.is_some() {
-            peer_connection
-                .add_transceiver_from_kind(RTPCodecType::Video, None)
-                .await?;
-        }
-
         let exit_notify = self.exit_notify.clone();
         let video_sender = self.video_sender.clone();
         let audio_sender = self.audio_sender.clone();

lib/wrtc/src/whep.rs

@@ -28,10 +28,7 @@ use webrtc::{
 };
 
 pub type Result<T> = std::result::Result<T, WebRTCError>;
-pub const ICE_SERVERS: [&str; 2] = [
-    "stun:stun.nextcloud.com:443",
-    "stun:stun.l.google.com:19302",
-];
+pub const ICE_SERVERS: [&str; 1] = ["stun:stun.l.google.com:19302"];
 
 #[non_exhaustive]
 #[derive(Debug, Setters, Clone)]
@@ -77,7 +74,7 @@ pub async fn handle_whep(
     let mut registry = Registry::new();
     registry = register_default_interceptors(registry, &mut m)?;
 
-    log::info!("host_ips: {:?}", config.host_ips);
+    log::info!("whep config: {:#?}", config);
 
     let mut setting_engine = SettingEngine::default();
     if config.disable_host_ipv6 {

wayshot/src/logic/share_screen.rs

@@ -394,11 +394,11 @@ impl From<config::ShareScreen> for ShareScreenConfig {
     fn from(c: config::ShareScreen) -> ShareScreenConfig {
         ShareScreenConfig::new(c.listen_addr)
             .with_save_mp4(c.save_mp4)
+            .with_host_ips(c.host_ips)
             .with_disable_host_ipv6(c.disable_host_ipv6)
             .with_enable_https(c.enable_https)
             .with_cert_file(Some(c.cert_file))
             .with_key_file(Some(c.key_file))
-            .with_host_ips(c.host_ips)
             .with_auth_token(if c.auth_token.trim().is_empty() {
                 None
             } else {
@@ -414,7 +414,6 @@ impl From<config::ShareScreen> for ShareScreenConfig {
             } else {
                 None
             })
-            .with_host_ips(vec!["192.168.10.8".to_string()])
     }
 }
 

wayshot/src/version.rs

@@ -1 +1 @@
-pub static VERSION: &str = "v0.3.1";
+pub static VERSION: &str = "v0.3.0";