Chromium Code Reviews| 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 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 498 bool enable_rtp_data_channel; | 498 bool enable_rtp_data_channel; |
| 499 bool enable_quic; | 499 bool enable_quic; |
| 500 rtc::Optional<int> screencast_min_bitrate; | 500 rtc::Optional<int> screencast_min_bitrate; |
| 501 rtc::Optional<bool> combined_audio_video_bwe; | 501 rtc::Optional<bool> combined_audio_video_bwe; |
| 502 rtc::Optional<bool> enable_dtls_srtp; | 502 rtc::Optional<bool> enable_dtls_srtp; |
| 503 int ice_candidate_pool_size; | 503 int ice_candidate_pool_size; |
| 504 bool prune_turn_ports; | 504 bool prune_turn_ports; |
| 505 bool presume_writable_when_fully_relayed; | 505 bool presume_writable_when_fully_relayed; |
| 506 bool enable_ice_renomination; | 506 bool enable_ice_renomination; |
| 507 bool redetermine_role_on_ice_restart; | 507 bool redetermine_role_on_ice_restart; |
| 508 rtc::Optional<int> ice_check_min_interval; | |
|
Taylor Brandstetter
2017/02/02 07:03:55
Out of curiosity, did my scheme here work, or did
skvlad
2017/02/02 08:51:25
Peter did this change, I'll let him answer :)
| |
| 508 }; | 509 }; |
| 509 static_assert(sizeof(stuff_being_tested_for_equality) == sizeof(*this), | 510 static_assert(sizeof(stuff_being_tested_for_equality) == sizeof(*this), |
| 510 "Did you add something to RTCConfiguration and forget to " | 511 "Did you add something to RTCConfiguration and forget to " |
| 511 "update operator==?"); | 512 "update operator==?"); |
| 512 return type == o.type && servers == o.servers && | 513 return type == o.type && servers == o.servers && |
| 513 bundle_policy == o.bundle_policy && | 514 bundle_policy == o.bundle_policy && |
| 514 rtcp_mux_policy == o.rtcp_mux_policy && | 515 rtcp_mux_policy == o.rtcp_mux_policy && |
| 515 tcp_candidate_policy == o.tcp_candidate_policy && | 516 tcp_candidate_policy == o.tcp_candidate_policy && |
| 516 candidate_network_policy == o.candidate_network_policy && | 517 candidate_network_policy == o.candidate_network_policy && |
| 517 audio_jitter_buffer_max_packets == o.audio_jitter_buffer_max_packets && | 518 audio_jitter_buffer_max_packets == o.audio_jitter_buffer_max_packets && |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 529 enable_rtp_data_channel == o.enable_rtp_data_channel && | 530 enable_rtp_data_channel == o.enable_rtp_data_channel && |
| 530 enable_quic == o.enable_quic && | 531 enable_quic == o.enable_quic && |
| 531 screencast_min_bitrate == o.screencast_min_bitrate && | 532 screencast_min_bitrate == o.screencast_min_bitrate && |
| 532 combined_audio_video_bwe == o.combined_audio_video_bwe && | 533 combined_audio_video_bwe == o.combined_audio_video_bwe && |
| 533 enable_dtls_srtp == o.enable_dtls_srtp && | 534 enable_dtls_srtp == o.enable_dtls_srtp && |
| 534 ice_candidate_pool_size == o.ice_candidate_pool_size && | 535 ice_candidate_pool_size == o.ice_candidate_pool_size && |
| 535 prune_turn_ports == o.prune_turn_ports && | 536 prune_turn_ports == o.prune_turn_ports && |
| 536 presume_writable_when_fully_relayed == | 537 presume_writable_when_fully_relayed == |
| 537 o.presume_writable_when_fully_relayed && | 538 o.presume_writable_when_fully_relayed && |
| 538 enable_ice_renomination == o.enable_ice_renomination && | 539 enable_ice_renomination == o.enable_ice_renomination && |
| 539 redetermine_role_on_ice_restart == o.redetermine_role_on_ice_restart; | 540 redetermine_role_on_ice_restart == o.redetermine_role_on_ice_restart && |
| 541 ice_check_min_interval == o.ice_check_min_interval; | |
| 540 } | 542 } |
| 541 | 543 |
| 542 bool PeerConnectionInterface::RTCConfiguration::operator!=( | 544 bool PeerConnectionInterface::RTCConfiguration::operator!=( |
| 543 const PeerConnectionInterface::RTCConfiguration& o) const { | 545 const PeerConnectionInterface::RTCConfiguration& o) const { |
| 544 return !(*this == o); | 546 return !(*this == o); |
| 545 } | 547 } |
| 546 | 548 |
| 547 // Generate a RTCP CNAME when a PeerConnection is created. | 549 // Generate a RTCP CNAME when a PeerConnection is created. |
| 548 std::string GenerateRtcpCname() { | 550 std::string GenerateRtcpCname() { |
| 549 std::string cname; | 551 std::string cname; |
| (...skipping 2011 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2561 | 2563 |
| 2562 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, | 2564 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, |
| 2563 int64_t max_size_bytes) { | 2565 int64_t max_size_bytes) { |
| 2564 return event_log_->StartLogging(file, max_size_bytes); | 2566 return event_log_->StartLogging(file, max_size_bytes); |
| 2565 } | 2567 } |
| 2566 | 2568 |
| 2567 void PeerConnection::StopRtcEventLog_w() { | 2569 void PeerConnection::StopRtcEventLog_w() { |
| 2568 event_log_->StopLogging(); | 2570 event_log_->StopLogging(); |
| 2569 } | 2571 } |
| 2570 } // namespace webrtc | 2572 } // namespace webrtc |
| OLD | NEW |