fix deadlock when creating VideoStream and AudioStream (#260)

livekit · Dec 7, 2023 · d6f7512 · d6f7512
1 parent 5724740
commit d6f7512
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/livekit-ffi/src/server/audio_stream.rs b/livekit-ffi/src/server/audio_stream.rs
@@ -43,7 +43,9 @@ impl FfiAudioStream {
         server: &'static server::FfiServer,
         new_stream: proto::NewAudioStreamRequest,
     ) -> FfiResult<proto::OwnedAudioStream> {
-        let ffi_track = server.retrieve_handle::<FfiTrack>(new_stream.track_handle)?;
+        let ffi_track = server
+            .retrieve_handle::<FfiTrack>(new_stream.track_handle)?
+            .clone();
         let rtc_track = ffi_track.track.rtc_track();
 
         let MediaStreamTrack::Audio(rtc_track) = rtc_track else {

diff --git a/livekit-ffi/src/server/video_stream.rs b/livekit-ffi/src/server/video_stream.rs
@@ -43,7 +43,9 @@ impl FfiVideoStream {
         server: &'static server::FfiServer,
         new_stream: proto::NewVideoStreamRequest,
     ) -> FfiResult<proto::OwnedVideoStream> {
-        let ffi_track = server.retrieve_handle::<FfiTrack>(new_stream.track_handle)?;
+        let ffi_track = server
+            .retrieve_handle::<FfiTrack>(new_stream.track_handle)?
+            .clone();
         let rtc_track = ffi_track.track.rtc_track();
 
         let MediaStreamTrack::Video(rtc_track) = rtc_track else {