Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: webrtc/p2p/base/transportcontroller.cc

Issue 1369773003: Add a continual_gathering_policy in PeerConnection RTCConfiguration (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Rebase to master Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/transportcontroller.h ('k') | webrtc/p2p/base/transportcontroller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/transportcontroller.cc
diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc
index 4d9e403d3b8abe53393d8f9445035e0a68ee35e3..d84d574f153076ad01015ee7bd25ca89f8b0a0d3 100644
--- a/webrtc/p2p/base/transportcontroller.cc
+++ b/webrtc/p2p/base/transportcontroller.cc
@@ -53,10 +53,9 @@ bool TransportController::SetSslMaxProtocolVersion(
&TransportController::SetSslMaxProtocolVersion_w, this, version));
}
-void TransportController::SetIceConnectionReceivingTimeout(int timeout_ms) {
+void TransportController::SetIceConfig(const IceConfig& config) {
worker_thread_->Invoke<void>(
- rtc::Bind(&TransportController::SetIceConnectionReceivingTimeout_w, this,
- timeout_ms));
+ rtc::Bind(&TransportController::SetIceConfig_w, this, config));
}
void TransportController::SetIceRole(IceRole ice_role) {
@@ -235,7 +234,7 @@ Transport* TransportController::GetOrCreateTransport_w(
// The stuff below happens outside of CreateTransport_w so that unit tests
// can override CreateTransport_w to return a different type of transport.
transport->SetSslMaxProtocolVersion(ssl_max_version_);
- transport->SetChannelReceivingTimeout(ice_receiving_timeout_ms_);
+ transport->SetIceConfig(ice_config_);
transport->SetIceRole(ice_role_);
transport->SetIceTiebreaker(ice_tiebreaker_);
if (certificate_) {
@@ -297,11 +296,11 @@ bool TransportController::SetSslMaxProtocolVersion_w(
return true;
}
-void TransportController::SetIceConnectionReceivingTimeout_w(int timeout_ms) {
+void TransportController::SetIceConfig_w(const IceConfig& config) {
RTC_DCHECK(worker_thread_->IsCurrent());
- ice_receiving_timeout_ms_ = timeout_ms;
+ ice_config_ = config;
for (const auto& kv : transports_) {
- kv.second->SetChannelReceivingTimeout(timeout_ms);
+ kv.second->SetIceConfig(ice_config_);
}
}
« no previous file with comments | « webrtc/p2p/base/transportcontroller.h ('k') | webrtc/p2p/base/transportcontroller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698