From 8e2d6945d0e0b3fd16de4d7b8883867c3236a4c8 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sun, 29 Jan 2023 11:55:37 +0800
Subject: [PATCH] feat: add audio thread in server being controlled

---
 src/client/io_loop.rs    |  3 +--
 src/server/connection.rs | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs
index 857f94891..bac1e5d23 100644
--- a/src/client/io_loop.rs
+++ b/src/client/io_loop.rs
@@ -297,7 +297,7 @@ impl<T: InvokeUiSession> Remote<T> {
                     _ => {}
                 }
                 match rx_audio_data.try_recv() {
-                    Ok((instant, msg)) => match &msg.union {
+                    Ok((_instant, msg)) => match &msg.union {
                         Some(message::Union::AudioFrame(frame)) => {
                             let mut msg = Message::new();
                             msg.set_audio_frame(frame.clone());
@@ -311,7 +311,6 @@ impl<T: InvokeUiSession> Remote<T> {
                             log::debug!("send audio misc {:?}", misc.audio_format());
                         }
                         _ => {}
-                        None => {}
                     },
                     Err(err) => {
                         if err == TryRecvError::Empty {
diff --git a/src/server/connection.rs b/src/server/connection.rs
index 34adeb59b..2ee3bc8ed 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -5,7 +5,7 @@ use crate::clipboard_file::*;
 use crate::common::update_clipboard;
 #[cfg(windows)]
 use crate::portable_service::client as portable_client;
-use crate::video_service;
+use crate::{video_service, client::{MediaSender, start_audio_thread, LatencyController, MediaData}};
 #[cfg(any(target_os = "android", target_os = "ios"))]
 use crate::{common::DEVICE_NAME, flutter::connection_manager::start_channel};
 use crate::{ipc, VERSION};
@@ -95,6 +95,7 @@ pub struct Connection {
     disable_clipboard: bool,                  // by peer
     disable_audio: bool,                      // by peer
     enable_file_transfer: bool,               // by peer
+    audio_sender: MediaSender,                // audio by the remote peer/client
     tx_input: std_mpsc::Sender<MessageInput>, // handle input messages
     video_ack_required: bool,
     peer_info: (String, String),
@@ -168,6 +169,9 @@ impl Connection {
         let mut hbbs_rx = crate::hbbs_http::sync::signal_receiver();
 
         let tx_cloned = tx.clone();
+        // Start a audio thread to play the audio sent by peer.
+        let latency_controller = LatencyController::new();
+        let audio_sender = start_audio_thread(Some(latency_controller));
         let mut conn = Self {
             inner: ConnInner {
                 id,
@@ -209,6 +213,7 @@ impl Connection {
             #[cfg(windows)]
             portable: Default::default(),
             from_switch: false,
+            audio_sender,
         };
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
         tokio::spawn(async move {
@@ -1534,8 +1539,9 @@ impl Connection {
                         _ => {}
                     },
                     Some(misc::Union::AudioFormat(format)) => {
-                        // TODO: implement audio format handler
-                        println!("recv audio format");
+                        if !self.disable_audio  {
+                            allow_err!(self.audio_sender.send(MediaData::AudioFormat(format)));
+                        }
                     }
                     #[cfg(feature = "flutter")]
                     Some(misc::Union::SwitchSidesRequest(s)) => {
@@ -1554,9 +1560,10 @@ impl Connection {
                     }
                     _ => {}
                 },
-                Some(message::Union::AudioFrame(audio_frame)) => {
-                    // TODO: implement audio frame handler
-                    println!("recv audio frame");
+                Some(message::Union::AudioFrame(frame)) => {
+                    if !self.disable_audio  {
+                        allow_err!(self.audio_sender.send(MediaData::AudioFrame(frame)));
+                    }
                 }
                 _ => {}
             }