sync get receiver

Author: rogurotus

webrtc/src/peer_connection/mod.rs

@@ -1654,7 +1654,7 @@ impl RTCPeerConnection {
         let mut receivers = vec![];
         let rtp_transceivers = self.internal.rtp_transceivers.lock().await;
         for transceiver in &*rtp_transceivers {
-            receivers.push(transceiver.receiver().await);
+            receivers.push(transceiver.receiver());
         }
         receivers
     }

webrtc/src/peer_connection/peer_connection_internal.rs

@@ -166,7 +166,7 @@ impl PeerConnectionInternal {
             self.undeclared_media_processor();
         } else {
             for t in &current_transceivers {
-                let receiver = t.receiver().await;
+                let receiver = t.receiver();
                 let tracks = receiver.tracks().await;
                 if tracks.is_empty() {
                     continue;
@@ -216,7 +216,7 @@ impl PeerConnectionInternal {
                     Arc::clone(&self.media_engine),
                     interceptor,
                 ));
-                t.set_receiver(receiver).await;
+                t.set_receiver(receiver);
             }
         }
 
@@ -337,7 +337,7 @@ impl PeerConnectionInternal {
         for incoming_track in incoming_tracks {
             // If we already have a TrackRemote for a given SSRC don't handle it again
             for t in local_transceivers {
-                let receiver = t.receiver().await;
+                let receiver = t.receiver();
                 for track in receiver.tracks().await {
                     for ssrc in &incoming_track.ssrcs {
                         if *ssrc == track.ssrc() {
@@ -363,7 +363,7 @@ impl PeerConnectionInternal {
                     continue;
                 }
 
-                let receiver = t.receiver().await;
+                let receiver = t.receiver();
                 if receiver.have_received().await {
                     continue;
                 }
@@ -886,7 +886,7 @@ impl PeerConnectionInternal {
             )
             .await?;
 
-        let receiver = t.receiver().await;
+        let receiver = t.receiver();
         PeerConnectionInternal::start_receiver(
             self.setting_engine.get_receive_mtu(),
             &incoming,
@@ -1004,7 +1004,7 @@ impl PeerConnectionInternal {
                     continue;
                 }
 
-                let receiver = t.receiver().await;
+                let receiver = t.receiver();
 
                 if !rsid.is_empty() {
                     return receiver
@@ -1206,7 +1206,7 @@ impl PeerConnectionInternal {
         }
         let mut track_infos = vec![];
         for transeiver in transceivers {
-            let receiver = transeiver.receiver().await;
+            let receiver = transeiver.receiver();
 
             if let Some(mid) = transeiver.mid() {
                 let tracks = receiver.tracks().await;

webrtc/src/rtp_transceiver/mod.rs

@@ -174,9 +174,9 @@ pub type TriggerNegotiationNeededFnOption =
 
 /// RTPTransceiver represents a combination of an RTPSender and an RTPReceiver that share a common mid.
 pub struct RTCRtpTransceiver {
-    mid: OnceCell<String>,                //atomic.Value
-    sender: SyncMutex<Arc<RTCRtpSender>>, //atomic.Value
-    receiver: Mutex<Arc<RTCRtpReceiver>>, //atomic.Value
+    mid: OnceCell<String>,                    //atomic.Value
+    sender: SyncMutex<Arc<RTCRtpSender>>,     //atomic.Value
+    receiver: SyncMutex<Arc<RTCRtpReceiver>>, //atomic.Value
 
     direction: AtomicU8,         //RTPTransceiverDirection
     current_direction: AtomicU8, //RTPTransceiverDirection
@@ -203,13 +203,12 @@ impl RTCRtpTransceiver {
     ) -> Arc<Self> {
         let codecs = Arc::new(Mutex::new(codecs));
         receiver
-            .set_transceiver_codecs(Some(Arc::clone(&codecs)))
-            .await;
+            .set_transceiver_codecs(Some(Arc::clone(&codecs)));
 
         let t = Arc::new(RTCRtpTransceiver {
             mid: OnceCell::new(),
             sender: SyncMutex::new(sender),
-            receiver: Mutex::new(receiver),
+            receiver: SyncMutex::new(receiver),
 
             direction: AtomicU8::new(direction as u8),
             current_direction: AtomicU8::new(RTCRtpTransceiverDirection::Unspecified as u8),
@@ -278,18 +277,17 @@ impl RTCRtpTransceiver {
     }
 
     /// receiver returns the RTPTransceiver's RTPReceiver if it has one
-    pub async fn receiver(&self) -> Arc<RTCRtpReceiver> {
-        let receiver = self.receiver.lock().await;
+    pub fn receiver(&self) -> Arc<RTCRtpReceiver> {
+        let receiver = self.receiver.lock();
         receiver.clone()
     }
 
-    pub(crate) async fn set_receiver(&self, r: Arc<RTCRtpReceiver>) {
-        r.set_transceiver_codecs(Some(Arc::clone(&self.codecs)))
-            .await;
+    pub(crate) fn set_receiver(&self, r: Arc<RTCRtpReceiver>) {
+        r.set_transceiver_codecs(Some(Arc::clone(&self.codecs)));
 
         {
-            let mut receiver = self.receiver.lock().await;
-            (*receiver).set_transceiver_codecs(None).await;
+            let mut receiver = self.receiver.lock();
+            (*receiver).set_transceiver_codecs(None);
 
             *receiver = r;
         }
@@ -399,7 +397,7 @@ impl RTCRtpTransceiver {
         }
 
         {
-            let receiver = self.receiver.lock().await;
+            let receiver = self.receiver.lock().clone();
             let pause_receiver = !current_direction.has_recv();
 
             if pause_receiver {
@@ -431,7 +429,7 @@ impl RTCRtpTransceiver {
             sender.stop().await?;
         }
         {
-            let r = self.receiver.lock().await;
+            let r = self.receiver.lock();
             r.stop().await?;
         }
 

webrtc/src/rtp_transceiver/rtp_receiver/mod.rs

@@ -16,6 +16,7 @@ use crate::rtp_transceiver::{
 use crate::track::track_remote::TrackRemote;
 use crate::track::{TrackStream, TrackStreams};
 
+use arc_swap::ArcSwapOption;
 use interceptor::stream_info::RTPHeaderExtension;
 use interceptor::{Attributes, Interceptor};
 use log::trace;
@@ -151,7 +152,7 @@ pub struct RTPReceiverInternal {
 
     tracks: RwLock<Vec<TrackStreams>>,
 
-    transceiver_codecs: Mutex<Option<Arc<Mutex<Vec<RTCRtpCodecParameters>>>>>,
+    transceiver_codecs: ArcSwapOption<Mutex<Vec<RTCRtpCodecParameters>>>,
 
     transport: Arc<RTCDtlsTransport>,
     media_engine: Arc<MediaEngine>,
@@ -314,7 +315,7 @@ impl RTPReceiverInternal {
             .media_engine
             .get_rtp_parameters_by_kind(self.kind, RTCRtpTransceiverDirection::Recvonly);
 
-        let transceiver_codecs = self.transceiver_codecs.lock().await;
+        let transceiver_codecs = self.transceiver_codecs.load();
         if let Some(codecs) = &*transceiver_codecs {
             let mut c = codecs.lock().await;
             parameters.codecs =
@@ -426,7 +427,7 @@ impl RTCRtpReceiver {
                 state_tx,
                 state_rx,
 
-                transceiver_codecs: Mutex::new(None),
+                transceiver_codecs: ArcSwapOption::new(None),
             }),
         }
     }
@@ -435,12 +436,11 @@ impl RTCRtpReceiver {
         self.kind
     }
 
-    pub(crate) async fn set_transceiver_codecs(
+    pub(crate) fn set_transceiver_codecs(
         &self,
         codecs: Option<Arc<Mutex<Vec<RTCRtpCodecParameters>>>>,
     ) {
-        let mut transceiver_codecs = self.internal.transceiver_codecs.lock().await;
-        *transceiver_codecs = codecs;
+        self.internal.transceiver_codecs.store(codecs);
     }
 
     /// transport returns the currently-configured *DTLSTransport or nil