hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opt: open audio when needed

Browse Source
This commit is contained in:
Kingtous 2023-02-07 19:40:50 +08:00
parent c4b1c51e9e
commit 86b88c2927
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/io_loop.rs
View File

@ -1251,8 +1251,9 @@ impl<T: InvokeUiSession> Remote<T> {
} }
Some(message::Union::VoiceCallRequest(request)) => { Some(message::Union::VoiceCallRequest(request)) => {
if request.is_connect { if request.is_connect {
// TODO: maybe we will do voice call from the peer in the future. // TODO: maybe we will do a voice call from the peer in the future.
} else { } else {
log::debug!("The remote has requested to close the voice call");
if let Some(sender) = self.stop_voice_call_sender.take() { if let Some(sender) = self.stop_voice_call_sender.take() {
allow_err!(sender.send(())); allow_err!(sender.send(()));
self.handler.on_voice_call_closed(""); self.handler.on_voice_call_closed("");

18
src/server/connection.rs
View File

@ -106,7 +106,7 @@ pub struct Connection {
// by peer // by peer
enable_file_transfer: bool, enable_file_transfer: bool,
// by peer // by peer
audio_sender: MediaSender, audio_sender: Option<MediaSender>,
// audio by the remote peer/client // audio by the remote peer/client
tx_input: std_mpsc::Sender<MessageInput>, tx_input: std_mpsc::Sender<MessageInput>,
// handle input messages // handle input messages
@ -184,11 +184,6 @@ impl Connection {
let mut hbbs_rx = crate::hbbs_http::sync::signal_receiver(); let mut hbbs_rx = crate::hbbs_http::sync::signal_receiver();
let tx_cloned = tx.clone(); let tx_cloned = tx.clone();
// Start a audio thread to play the audio sent by peer.
let latency_controller = LatencyController::new();
// No video frame will be sent here, so we need to disable latency controller, or audio check may fail.
latency_controller.lock().unwrap().set_audio_only(true);
let audio_sender = start_audio_thread(Some(latency_controller));
let mut conn = Self { let mut conn = Self {
inner: ConnInner { inner: ConnInner {
id, id,
@ -230,7 +225,7 @@ impl Connection {
#[cfg(windows)] #[cfg(windows)]
portable: Default::default(), portable: Default::default(),
from_switch: false, from_switch: false,
audio_sender, audio_sender: None,
voice_call_request_timestamp: None, voice_call_request_timestamp: None,
audio_input_device_before_voice_call: None, audio_input_device_before_voice_call: None,
}; };
@ -1569,7 +1564,14 @@ impl Connection {
}, },
Some(misc::Union::AudioFormat(format)) => { Some(misc::Union::AudioFormat(format)) => {
if !self.disable_audio { if !self.disable_audio {
allow_err!(self.audio_sender.send(MediaData::AudioFormat(format))); // Drop the audio sender previously.
std::mem::replace(&mut self.audio_sender, None);
// Start a audio thread to play the audio sent by peer.
let latency_controller = LatencyController::new();
// No video frame will be sent here, so we need to disable latency controller, or audio check may fail.
latency_controller.lock().unwrap().set_audio_only(true);
self.audio_sender = Some(start_audio_thread(Some(latency_controller)));
allow_err!(self.audio_sender.unwrap().send(MediaData::AudioFormat(format)));
} }
} }
#[cfg(feature = "flutter")] #[cfg(feature = "flutter")]