Chromium Code Reviews| Index: talk/app/webrtc/webrtcsession.cc |
| diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc |
| index bd1cd1a0ac8589af2b76977748e3ce7e6af25308..4b9c1a401e0440fce0c88c63e9ae42dacec9878b 100644 |
| --- a/talk/app/webrtc/webrtcsession.cc |
| +++ b/talk/app/webrtc/webrtcsession.cc |
| @@ -608,8 +608,7 @@ bool WebRtcSession::Initialize( |
| certificate = rtc_configuration.certificates[0]; |
| } |
| - SetIceConnectionReceivingTimeout( |
| - rtc_configuration.ice_connection_receiving_timeout); |
| + SetIceConfig(ParseIceConfig(rtc_configuration)); |
| // TODO(perkj): Take |constraints| into consideration. Return false if not all |
| // mandatory constraints can be fulfilled. Note that |constraints| |
| @@ -782,6 +781,16 @@ bool WebRtcSession::Initialize( |
| return true; |
| } |
| +cricket::IceConfig WebRtcSession::ParseIceConfig( |
| + const PeerConnectionInterface::RTCConfiguration& config) const { |
| + cricket::IceConfig ice_config; |
| + ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout; |
| + ice_config.continuous_gathering = |
| + (config.continuous_gathering_policy == |
| + PeerConnectionInterface::kGatheringContinuously); |
|
pthatcher1
2015/09/25 22:26:57
gather_continually.
honghaiz3
2015/09/25 23:05:00
Done.
|
| + return ice_config; |
| +} |
| + |
| void WebRtcSession::Terminate() { |
| SetState(STATE_RECEIVEDTERMINATE); |
| RemoveUnusedChannels(NULL); |