Skip to content

Commit fa3b0a1

Browse files
jelmansourirainliu
jelmansouri
authored and
rainliu
committed
Remove unecessary async calls
1 parent 036cf87 commit fa3b0a1

File tree

3 files changed

+75
-101
lines changed

3 files changed

+75
-101
lines changed

‎src/api/interceptor_registry/mod.rs

Lines changed: 48 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ use interceptor::twcc::{receiver::Receiver, sender::Sender};
1414
/// register_default_interceptors will register some useful interceptors.
1515
/// If you want to customize which interceptors are loaded, you should copy the
1616
/// code from this method and remove unwanted interceptors.
17-
pub async fn register_default_interceptors(
17+
pub fn register_default_interceptors(
1818
mut registry: Registry,
1919
media_engine: &mut MediaEngine,
2020
) -> Result<Registry> {
2121
registry = configure_nack(registry, media_engine);
2222

2323
registry = configure_rtcp_reports(registry);
2424

25-
registry = configure_twcc_receiver_only(registry, media_engine).await?;
25+
registry = configure_twcc_receiver_only(registry, media_engine)?;
2626

2727
Ok(registry)
2828
}
@@ -62,26 +62,21 @@ pub fn configure_nack(mut registry: Registry, media_engine: &mut MediaEngine) ->
6262

6363
/// configure_twcc will setup everything necessary for adding
6464
/// a TWCC header extension to outgoing RTP packets and generating TWCC reports.
65-
pub async fn configure_twcc(
66-
mut registry: Registry,
67-
media_engine: &mut MediaEngine,
68-
) -> Result<Registry> {
65+
pub fn configure_twcc(mut registry: Registry, media_engine: &mut MediaEngine) -> Result<Registry> {
6966
media_engine.register_feedback(
7067
RTCPFeedback {
7168
typ: TYPE_RTCP_FB_TRANSPORT_CC.to_owned(),
7269
..Default::default()
7370
},
7471
RTPCodecType::Video,
7572
);
76-
media_engine
77-
.register_header_extension(
78-
RTCRtpHeaderExtensionCapability {
79-
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
80-
},
81-
RTPCodecType::Video,
82-
vec![],
83-
)
84-
.await?;
73+
media_engine.register_header_extension(
74+
RTCRtpHeaderExtensionCapability {
75+
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
76+
},
77+
RTPCodecType::Video,
78+
vec![],
79+
)?;
8580

8681
media_engine.register_feedback(
8782
RTCPFeedback {
@@ -90,15 +85,13 @@ pub async fn configure_twcc(
9085
},
9186
RTPCodecType::Audio,
9287
);
93-
media_engine
94-
.register_header_extension(
95-
RTCRtpHeaderExtensionCapability {
96-
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
97-
},
98-
RTPCodecType::Audio,
99-
vec![],
100-
)
101-
.await?;
88+
media_engine.register_header_extension(
89+
RTCRtpHeaderExtensionCapability {
90+
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
91+
},
92+
RTPCodecType::Audio,
93+
vec![],
94+
)?;
10295

10396
let sender = Box::new(Sender::builder());
10497
let receiver = Box::new(Receiver::builder());
@@ -109,37 +102,33 @@ pub async fn configure_twcc(
109102

110103
/// configure_twcc_sender will setup everything necessary for adding
111104
/// a TWCC header extension to outgoing RTP packets. This will allow the remote peer to generate TWCC reports.
112-
pub async fn configure_twcc_sender_only(
105+
pub fn configure_twcc_sender_only(
113106
mut registry: Registry,
114107
media_engine: &mut MediaEngine,
115108
) -> Result<Registry> {
116-
media_engine
117-
.register_header_extension(
118-
RTCRtpHeaderExtensionCapability {
119-
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
120-
},
121-
RTPCodecType::Video,
122-
vec![],
123-
)
124-
.await?;
125-
126-
media_engine
127-
.register_header_extension(
128-
RTCRtpHeaderExtensionCapability {
129-
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
130-
},
131-
RTPCodecType::Audio,
132-
vec![],
133-
)
134-
.await?;
109+
media_engine.register_header_extension(
110+
RTCRtpHeaderExtensionCapability {
111+
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
112+
},
113+
RTPCodecType::Video,
114+
vec![],
115+
)?;
116+
117+
media_engine.register_header_extension(
118+
RTCRtpHeaderExtensionCapability {
119+
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
120+
},
121+
RTPCodecType::Audio,
122+
vec![],
123+
)?;
135124

136125
let sender = Box::new(Sender::builder());
137126
registry.add(sender);
138127
Ok(registry)
139128
}
140129

141130
/// configure_twcc_receiver will setup everything necessary for generating TWCC reports.
142-
pub async fn configure_twcc_receiver_only(
131+
pub fn configure_twcc_receiver_only(
143132
mut registry: Registry,
144133
media_engine: &mut MediaEngine,
145134
) -> Result<Registry> {
@@ -150,15 +139,13 @@ pub async fn configure_twcc_receiver_only(
150139
},
151140
RTPCodecType::Video,
152141
);
153-
media_engine
154-
.register_header_extension(
155-
RTCRtpHeaderExtensionCapability {
156-
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
157-
},
158-
RTPCodecType::Video,
159-
vec![],
160-
)
161-
.await?;
142+
media_engine.register_header_extension(
143+
RTCRtpHeaderExtensionCapability {
144+
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
145+
},
146+
RTPCodecType::Video,
147+
vec![],
148+
)?;
162149

163150
media_engine.register_feedback(
164151
RTCPFeedback {
@@ -167,15 +154,13 @@ pub async fn configure_twcc_receiver_only(
167154
},
168155
RTPCodecType::Audio,
169156
);
170-
media_engine
171-
.register_header_extension(
172-
RTCRtpHeaderExtensionCapability {
173-
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
174-
},
175-
RTPCodecType::Audio,
176-
vec![],
177-
)
178-
.await?;
157+
media_engine.register_header_extension(
158+
RTCRtpHeaderExtensionCapability {
159+
uri: sdp::extmap::TRANSPORT_CC_URI.to_owned(),
160+
},
161+
RTPCodecType::Audio,
162+
vec![],
163+
)?;
179164

180165
let receiver = Box::new(Receiver::builder());
181166
registry.add(receiver);

‎src/api/media_engine/media_engine_test.rs

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,7 @@ a=rtpmap:111 opus/48000/2
190190
},
191191
RTPCodecType::Audio,
192192
vec![],
193-
)
194-
.await?;
193+
)?;
195194
}
196195

197196
m.update_from_remote_description(&must_parse(HEADER_EXTENSIONS)?)
@@ -531,8 +530,7 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
531530
},
532531
RTPCodecType::Audio,
533532
vec![],
534-
)
535-
.await?;
533+
)?;
536534

537535
let params = m
538536
.get_rtp_parameters_by_kind(
@@ -554,8 +552,7 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
554552
},
555553
RTPCodecType::Audio,
556554
vec![RTCRtpTransceiverDirection::Recvonly],
557-
)
558-
.await?;
555+
)?;
559556

