| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1116 | 1116 |
| 1117 bool WebRtcSession::SetIceTransports( | 1117 bool WebRtcSession::SetIceTransports( |
| 1118 PeerConnectionInterface::IceTransportsType type) { | 1118 PeerConnectionInterface::IceTransportsType type) { |
| 1119 return port_allocator()->set_candidate_filter( | 1119 return port_allocator()->set_candidate_filter( |
| 1120 ConvertIceTransportTypeToCandidateFilter(type)); | 1120 ConvertIceTransportTypeToCandidateFilter(type)); |
| 1121 } | 1121 } |
| 1122 | 1122 |
| 1123 cricket::IceConfig WebRtcSession::ParseIceConfig( | 1123 cricket::IceConfig WebRtcSession::ParseIceConfig( |
| 1124 const PeerConnectionInterface::RTCConfiguration& config) const { | 1124 const PeerConnectionInterface::RTCConfiguration& config) const { |
| 1125 cricket::IceConfig ice_config; | 1125 cricket::IceConfig ice_config; |
| 1126 ice_config.receiving_timeout_ms = config.ice_connection_receiving_timeout; | 1126 ice_config.receiving_timeout = config.ice_connection_receiving_timeout; |
| 1127 ice_config.prioritize_most_likely_candidate_pairs = | 1127 ice_config.prioritize_most_likely_candidate_pairs = |
| 1128 config.prioritize_most_likely_ice_candidate_pairs; | 1128 config.prioritize_most_likely_ice_candidate_pairs; |
| 1129 ice_config.backup_connection_ping_interval = | 1129 ice_config.backup_connection_ping_interval = |
| 1130 config.ice_backup_candidate_pair_ping_interval; | 1130 config.ice_backup_candidate_pair_ping_interval; |
| 1131 ice_config.gather_continually = (config.continual_gathering_policy == | 1131 ice_config.gather_continually = (config.continual_gathering_policy == |
| 1132 PeerConnectionInterface::GATHER_CONTINUALLY); | 1132 PeerConnectionInterface::GATHER_CONTINUALLY); |
| 1133 return ice_config; | 1133 return ice_config; |
| 1134 } | 1134 } |
| 1135 | 1135 |
| 1136 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) { | 1136 void WebRtcSession::SetIceConfig(const cricket::IceConfig& config) { |
| (...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2077 } | 2077 } |
| 2078 } | 2078 } |
| 2079 | 2079 |
| 2080 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, | 2080 void WebRtcSession::OnSentPacket_w(cricket::TransportChannel* channel, |
| 2081 const rtc::SentPacket& sent_packet) { | 2081 const rtc::SentPacket& sent_packet) { |
| 2082 RTC_DCHECK(worker_thread()->IsCurrent()); | 2082 RTC_DCHECK(worker_thread()->IsCurrent()); |
| 2083 media_controller_->call_w()->OnSentPacket(sent_packet); | 2083 media_controller_->call_w()->OnSentPacket(sent_packet); |
| 2084 } | 2084 } |
| 2085 | 2085 |
| 2086 } // namespace webrtc | 2086 } // namespace webrtc |
| OLD | NEW |