Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: webrtc/api/peerconnection.cc

Issue 2290963002: Revert of Remove the obsolete enum webrtc::PeerConnectionInterface::IceState. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/peerconnection.h ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 stats_->UpdateStats(level); 881 stats_->UpdateStats(level);
881 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_GETSTATS, 882 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_GETSTATS,
882 new GetStatsMsg(observer, track)); 883 new GetStatsMsg(observer, track));
883 return true; 884 return true;
884 } 885 }
885 886
886 PeerConnectionInterface::SignalingState PeerConnection::signaling_state() { 887 PeerConnectionInterface::SignalingState PeerConnection::signaling_state() {
887 return signaling_state_; 888 return signaling_state_;
888 } 889 }
889 890
891 PeerConnectionInterface::IceState PeerConnection::ice_state() {
892 return ice_state_;
893 }
894
890 PeerConnectionInterface::IceConnectionState 895 PeerConnectionInterface::IceConnectionState
891 PeerConnection::ice_connection_state() { 896 PeerConnection::ice_connection_state() {
892 return ice_connection_state_; 897 return ice_connection_state_;
893 } 898 }
894 899
895 PeerConnectionInterface::IceGatheringState 900 PeerConnectionInterface::IceGatheringState
896 PeerConnection::ice_gathering_state() { 901 PeerConnection::ice_gathering_state() {
897 return ice_gathering_state_; 902 return ice_gathering_state_;
898 } 903 }
899 904
(...skipping 1418 matching lines...) Expand 10 before | Expand all | Expand 10 after
2318 2323
2319 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file, 2324 bool PeerConnection::StartRtcEventLog_w(rtc::PlatformFile file,
2320 int64_t max_size_bytes) { 2325 int64_t max_size_bytes) {
2321 return media_controller_->call_w()->StartEventLog(file, max_size_bytes); 2326 return media_controller_->call_w()->StartEventLog(file, max_size_bytes);
2322 } 2327 }
2323 2328
2324 void PeerConnection::StopRtcEventLog_w() { 2329 void PeerConnection::StopRtcEventLog_w() {
2325 media_controller_->call_w()->StopEventLog(); 2330 media_controller_->call_w()->StopEventLog();
2326 } 2331 }
2327 } // namespace webrtc 2332 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnection.h ('k') | webrtc/api/peerconnectioninterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698