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

Side by Side Diff: talk/app/webrtc/webrtcsession.cc

Issue 1455033004: Ping backup connection at a slower rate (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
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 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 bool WebRtcSession::SetIceTransports( 1236 bool WebRtcSession::SetIceTransports(
1237 PeerConnectionInterface::IceTransportsType type) { 1237 PeerConnectionInterface::IceTransportsType type) {
1238 return port_allocator()->set_candidate_filter( 1238 return port_allocator()->set_candidate_filter(
1239 ConvertIceTransportTypeToCandidateFilter(type)); 1239 ConvertIceTransportTypeToCandidateFilter(type));
1240 } 1240 }
1241 1241
1242 cricket::IceConfig WebRtcSession::ParseIceConfig( 1242 cricket::IceConfig WebRtcSession::ParseIceConfig(
1243 const PeerConnectionInterface::RTCConfiguration& config) const { 1243 const PeerConnectionInterface::RTCConfiguration& config) const {
1244 cricket::IceConfig ice_config; 1244 cricket::IceConfig ice_config;
1245 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout; 1245 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout;
1246 ice_config.backup_connection_ping_interval =
1247 config.ice_backup_connection_ping_interval;
1246 ice_config.gather_continually = (config.continual_gathering_policy == 1248 ice_config.gather_continually = (config.continual_gathering_policy ==
1247 PeerConnectionInterface::GATHER_CONTINUALLY); 1249 PeerConnectionInterface::GATHER_CONTINUALLY);
1248 return ice_config; 1250 return ice_config;
1249 } 1251 }
1250 1252
1251 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) { 1253 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) {
1252 transport_controller_->SetIceConfig(config); 1254 transport_controller_->SetIceConfig(config);
1253 } 1255 }
1254 1256
1255 void WebRtcSession::MaybeStartGathering() { 1257 void WebRtcSession::MaybeStartGathering() {
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
2190 } 2192 }
2191 } 2193 }
2192 2194
2193 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2195 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2194 const rtc::SentPacket& sent_packet) { 2196 const rtc::SentPacket& sent_packet) {
2195 RTC_DCHECK(worker_thread()->IsCurrent()); 2197 RTC_DCHECK(worker_thread()->IsCurrent());
2196 media_controller_->call_w()->OnSentPacket(sent_packet); 2198 media_controller_->call_w()->OnSentPacket(sent_packet);
2197 } 2199 }
2198 2200
2199 } // namespace webrtc 2201 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698