diff options
author | Erwin Jansen <jansene@google.com> | 2021-06-30 07:29:26 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-06-30 07:29:26 +0000 |
commit | 059cdc5996938f5f6b5343b6c969c12098275587 (patch) | |
tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /media/sctp/sctp_transport_factory.cc | |
parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
parent | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (diff) | |
download | webrtc-emu-31-release.tar.gz |
Merge "Merge upstream-master and enable ARM64" into emu-master-devemu-31-stable-releaseemu-31-release
Diffstat (limited to 'media/sctp/sctp_transport_factory.cc')
-rw-r--r-- | media/sctp/sctp_transport_factory.cc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/media/sctp/sctp_transport_factory.cc b/media/sctp/sctp_transport_factory.cc index 40480e797a..5097d423d9 100644 --- a/media/sctp/sctp_transport_factory.cc +++ b/media/sctp/sctp_transport_factory.cc @@ -12,6 +12,12 @@ #include "rtc_base/system/unused.h" +#ifdef WEBRTC_HAVE_DCSCTP +#include "media/sctp/dcsctp_transport.h" // nogncheck +#include "system_wrappers/include/clock.h" // nogncheck +#include "system_wrappers/include/field_trial.h" // nogncheck +#endif + #ifdef WEBRTC_HAVE_USRSCTP #include "media/sctp/usrsctp_transport.h" // nogncheck #endif @@ -19,14 +25,24 @@ namespace cricket { SctpTransportFactory::SctpTransportFactory(rtc::Thread* network_thread) - : network_thread_(network_thread) { + : network_thread_(network_thread), use_dcsctp_("Enabled", false) { RTC_UNUSED(network_thread_); +#ifdef WEBRTC_HAVE_DCSCTP + webrtc::ParseFieldTrial({&use_dcsctp_}, webrtc::field_trial::FindFullName( + "WebRTC-DataChannel-Dcsctp")); +#endif } std::unique_ptr<SctpTransportInternal> SctpTransportFactory::CreateSctpTransport( rtc::PacketTransportInternal* transport) { std::unique_ptr<SctpTransportInternal> result; +#ifdef WEBRTC_HAVE_DCSCTP + if (use_dcsctp_.Get()) { + result = std::unique_ptr<SctpTransportInternal>(new webrtc::DcSctpTransport( + network_thread_, transport, webrtc::Clock::GetRealTimeClock())); + } +#endif #ifdef WEBRTC_HAVE_USRSCTP if (!result) { result = std::unique_ptr<SctpTransportInternal>( |