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

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

Issue 1577233006: Implement Turn/Turn first logic for connection selection. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix test issues Created 4 years, 11 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 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 1232 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 bool WebRtcSession::SetIceTransports( 1243 bool WebRtcSession::SetIceTransports(
1244 PeerConnectionInterface::IceTransportsType type) { 1244 PeerConnectionInterface::IceTransportsType type) {
1245 return port_allocator()->set_candidate_filter( 1245 return port_allocator()->set_candidate_filter(
1246 ConvertIceTransportTypeToCandidateFilter(type)); 1246 ConvertIceTransportTypeToCandidateFilter(type));
1247 } 1247 }
1248 1248
1249 cricket::IceConfig WebRtcSession::ParseIceConfig( 1249 cricket::IceConfig WebRtcSession::ParseIceConfig(
1250 const PeerConnectionInterface::RTCConfiguration& config) const { 1250 const PeerConnectionInterface::RTCConfiguration& config) const {
1251 cricket::IceConfig ice_config; 1251 cricket::IceConfig ice_config;
1252 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout; 1252 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout;
1253 ice_config.ping_most_likely_candidate_pair_first =
1254 config.ping_most_likely_candidate_pair_first;
1253 ice_config.backup_connection_ping_interval = 1255 ice_config.backup_connection_ping_interval =
1254 config.ice_backup_candidate_pair_ping_interval; 1256 config.ice_backup_candidate_pair_ping_interval;
1255 ice_config.gather_continually = (config.continual_gathering_policy == 1257 ice_config.gather_continually = (config.continual_gathering_policy ==
1256 PeerConnectionInterface::GATHER_CONTINUALLY); 1258 PeerConnectionInterface::GATHER_CONTINUALLY);
1257 return ice_config; 1259 return ice_config;
1258 } 1260 }
1259 1261
1260 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) { 1262 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) {
1261 transport_controller_->SetIceConfig(config); 1263 transport_controller_->SetIceConfig(config);
1262 } 1264 }
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
2204 } 2206 }
2205 } 2207 }
2206 2208
2207 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, 2209 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel,
2208 const rtc::SentPacket& sent_packet) { 2210 const rtc::SentPacket& sent_packet) {
2209 RTC_DCHECK(worker_thread()->IsCurrent()); 2211 RTC_DCHECK(worker_thread()->IsCurrent());
2210 media_controller_->call_w()->OnSentPacket(sent_packet); 2212 media_controller_->call_w()->OnSentPacket(sent_packet);
2211 } 2213 }
2212 2214
2213 } // namespace webrtc 2215 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698