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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 turn_server.priority = priority--; | 561 turn_server.priority = priority--; |
562 } | 562 } |
563 return true; | 563 return true; |
564 } | 564 } |
565 | 565 |
566 PeerConnection::PeerConnection(PeerConnectionFactory* factory) | 566 PeerConnection::PeerConnection(PeerConnectionFactory* factory) |
567 : factory_(factory), | 567 : factory_(factory), |
568 observer_(NULL), | 568 observer_(NULL), |
569 uma_observer_(NULL), | 569 uma_observer_(NULL), |
570 signaling_state_(kStable), | 570 signaling_state_(kStable), |
| 571 ice_state_(kIceNew), |
571 ice_connection_state_(kIceConnectionNew), | 572 ice_connection_state_(kIceConnectionNew), |
572 ice_gathering_state_(kIceGatheringNew), | 573 ice_gathering_state_(kIceGatheringNew), |
573 rtcp_cname_(GenerateRtcpCname()), | 574 rtcp_cname_(GenerateRtcpCname()), |
574 local_streams_(StreamCollection::Create()), | 575 local_streams_(StreamCollection::Create()), |
575 remote_streams_(StreamCollection::Create()) {} | 576 remote_streams_(StreamCollection::Create()) {} |
576 | 577 |
577 PeerConnection::~PeerConnection() { | 578 PeerConnection::~PeerConnection() { |
578 TRACE_EVENT0("webrtc", "PeerConnection::~PeerConnection"); | 579 TRACE_EVENT0("webrtc", "PeerConnection::~PeerConnection"); |
579 RTC_DCHECK(signaling_thread()->IsCurrent()); | 580 RTC_DCHECK(signaling_thread()->IsCurrent()); |
580 // Need to detach RTP senders/receivers from WebRtcSession, | 581 // Need to detach RTP senders/receivers from WebRtcSession, |
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 | 891 |
891 void PeerConnection::GetStats(RTCStatsCollectorCallback* callback) { | 892 void PeerConnection::GetStats(RTCStatsCollectorCallback* callback) { |
892 RTC_DCHECK(stats_collector_); | 893 RTC_DCHECK(stats_collector_); |
893 stats_collector_->GetStatsReport(callback); | 894 stats_collector_->GetStatsReport(callback); |
894 } | 895 } |
895 | 896 |
896 PeerConnectionInterface::SignalingState PeerConnection::signaling_state() { | 897 PeerConnectionInterface::SignalingState PeerConnection::signaling_state() { |
897 return signaling_state_; | 898 return signaling_state_; |
898 } | 899 } |
899 | 900 |
| 901 PeerConnectionInterface::IceState PeerConnection::ice_state() { |
| 902 return ice_state_; |
| 903 } |
| 904 |
900 PeerConnectionInterface::IceConnectionState | 905 PeerConnectionInterface::IceConnectionState |
901 PeerConnection::ice_connection_state() { | 906 PeerConnection::ice_connection_state() { |
902 return ice_connection_state_; | 907 return ice_connection_state_; |
903 } | 908 } |
904 | 909 |
905 PeerConnectionInterface::IceGatheringState | 910 PeerConnectionInterface::IceGatheringState |
906 PeerConnection::ice_gathering_state() { | 911 PeerConnection::ice_gathering_state() { |
907 return ice_gathering_state_; | 912 return ice_gathering_state_; |
908 } | 913 } |
909 | 914 |
(...skipping 1427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2337 | 2342 |
2338 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, | 2343 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, |
2339 int64_t max_size_bytes) { | 2344 int64_t max_size_bytes) { |
2340 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); | 2345 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); |
2341 } | 2346 } |
2342 | 2347 |
2343 void PeerConnection::StopRtcEventLog_w() { | 2348 void PeerConnection::StopRtcEventLog_w() { |
2344 media_controller_->call_w()->StopEventLog(); | 2349 media_controller_->call_w()->StopEventLog(); |
2345 } | 2350 } |
2346 } // namespace webrtc | 2351 } // namespace webrtc |
OLD | NEW |