Skip to content

Commit 5a192df

Browse files
rogurotusrainliu
rogurotus
authored and
rainliu
committed
fmt
1 parent 65fc4df commit 5a192df

File tree

6 files changed

+43
-62
lines changed

6 files changed

+43
-62
lines changed

‎webrtc/src/api/media_engine/media_engine_test.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,8 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
532532
None,
533533
)?;
534534

535-
let params = m
536-
.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Recvonly);
535+
let params =
536+
m.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Recvonly);
537537

538538
assert_eq!(params.header_extensions.len(), 1);
539539
}
@@ -550,8 +550,8 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
550550
Some(RTCRtpTransceiverDirection::Recvonly),
551551
)?;
552552

553-
let params = m
554-
.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Recvonly);
553+
let params =
554+
m.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Recvonly);
555555

556556
assert_eq!(params.header_extensions.len(), 1);
557557
}
@@ -568,8 +568,8 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
568568
Some(RTCRtpTransceiverDirection::Sendonly),
569569
)?;
570570

571-
let params = m
572-
.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Recvonly);
571+
let params =
572+
m.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Recvonly);
573573

574574
assert_eq!(params.header_extensions.len(), 0);
575575
}
@@ -586,8 +586,8 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
586586
None,
587587
)?;
588588

589-
let params = m
590-
.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Inactive);
589+
let params =
590+
m.get_rtp_parameters_by_kind(RTPCodecType::Audio, RTCRtpTransceiverDirection::Inactive);
591591

592592
assert_eq!(params.header_extensions.len(), 1);
593593
}
@@ -761,8 +761,8 @@ a=rtpmap:111 opus/48000/2
761761
assert!(mid_audio_enabled);
762762
assert!(!mid_video_enabled);
763763

764-
let params = m
765-
.get_rtp_parameters_by_kind(RTPCodecType::Video, RTCRtpTransceiverDirection::Sendonly);
764+
let params =
765+
m.get_rtp_parameters_by_kind(RTPCodecType::Video, RTCRtpTransceiverDirection::Sendonly);
766766
dbg!(&params);
767767

768768
let orientation = params

‎webrtc/src/api/setting_engine/setting_engine_test.rs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,8 @@ async fn test_setting_engine_set_disable_media_engine_copy() -> Result<()> {
180180
.negotiated_video
181181
.load(Ordering::SeqCst));
182182
{
183-
let negotiated_video_codecs = offerer
184-
.internal
185-
.media_engine
186-
.negotiated_video_codecs
187-
.lock();
183+
let negotiated_video_codecs =
184+
offerer.internal.media_engine.negotiated_video_codecs.lock();
188185
assert!(!negotiated_video_codecs.is_empty());
189186
}
190187

@@ -199,11 +196,8 @@ async fn test_setting_engine_set_disable_media_engine_copy() -> Result<()> {
199196
.negotiated_video
200197
.load(Ordering::SeqCst));
201198
{
202-
let negotiated_video_codecs = offerer
203-
.internal
204-
.media_engine
205-
.negotiated_video_codecs
206-
.lock();
199+
let negotiated_video_codecs =
200+
offerer.internal.media_engine.negotiated_video_codecs.lock();
207201
assert!(!negotiated_video_codecs.is_empty());
208202
}
209203

@@ -264,11 +258,8 @@ async fn test_setting_engine_set_disable_media_engine_copy() -> Result<()> {
264258
.negotiated_video
265259
.load(Ordering::SeqCst));
266260
{
267-
let negotiated_video_codecs = offerer
268-
.internal
269-
.media_engine
270-
.negotiated_video_codecs
271-
.lock();
261+
let negotiated_video_codecs =
262+
offerer.internal.media_engine.negotiated_video_codecs.lock();
272263
assert!(!negotiated_video_codecs.is_empty());
273264
}
274265

‎webrtc/src/peer_connection/sdp/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,7 @@ pub(crate) async fn add_transceiver_sdp(
502502
return Ok((d, false));
503503
}
504504

