refarctor params

Author: rogurotus

examples/examples/broadcast/broadcast.rs

@@ -155,7 +155,7 @@ async fn main() -> Result<()> {
         tokio::spawn(async move {
             // Create Track that we send video back to browser on
             let local_track = Arc::new(TrackLocalStaticRTP::new(
-                track.codec().await.capability,
+                track.codec().capability,
                 "video".to_owned(),
                 "webrtc-rs".to_owned(),
             ));

examples/examples/reflect/reflect.rs

@@ -242,7 +242,7 @@ async fn main() -> Result<()> {
             println!(
                 "Track has started, of type {}: {}",
                 track.payload_type(),
-                track.codec().await.capability.mime_type
+                track.codec().capability.mime_type
             );
             // Read RTP packets being sent to webrtc-rs
             while let Ok((rtp, _)) = track.read_rtp().await {
@@ -255,7 +255,7 @@ async fn main() -> Result<()> {
             println!(
                 "on_track finished, of type {}: {}",
                 track.payload_type(),
-                track.codec().await.capability.mime_type
+                track.codec().capability.mime_type
             );
         });
 

examples/examples/save-to-disk-h264/save-to-disk-h264.rs

@@ -233,7 +233,7 @@ async fn main() -> Result<()> {
         let h264_writer2 = Arc::clone(&h264_writer);
         let ogg_writer2 = Arc::clone(&ogg_writer);
         Box::pin(async move {
-            let codec = track.codec().await;
+            let codec = track.codec();
             let mime_type = codec.capability.mime_type.to_lowercase();
             if mime_type == MIME_TYPE_OPUS.to_lowercase() {
                 println!("Got Opus track, saving to disk as output.opus (48 kHz, 2 channels)");

examples/examples/save-to-disk-vpx/save-to-disk-vpx.rs

@@ -258,7 +258,7 @@ async fn main() -> Result<()> {
         let ivf_writer2 = Arc::clone(&ivf_writer);
         let ogg_writer2 = Arc::clone(&ogg_writer);
         Box::pin(async move {
-            let codec = track.codec().await;
+            let codec = track.codec();
             let mime_type = codec.capability.mime_type.to_lowercase();
             if mime_type == MIME_TYPE_OPUS.to_lowercase() {
                 println!("Got Opus track, saving to disk as output.opus (48 kHz, 2 channels)");

examples/examples/swap-tracks/swap-tracks.rs

@@ -153,7 +153,7 @@ async fn main() -> Result<()> {
             println!(
                 "Track has started, of type {}: {}",
                 track.payload_type(),
-                track.codec().await.capability.mime_type
+                track.codec().capability.mime_type
             );
 
             let mut last_timestamp = 0;
@@ -196,7 +196,7 @@ async fn main() -> Result<()> {
             println!(
                 "Track has ended, of type {}: {}",
                 track.payload_type(),
-                track.codec().await.capability.mime_type
+                track.codec().capability.mime_type
             );
         });
 

webrtc/src/rtp_transceiver/rtp_receiver/mod.rs

@@ -477,7 +477,7 @@ impl RTCRtpReceiver {
             }
 
             let current_track = &t.track;
-            current_track.set_codec(codec.clone()).await;
+            current_track.set_codec(codec.clone());
             current_track.set_params(params.clone()).await;
         }
     }
@@ -752,7 +752,7 @@ impl RTCRtpReceiver {
             if t.track.rid() == rid {
                 t.track.set_kind(self.kind);
                 if let Some(codec) = params.codecs.first() {
-                    t.track.set_codec(codec.clone()).await;
+                    t.track.set_codec(codec.clone());
                 }
                 t.track.set_params(params.clone()).await;
                 t.track

webrtc/src/rtp_transceiver/rtp_receiver/rtp_receiver_test.rs

@@ -92,7 +92,7 @@ async fn test_set_rtp_parameters() -> Result<()> {
             receiver.set_rtp_parameters(P.clone()).await;
 
             if let Some(t) = receiver.track().await {
-                let incoming_track_codecs = t.codec().await;
+                let incoming_track_codecs = t.codec();
 
                 assert_eq!(P.header_extensions, t.params().await.header_extensions);
                 assert_eq!(

webrtc/src/rtp_transceiver/rtp_sender/rtp_sender_test.rs

@@ -74,10 +74,10 @@ async fn test_rtp_sender_replace_track() -> Result<()> {
 
             let last = pkt.payload[pkt.payload.len() - 1];
             if last == 0xAA {
-                assert_eq!(track.codec().await.capability.mime_type, MIME_TYPE_VP8);
+                assert_eq!(track.codec().capability.mime_type, MIME_TYPE_VP8);
                 let _ = seen_packet_a_tx2.send(()).await;
             } else if last == 0xBB {
-                assert_eq!(track.codec().await.capability.mime_type, MIME_TYPE_H264);
+                assert_eq!(track.codec().capability.mime_type, MIME_TYPE_H264);
                 let _ = seen_packet_b_tx2.send(()).await;
             } else {
                 panic!("Unexpected RTP Data {last:02x}");

webrtc/src/track/track_local/track_local_static_test.rs

@@ -259,7 +259,7 @@ async fn test_track_local_static_payload_type() -> Result<()> {
         let on_track_fired_tx2 = Arc::clone(&on_track_fired_tx);
         Box::pin(async move {
             assert_eq!(track.payload_type(), 100);
-            assert_eq!(track.codec().await.capability.mime_type, MIME_TYPE_VP8);
+            assert_eq!(track.codec().capability.mime_type, MIME_TYPE_VP8);
             {
                 log::debug!("onTrackFiredFunc!!!");
                 let mut done = on_track_fired_tx2.lock().await;

webrtc/src/track/track_remote/mod.rs

@@ -48,7 +48,7 @@ pub struct TrackRemote {
     kind: AtomicU8,         //RTPCodecType,
     ssrc: AtomicU32,        //SSRC,
     codec: SyncMutex<RTCRtpCodecParameters>,
-    pub(crate) params: Mutex<RTCRtpParameters>,
+    pub(crate) params: SyncMutex<RTCRtpParameters>,
     rid: String,
 
     media_engine: Arc<MediaEngine>,
@@ -173,23 +173,23 @@ impl TrackRemote {
     }
 
     /// codec gets the Codec of the track
-    pub async fn codec(&self) -> RTCRtpCodecParameters {
+    pub fn codec(&self) -> RTCRtpCodecParameters {
         let codec = self.codec.lock();
         codec.clone()
     }
 
-    pub async fn set_codec(&self, codec: RTCRtpCodecParameters) {
+    pub fn set_codec(&self, codec: RTCRtpCodecParameters) {
         let mut c = self.codec.lock();
         *c = codec;
     }
 
     pub async fn params(&self) -> RTCRtpParameters {
-        let p = self.params.lock().await;
+        let p = self.params.lock();
         p.clone()
     }
 
     pub async fn set_params(&self, params: RTCRtpParameters) {
-        let mut p = self.params.lock().await;
+        let mut p = self.params.lock();
         *p = params;
     }
 
@@ -266,7 +266,7 @@ impl TrackRemote {
                 };
             }
             {
-                let mut params = self.params.lock().await;
+                let mut params = self.params.lock();
                 *params = p;
             }
         }