| 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), | |
| 572 ice_connection_state_(kIceConnectionNew), | 571 ice_connection_state_(kIceConnectionNew), |
| 573 ice_gathering_state_(kIceGatheringNew), | 572 ice_gathering_state_(kIceGatheringNew), |
| 574 rtcp_cname_(GenerateRtcpCname()), | 573 rtcp_cname_(GenerateRtcpCname()), |
| 575 local_streams_(StreamCollection::Create()), | 574 local_streams_(StreamCollection::Create()), |
| 576 remote_streams_(StreamCollection::Create()) {} | 575 remote_streams_(StreamCollection::Create()) {} |
| 577 | 576 |
| 578 PeerConnection::~PeerConnection() { | 577 PeerConnection::~PeerConnection() { |
| 579 TRACE_EVENT0("webrtc", "PeerConnection::~PeerConnection"); | 578 TRACE_EVENT0("webrtc", "PeerConnection::~PeerConnection"); |
| 580 RTC_DCHECK(signaling_thread()->IsCurrent()); | 579 RTC_DCHECK(signaling_thread()->IsCurrent()); |
| 581 // Need to detach RTP senders/receivers from WebRtcSession, | 580 // Need to detach RTP senders/receivers from WebRtcSession, |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 881 stats_->UpdateStats(level); | 880 stats_->UpdateStats(level); |
| 882 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_GETSTATS, | 881 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_GETSTATS, |
| 883 new GetStatsMsg(observer, track)); | 882 new GetStatsMsg(observer, track)); |
| 884 return true; | 883 return true; |
| 885 } | 884 } |
| 886 | 885 |
| 887 PeerConnectionInterface::SignalingState PeerConnection::signaling_state() { | 886 PeerConnectionInterface::SignalingState PeerConnection::signaling_state() { |
| 888 return signaling_state_; | 887 return signaling_state_; |
| 889 } | 888 } |
| 890 | 889 |
| 891 PeerConnectionInterface::IceState PeerConnection::ice_state() { | |
| 892 return ice_state_; | |
| 893 } | |
| 894 | |
| 895 PeerConnectionInterface::IceConnectionState | 890 PeerConnectionInterface::IceConnectionState |
| 896 PeerConnection::ice_connection_state() { | 891 PeerConnection::ice_connection_state() { |
| 897 return ice_connection_state_; | 892 return ice_connection_state_; |
| 898 } | 893 } |
| 899 | 894 |
| 900 PeerConnectionInterface::IceGatheringState | 895 PeerConnectionInterface::IceGatheringState |
| 901 PeerConnection::ice_gathering_state() { | 896 PeerConnection::ice_gathering_state() { |
| 902 return ice_gathering_state_; | 897 return ice_gathering_state_; |
| 903 } | 898 } |
| 904 | 899 |
| (...skipping 1418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2323 | 2318 |
| 2324 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, | 2319 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, |
| 2325 int64_t max_size_bytes) { | 2320 int64_t max_size_bytes) { |
| 2326 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); | 2321 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); |
| 2327 } | 2322 } |
| 2328 | 2323 |
| 2329 void PeerConnection::StopRtcEventLog_w() { | 2324 void PeerConnection::StopRtcEventLog_w() { |
| 2330 media_controller_->call_w()->StopEventLog(); | 2325 media_controller_->call_w()->StopEventLog(); |
| 2331 } | 2326 } |
| 2332 } // namespace webrtc | 2327 } // namespace webrtc |
| OLD | NEW |