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

don't handle audio frame util ready

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-03-29 07:32:35 +08:00
parent 81bc362b2b
commit bdc11eb035
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client.rs
View File

@ -706,6 +706,8 @@ pub struct AudioHandler {
#[cfg(not(any(target_os = "android", target_os = "linux")))] #[cfg(not(any(target_os = "android", target_os = "linux")))]
audio_stream: Option<Box<dyn StreamTrait>>, audio_stream: Option<Box<dyn StreamTrait>>,
channels: u16, channels: u16,
#[cfg(not(any(target_os = "android", target_os = "linux")))]
ready: Arc<std::sync::Mutex<bool>>,
} }
impl AudioHandler { impl AudioHandler {
@ -794,7 +796,7 @@ impl AudioHandler {
#[inline] #[inline]
pub fn handle_frame(&mut self, frame: AudioFrame) { pub fn handle_frame(&mut self, frame: AudioFrame) {
#[cfg(not(any(target_os = "android", target_os = "linux")))] #[cfg(not(any(target_os = "android", target_os = "linux")))]
if self.audio_stream.is_none() { if self.audio_stream.is_none() || !self.ready.lock().unwrap().clone() {
return; return;
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
@ -860,9 +862,13 @@ impl AudioHandler {
log::trace!("an error occurred on stream: {}", err); log::trace!("an error occurred on stream: {}", err);
}; };
let audio_buffer = self.audio_buffer.clone(); let audio_buffer = self.audio_buffer.clone();
let ready = self.ready.clone();
let stream = device.build_output_stream( let stream = device.build_output_stream(
config, config,
move |data: &mut [T], _: &_| { move |data: &mut [T], _: &_| {
if !*ready.lock().unwrap() {
*ready.lock().unwrap() = true;
}
let mut lock = audio_buffer.lock().unwrap(); let mut lock = audio_buffer.lock().unwrap();
let mut n = data.len(); let mut n = data.len();
if lock.len() < n { if lock.len() < n {