OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1237 bool WebRtcSession::SetIceTransports( | 1237 bool WebRtcSession::SetIceTransports( |
1238 PeerConnectionInterface::IceTransportsType type) { | 1238 PeerConnectionInterface::IceTransportsType type) { |
1239 return port_allocator()->set_candidate_filter( | 1239 return port_allocator()->set_candidate_filter( |
1240 ConvertIceTransportTypeToCandidateFilter(type)); | 1240 ConvertIceTransportTypeToCandidateFilter(type)); |
1241 } | 1241 } |
1242 | 1242 |
1243 cricket::IceConfig WebRtcSession::ParseIceConfig( | 1243 cricket::IceConfig WebRtcSession::ParseIceConfig( |
1244 const PeerConnectionInterface::RTCConfiguration& config) const { | 1244 const PeerConnectionInterface::RTCConfiguration& config) const { |
1245 cricket::IceConfig ice_config; | 1245 cricket::IceConfig ice_config; |
1246 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout; | 1246 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout; |
| 1247 ice_config.backup_connection_ping_interval = |
| 1248 config.ice_backup_connection_ping_interval; |
1247 ice_config.gather_continually = (config.continual_gathering_policy == | 1249 ice_config.gather_continually = (config.continual_gathering_policy == |
1248 PeerConnectionInterface::GATHER_CONTINUALLY); | 1250 PeerConnectionInterface::GATHER_CONTINUALLY); |
1249 return ice_config; | 1251 return ice_config; |
1250 } | 1252 } |
1251 | 1253 |
1252 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) { | 1254 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) { |
1253 transport_controller_->SetIceConfig(config); | 1255 transport_controller_->SetIceConfig(config); |
1254 } | 1256 } |
1255 | 1257 |
1256 void WebRtcSession::MaybeStartGathering() { | 1258 void WebRtcSession::MaybeStartGathering() { |
(...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2188 } | 2190 } |
2189 } | 2191 } |
2190 | 2192 |
2191 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2193 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
2192 const rtc::SentPacket& sent_packet) { | 2194 const rtc::SentPacket& sent_packet) { |
2193 RTC_DCHECK(worker_thread()->IsCurrent()); | 2195 RTC_DCHECK(worker_thread()->IsCurrent()); |
2194 media_controller_->call_w()->OnSentPacket(sent_packet); | 2196 media_controller_->call_w()->OnSentPacket(sent_packet); |
2195 } | 2197 } |
2196 | 2198 |
2197 } // namespace webrtc | 2199 } // namespace webrtc |
OLD | NEW |