| 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 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 // Note: Order matters! Fields must be ordered the same as RTCConfiguration. | 233 // Note: Order matters! Fields must be ordered the same as RTCConfiguration. |
| 234 struct stuff_being_tested_for_equality { | 234 struct stuff_being_tested_for_equality { |
| 235 IceServers servers; | 235 IceServers servers; |
| 236 IceTransportsType type; | 236 IceTransportsType type; |
| 237 BundlePolicy bundle_policy; | 237 BundlePolicy bundle_policy; |
| 238 RtcpMuxPolicy rtcp_mux_policy; | 238 RtcpMuxPolicy rtcp_mux_policy; |
| 239 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates; | 239 std::vector<rtc::scoped_refptr<rtc::RTCCertificate>> certificates; |
| 240 int ice_candidate_pool_size; | 240 int ice_candidate_pool_size; |
| 241 bool disable_ipv6; | 241 bool disable_ipv6; |
| 242 bool disable_ipv6_on_wifi; | 242 bool disable_ipv6_on_wifi; |
| 243 int max_ipv6_networks; |
| 243 bool enable_rtp_data_channel; | 244 bool enable_rtp_data_channel; |
| 244 rtc::Optional<int> screencast_min_bitrate; | 245 rtc::Optional<int> screencast_min_bitrate; |
| 245 rtc::Optional<bool> combined_audio_video_bwe; | 246 rtc::Optional<bool> combined_audio_video_bwe; |
| 246 rtc::Optional<bool> enable_dtls_srtp; | 247 rtc::Optional<bool> enable_dtls_srtp; |
| 247 TcpCandidatePolicy tcp_candidate_policy; | 248 TcpCandidatePolicy tcp_candidate_policy; |
| 248 CandidateNetworkPolicy candidate_network_policy; | 249 CandidateNetworkPolicy candidate_network_policy; |
| 249 int audio_jitter_buffer_max_packets; | 250 int audio_jitter_buffer_max_packets; |
| 250 bool audio_jitter_buffer_fast_accelerate; | 251 bool audio_jitter_buffer_fast_accelerate; |
| 251 int ice_connection_receiving_timeout; | 252 int ice_connection_receiving_timeout; |
| 252 int ice_backup_candidate_pair_ping_interval; | 253 int ice_backup_candidate_pair_ping_interval; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 275 ice_connection_receiving_timeout == | 276 ice_connection_receiving_timeout == |
| 276 o.ice_connection_receiving_timeout && | 277 o.ice_connection_receiving_timeout && |
| 277 ice_backup_candidate_pair_ping_interval == | 278 ice_backup_candidate_pair_ping_interval == |
| 278 o.ice_backup_candidate_pair_ping_interval && | 279 o.ice_backup_candidate_pair_ping_interval && |
| 279 continual_gathering_policy == o.continual_gathering_policy && | 280 continual_gathering_policy == o.continual_gathering_policy && |
| 280 certificates == o.certificates && | 281 certificates == o.certificates && |
| 281 prioritize_most_likely_ice_candidate_pairs == | 282 prioritize_most_likely_ice_candidate_pairs == |
| 282 o.prioritize_most_likely_ice_candidate_pairs && | 283 o.prioritize_most_likely_ice_candidate_pairs && |
| 283 media_config == o.media_config && disable_ipv6 == o.disable_ipv6 && | 284 media_config == o.media_config && disable_ipv6 == o.disable_ipv6 && |
| 284 disable_ipv6_on_wifi == o.disable_ipv6_on_wifi && | 285 disable_ipv6_on_wifi == o.disable_ipv6_on_wifi && |
| 286 max_ipv6_networks == o.max_ipv6_networks && |
| 285 enable_rtp_data_channel == o.enable_rtp_data_channel && | 287 enable_rtp_data_channel == o.enable_rtp_data_channel && |
| 286 enable_quic == o.enable_quic && | 288 enable_quic == o.enable_quic && |
| 287 screencast_min_bitrate == o.screencast_min_bitrate && | 289 screencast_min_bitrate == o.screencast_min_bitrate && |
| 288 combined_audio_video_bwe == o.combined_audio_video_bwe && | 290 combined_audio_video_bwe == o.combined_audio_video_bwe && |
| 289 enable_dtls_srtp == o.enable_dtls_srtp && | 291 enable_dtls_srtp == o.enable_dtls_srtp && |
| 290 ice_candidate_pool_size == o.ice_candidate_pool_size && | 292 ice_candidate_pool_size == o.ice_candidate_pool_size && |
| 291 prune_turn_ports == o.prune_turn_ports && | 293 prune_turn_ports == o.prune_turn_ports && |
| 292 presume_writable_when_fully_relayed == | 294 presume_writable_when_fully_relayed == |
| 293 o.presume_writable_when_fully_relayed && | 295 o.presume_writable_when_fully_relayed && |
| 294 enable_ice_renomination == o.enable_ice_renomination && | 296 enable_ice_renomination == o.enable_ice_renomination && |
| (...skipping 2098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2393 kCandidateNetworkPolicyLowCost) { | 2395 kCandidateNetworkPolicyLowCost) { |
| 2394 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_COSTLY_NETWORKS; | 2396 portallocator_flags |= cricket::PORTALLOCATOR_DISABLE_COSTLY_NETWORKS; |
| 2395 LOG(LS_INFO) << "Do not gather candidates on high-cost networks"; | 2397 LOG(LS_INFO) << "Do not gather candidates on high-cost networks"; |
| 2396 } | 2398 } |
| 2397 | 2399 |
| 2398 port_allocator_->set_flags(portallocator_flags); | 2400 port_allocator_->set_flags(portallocator_flags); |
| 2399 // No step delay is used while allocating ports. | 2401 // No step delay is used while allocating ports. |
| 2400 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); | 2402 port_allocator_->set_step_delay(cricket::kMinimumStepDelay); |
| 2401 port_allocator_->set_candidate_filter( | 2403 port_allocator_->set_candidate_filter( |
| 2402 ConvertIceTransportTypeToCandidateFilter(configuration.type)); | 2404 ConvertIceTransportTypeToCandidateFilter(configuration.type)); |
| 2405 port_allocator_->set_max_ipv6_networks(configuration.max_ipv6_networks); |
| 2403 | 2406 |
| 2404 // Call this last since it may create pooled allocator sessions using the | 2407 // Call this last since it may create pooled allocator sessions using the |
| 2405 // properties set above. | 2408 // properties set above. |
| 2406 port_allocator_->SetConfiguration(stun_servers, turn_servers, | 2409 port_allocator_->SetConfiguration(stun_servers, turn_servers, |
| 2407 configuration.ice_candidate_pool_size, | 2410 configuration.ice_candidate_pool_size, |
| 2408 configuration.prune_turn_ports); | 2411 configuration.prune_turn_ports); |
| 2409 return true; | 2412 return true; |
| 2410 } | 2413 } |
| 2411 | 2414 |
| 2412 bool PeerConnection::ReconfigurePortAllocator_n( | 2415 bool PeerConnection::ReconfigurePortAllocator_n( |
| (...skipping 18 matching lines...) Expand all Loading... |
| 2431 return event_log_->StartLogging(file, max_size_bytes); | 2434 return event_log_->StartLogging(file, max_size_bytes); |
| 2432 } | 2435 } |
| 2433 | 2436 |
| 2434 void PeerConnection::StopRtcEventLog_w() { | 2437 void PeerConnection::StopRtcEventLog_w() { |
| 2435 if (event_log_) { | 2438 if (event_log_) { |
| 2436 event_log_->StopLogging(); | 2439 event_log_->StopLogging(); |
| 2437 } | 2440 } |
| 2438 } | 2441 } |
| 2439 | 2442 |
| 2440 } // namespace webrtc | 2443 } // namespace webrtc |
| OLD | NEW |