505-
let parameters = media_engine
506-
.get_rtp_parameters_by_kind(t.kind, t.direction());
505+
let parameters = media_engine.get_rtp_parameters_by_kind(t.kind, t.direction());
507506
for rtp_extension in &parameters.header_extensions {
508507
let ext_url = Url::parse(rtp_extension.uri.as_str())?;
509508
media = media.with_extmap(sdp::extmap::ExtMap {

‎webrtc/src/peer_connection/sdp/sdp_test.rs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,7 @@ async fn test_media_description_fingerprints() -> Result<()> {
601601
video_sender,
602602
RTCRtpTransceiverDirection::Inactive,
603603
RTPCodecType::Video,
604-
api.media_engine
605-
.get_codecs_by_kind(RTPCodecType::Video),
604+
api.media_engine.get_codecs_by_kind(RTPCodecType::Video),
606605
Arc::clone(&api.media_engine),
607606
None,
608607
)
@@ -618,8 +617,7 @@ async fn test_media_description_fingerprints() -> Result<()> {
618617
audio_sender,
619618
RTCRtpTransceiverDirection::Inactive,
620619
RTPCodecType::Audio,
621-
api.media_engine
622-
.get_codecs_by_kind(RTPCodecType::Audio),
620+
api.media_engine.get_codecs_by_kind(RTPCodecType::Audio),
623621
Arc::clone(&api.media_engine),
624622
None,
625623
)
@@ -644,18 +642,17 @@ async fn test_media_description_fingerprints() -> Result<()> {
644642
"video".to_owned(),
645643
"webrtc-rs".to_owned(),
646644
));
647-
media[i].transceivers[0]
648-
.set_sender(Arc::new(
649-
RTCRtpSender::new(
650-
api.setting_engine.get_receive_mtu(),
651-
Some(track),
652-
Arc::new(RTCDtlsTransport::default()),
653-
Arc::clone(&api.media_engine),
654-
Arc::clone(&interceptor),
655-
false,
656-
)
657-
.await,
658-
));
645+
media[i].transceivers[0].set_sender(Arc::new(
646+
RTCRtpSender::new(
647+
api.setting_engine.get_receive_mtu(),
648+
Some(track),
649+
Arc::new(RTCDtlsTransport::default()),
650+
Arc::clone(&api.media_engine),
651+
Arc::clone(&interceptor),
652+
false,
653+
)
654+
.await,
655+
));
659656
media[i].transceivers[0].set_direction_internal(RTCRtpTransceiverDirection::Sendonly);
660657
}
661658

‎webrtc/src/rtp_transceiver/mod.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ pub type TriggerNegotiationNeededFnOption =
174174

175175
/// RTPTransceiver represents a combination of an RTPSender and an RTPReceiver that share a common mid.
176176
pub struct RTCRtpTransceiver {
177-
mid: OnceCell<String>, //atomic.Value
178-
sender: SyncMutex<Arc<RTCRtpSender>>, //atomic.Value
179-
receiver: Mutex<Arc<RTCRtpReceiver>>, //atomic.Value
177+
mid: OnceCell<String>, //atomic.Value
178+
sender: SyncMutex<Arc<RTCRtpSender>>, //atomic.Value
179+
receiver: Mutex<Arc<RTCRtpReceiver>>, //atomic.Value
180180

181181
direction: AtomicU8, //RTPTransceiverDirection
182182
current_direction: AtomicU8, //RTPTransceiverDirection
@@ -220,8 +220,7 @@ impl RTCRtpTransceiver {
220220
media_engine,
221221
trigger_negotiation_needed: Mutex::new(trigger_negotiation_needed),
222222
});
223-
t.sender()
224-
.set_rtp_transceiver(Some(Arc::downgrade(&t)));
223+
t.sender().set_rtp_transceiver(Some(Arc::downgrade(&t)));
225224

226225
t
227226
}

‎webrtc/src/rtp_transceiver/rtp_sender/mod.rs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,7 @@ impl RTCRtpSender {
219219
self.negotiated.store(true, Ordering::SeqCst);
220220
}
221221

222-
pub(crate) fn set_rtp_transceiver(
223-
&self,
224-
rtp_transceiver: Option<Weak<RTCRtpTransceiver>>,
225-
) {
222+
pub(crate) fn set_rtp_transceiver(&self, rtp_transceiver: Option<Weak<RTCRtpTransceiver>>) {
226223
if let Some(t) = rtp_transceiver.as_ref().and_then(|t| t.upgrade()) {
227224
self.set_paused(!t.direction().has_send());
228225
}
@@ -388,16 +385,14 @@ impl RTCRtpSender {
388385
let track = self.track.lock().await;
389386
let mut context = TrackLocalContext {
390387
id: self.id.clone(),
391-
params: self
392-
.media_engine
393-
.get_rtp_parameters_by_kind(
394-
if let Some(t) = &*track {
395-
t.kind()
396-
} else {
397-
RTPCodecType::default()
398-
},
399-
RTCRtpTransceiverDirection::Sendonly,
400-
),
388+
params: self.media_engine.get_rtp_parameters_by_kind(
389+
if let Some(t) = &*track {
390+
t.kind()
391+
} else {
392+
RTPCodecType::default()
393+
},
394+
RTCRtpTransceiverDirection::Sendonly,
395+
),
401396
ssrc: parameters.encodings[0].ssrc,
402397
write_stream: Some(
403398
Arc::clone(&write_stream) as Arc<dyn TrackLocalWriter + Send + Sync>

0 commit comments

Comments
 (0)