560557
let params = m
561558
.get_rtp_parameters_by_kind(
@@ -577,8 +574,7 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
577574
},
578575
RTPCodecType::Audio,
579576
vec![RTCRtpTransceiverDirection::Sendonly],
580-
)
581-
.await?;
577+
)?;
582578

583579
let params = m
584580
.get_rtp_parameters_by_kind(
@@ -595,44 +591,38 @@ async fn test_media_engine_header_extension_direction() -> Result<()> {
595591
let mut m = MediaEngine::default();
596592
register_codec(&mut m)?;
597593

598-
let result = m
599-
.register_header_extension(
600-
RTCRtpHeaderExtensionCapability {
601-
uri: "webrtc-header-test".to_owned(),
602-
},
603-
RTPCodecType::Audio,
604-
vec![RTCRtpTransceiverDirection::Sendrecv],
605-
)
606-
.await;
594+
let result = m.register_header_extension(
595+
RTCRtpHeaderExtensionCapability {
596+
uri: "webrtc-header-test".to_owned(),
597+
},
598+
RTPCodecType::Audio,
599+
vec![RTCRtpTransceiverDirection::Sendrecv],
600+
);
607601
if let Err(err) = result {
608602
assert_eq!(Error::ErrRegisterHeaderExtensionInvalidDirection, err);
609603
} else {
610604
assert!(false);
611605
}
612606

613-
let result = m
614-
.register_header_extension(
615-
RTCRtpHeaderExtensionCapability {
616-
uri: "webrtc-header-test".to_owned(),
617-
},
618-
RTPCodecType::Audio,
619-
vec![RTCRtpTransceiverDirection::Inactive],
620-
)
621-
.await;
607+
let result = m.register_header_extension(
608+
RTCRtpHeaderExtensionCapability {
609+
uri: "webrtc-header-test".to_owned(),
610+
},
611+
RTPCodecType::Audio,
612+
vec![RTCRtpTransceiverDirection::Inactive],
613+
);
622614
if let Err(err) = result {
623615
assert_eq!(Error::ErrRegisterHeaderExtensionInvalidDirection, err);
624616
} else {
625617
assert!(false);
626618
}
627-
let result = m
628-
.register_header_extension(
629-
RTCRtpHeaderExtensionCapability {
630-
uri: "webrtc-header-test".to_owned(),
631-
},
632-
RTPCodecType::Audio,
633-
vec![RTCRtpTransceiverDirection::Unspecified],
634-
)
635-
.await;
619+
let result = m.register_header_extension(
620+
RTCRtpHeaderExtensionCapability {
621+
uri: "webrtc-header-test".to_owned(),
622+
},
623+
RTPCodecType::Audio,
624+
vec![RTCRtpTransceiverDirection::Unspecified],
625+
);
636626
if let Err(err) = result {
637627
assert_eq!(Error::ErrRegisterHeaderExtensionInvalidDirection, err);
638628
} else {
@@ -724,8 +714,7 @@ async fn test_update_header_extenstion_to_cloned_media_engine() -> Result<()> {
724714
},
725715
RTPCodecType::Audio,
726716
vec![],
727-
)
728-
.await?;
717+
)?;
729718

730719
validate(&m).await?;
731720
validate(&m.clone_to()).await?;

‎src/api/media_engine/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ impl MediaEngine {
414414

415415
/// register_header_extension adds a header extension to the MediaEngine
416416
/// To determine the negotiated value use `GetHeaderExtensionID` after signaling is complete
417-
pub async fn register_header_extension(
417+
pub fn register_header_extension(
418418
&mut self,
419419
extension: RTCRtpHeaderExtensionCapability,
420420
typ: RTPCodecType,

0 commit comments

Comments
 (0)