admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Make dcSCTP the default SCTP implementation"

Browse Source 
This reverts commit 035e97a447455bdd434b6d775b824d3ee2bb2c8c.

Reason for revert: Breaks downstream projects.

Original change's description:
> Make dcSCTP the default SCTP implementation
>
> To disable dcSCTP and fallback to usrsctp, you can use the field trial
> WebRTC-DataChannel-Dcsctp/Disabled/
>
> Bug: chromium:1243702
> Change-Id: Ia90b796562245558a61481317bcded437400b045
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251800
> Auto-Submit: Florent Castelli <orphis@webrtc.org>
> Commit-Queue: Florent Castelli <orphis@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36018}

TBR=hta@webrtc.org,orphis@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: Id4767920abc9a4d934b5d9bb49ea0b2178df950b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1243702
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251862
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Christoffer Jansson <jansson@google.com>
Cr-Commit-Position: refs/heads/main@{#36022}
This commit is contained in:
Christoffer Jansson 2022-02-17 08:46:34 +00:00 committed by WebRTC LUCI CQ
parent fe328ca88a
commit 88f3c830f6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/sctp/sctp_transport_factory.cc
View File

@ -25,11 +25,11 @@
namespace cricket {
SctpTransportFactory::SctpTransportFactory(rtc::Thread* network_thread)
: network_thread_(network_thread), use_usrsctp_("Disabled", false) {
: network_thread_(network_thread), use_dcsctp_("Enabled", false) {
RTC_UNUSED(network_thread_);
#ifdef WEBRTC_HAVE_DCSCTP
webrtc::ParseFieldTrial({&use_usrsctp_}, webrtc::field_trial::FindFullName(
"WebRTC-DataChannel-Dcsctp"));
webrtc::ParseFieldTrial({&use_dcsctp_}, webrtc::field_trial::FindFullName(
"WebRTC-DataChannel-Dcsctp"));
#endif
}
@ -38,7 +38,7 @@ SctpTransportFactory::CreateSctpTransport(
rtc::PacketTransportInternal* transport) {
std::unique_ptr<SctpTransportInternal> result;
#ifdef WEBRTC_HAVE_DCSCTP
if (!use_usrsctp_.Get()) {
if (use_dcsctp_.Get()) {
result = std::unique_ptr<SctpTransportInternal>(new webrtc::DcSctpTransport(
network_thread_, transport, webrtc::Clock::GetRealTimeClock()));
}

2
media/sctp/sctp_transport_factory.h
View File

@ -29,7 +29,7 @@ class SctpTransportFactory : public webrtc::SctpTransportFactoryInterface {
private:
rtc::Thread* network_thread_;
webrtc::FieldTrialFlag use_usrsctp_;
webrtc::FieldTrialFlag use_dcsctp_;
};
} // namespace cricket

2
pc/data_channel_integrationtest.cc
View File

@ -832,7 +832,7 @@ TEST_P(DataChannelIntegrationTest,
EXPECT_GT(202u, callee()->data_observer()->received_message_count());
EXPECT_LE(2u, callee()->data_observer()->received_message_count());
// Then, check that observed behavior (lose some messages) has not changed
if (!webrtc::field_trial::IsDisabled("WebRTC-DataChannel-Dcsctp")) {
if (webrtc::field_trial::IsEnabled("WebRTC-DataChannel-Dcsctp")) {
// DcSctp loses all messages. This is correct.
EXPECT_EQ(2u, callee()->data_observer()->received_message_count());
} else {