Merge pull request #1104 from Heap-Hop/master

fix: android build & CONFIG deadlock
This commit is contained in:
RustDesk
2022-07-29 18:59:34 +08:00
committed by GitHub
Unverified
7 changed files with 48 additions and 21 deletions

View File

@@ -347,7 +347,7 @@ fn send_f32(data: &[f32], encoder: &mut Encoder, sp: &GenericService) {
Ok(data) => {
let mut msg_out = Message::new();
msg_out.set_audio_frame(AudioFrame {
data,
data: data.into(),
timestamp: crate::common::get_time(),
..Default::default()
});

View File

@@ -644,7 +644,7 @@ pub fn handle_one_frame_encoded(
})?;
let mut send_conn_ids: HashSet<i32> = Default::default();
let vp9_frame = EncodedVideoFrame {
data: frame.to_vec(),
data: frame.to_vec().into(),
key: true,
pts: ms,
..Default::default()