mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use unified plan for 1:1 calls

Browse source
This commit is contained in:
Rashad Sookram 2023-11-15 17:12:25 -05:00 committed by GitHub
parent c8bf0736a0
commit c632a4acfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ringrtc/rffi/src/peer_connection.cc
View file

@ -414,6 +414,8 @@ Rust_sessionDescriptionFromV4(bool offer,
// We'll set it around just in case. // We'll set it around just in case.
// But everything seems to work fine without it. // But everything seems to work fine without it.
stream->cname = "CNAMECNAMECNAME!"; stream->cname = "CNAMECNAMECNAME!";
stream->set_stream_ids({"s"});
} }
audio->AddStream(audio_stream); audio->AddStream(audio_stream);
@ -439,8 +441,7 @@ Rust_sessionDescriptionFromV4(bool offer,
bundle.AddContentName(video_content_name); bundle.AddContentName(video_content_name);
session->AddGroup(bundle); session->AddGroup(bundle);
// This is the default and used for "Plan B" SDP, which is what we use in V1, V2, and V3. session->set_msid_signaling(cricket::kMsidSignalingMediaSection);
session->set_msid_signaling(cricket::kMsidSignalingSsrcAttribute);
auto typ = offer ? SdpType::kOffer : SdpType::kAnswer; auto typ = offer ? SdpType::kOffer : SdpType::kAnswer;
return new webrtc::JsepSessionDescription(typ, std::move(session), "1", "1"); return new webrtc::JsepSessionDescription(typ, std::move(session), "1", "1");

6
ringrtc/rffi/src/peer_connection_factory.cc
View file

@ -384,7 +384,11 @@ RUSTEXPORT PeerConnectionInterface* Rust_createPeerConnection(
config.audio_jitter_buffer_max_packets = audio_jitter_buffer_max_packets; config.audio_jitter_buffer_max_packets = audio_jitter_buffer_max_packets;
config.set_audio_jitter_buffer_max_target_delay_ms(audio_jitter_buffer_max_target_delay_ms); config.set_audio_jitter_buffer_max_target_delay_ms(audio_jitter_buffer_max_target_delay_ms);
config.set_audio_rtcp_report_interval_ms(audio_rtcp_report_interval_ms); config.set_audio_rtcp_report_interval_ms(audio_rtcp_report_interval_ms);
config.sdp_semantics = SdpSemantics::kPlanB_DEPRECATED; if (kind == RffiPeerConnectionKind::kGroupCall) {
config.sdp_semantics = SdpSemantics::kPlanB_DEPRECATED;
} else {
config.sdp_semantics = SdpSemantics::kUnifiedPlan;
}
if (ice_server.urls_size > 0) { if (ice_server.urls_size > 0) {
webrtc::PeerConnectionInterface::IceServer rtc_ice_server; webrtc::PeerConnectionInterface::IceServer rtc_ice_server;
rtc_ice_server.username = std::string(ice_server.username_borrowed); rtc_ice_server.username = std::string(ice_server.username_borrowed);

3
sdk/objc/api/peerconnection/RTCConfiguration.mm
View file

@ -69,8 +69,7 @@
- (instancetype)init { - (instancetype)init {
// Copy defaults. // Copy defaults.
webrtc::PeerConnectionInterface::RTCConfiguration config; webrtc::PeerConnectionInterface::RTCConfiguration config;
// RingRTC Change to use "Plan B" config.sdp_semantics = webrtc::SdpSemantics::kUnifiedPlan;
config.sdp_semantics = webrtc::SdpSemantics::kPlanB_DEPRECATED;
return [self initWithNativeConfiguration:config]; return [self initWithNativeConfiguration:config];
} }