admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of "Remove the obsolete enum webrtc::PeerConnectionInterface::IceState." (patchset #1 id:1 of https://codereview.webrtc.org/2361053003/ )

Browse Source 
Reason for revert:
Breaks upstream code.

Original issue's description:
> Reland of "Remove the obsolete enum webrtc::PeerConnectionInterface::IceState."
>
> Original commit https://codereview.webrtc.org/2256663002
> was reverted by https://codereview.webrtc.org/2290963002 .
>
> BUG=webrtc:6299
> TBR=pthatcher@webrtc.org
>
> Committed: https://crrev.com/fc9414ab513941028309d15a2baf711ef38f93a7
> Cr-Commit-Position: refs/heads/master@{#14584}

TBR=pthatcher@webrtc.org,johan@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6299

Review-Url: https://codereview.webrtc.org/2402993002
Cr-Commit-Position: refs/heads/master@{#14586}
This commit is contained in:
sprang 2016-10-10 05:59:10 -07:00 committed by Commit bot
parent e0928d8002
commit 57cb873707
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/api/peerconnection.cc
View File

@ -570,6 +570,7 @@ PeerConnection::PeerConnection(PeerConnectionFactory* factory)
observer_(NULL),
uma_observer_(NULL),
signaling_state_(kStable),
ice_state_(kIceNew),
ice_connection_state_(kIceConnectionNew),
ice_gathering_state_(kIceGatheringNew),
event_log_(RtcEventLog::Create(webrtc::Clock::GetRealTimeClock())),
@ -900,6 +901,10 @@ PeerConnectionInterface::SignalingState PeerConnection::signaling_state() {
return signaling_state_;
}
PeerConnectionInterface::IceState PeerConnection::ice_state() {
return ice_state_;
}
PeerConnectionInterface::IceConnectionState
PeerConnection::ice_connection_state() {
return ice_connection_state_;

4
webrtc/api/peerconnection.h
View File

@ -108,6 +108,8 @@ class PeerConnection : public PeerConnectionInterface,
SignalingState signaling_state() override;
// TODO(bemasc): Remove ice_state() when callers are removed.
IceState ice_state() override;
IceConnectionState ice_connection_state() override;
IceGatheringState ice_gathering_state() override;
@ -385,6 +387,8 @@ class PeerConnection : public PeerConnectionInterface,
PeerConnectionObserver* observer_;
UMAObserver* uma_observer_;
SignalingState signaling_state_;
// TODO(bemasc): Remove ice_state_.
IceState ice_state_;
IceConnectionState ice_connection_state_;
IceGatheringState ice_gathering_state_;

21
webrtc/api/peerconnectioninterface.h
View File

@ -152,6 +152,19 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
kClosed,
};
// TODO(bemasc): Remove IceState when callers are changed to
// IceConnection/GatheringState.
enum IceState {
kIceNew,
kIceGathering,
kIceWaiting,
kIceChecking,
kIceConnected,
kIceCompleted,
kIceFailed,
kIceClosed,
};
enum IceGatheringState {
kIceGatheringNew,
kIceGatheringGathering,
@ -509,6 +522,14 @@ class PeerConnectionInterface : public rtc::RefCountInterface {
// Returns the current SignalingState.
virtual SignalingState signaling_state() = 0;
// TODO(bemasc): Remove ice_state when callers are changed to
// IceConnection/GatheringState.
// Returns the current IceState.
virtual IceState ice_state() {
RTC_NOTREACHED();
return kIceNew;
}
virtual IceConnectionState ice_connection_state() = 0;
virtual IceGatheringState ice_gathering_state() = 0;

1
webrtc/api/peerconnectionproxy.h
View File

@ -72,6 +72,7 @@ BEGIN_SIGNALING_PROXY_MAP(PeerConnection)
const std::vector<cricket::Candidate>&);
PROXY_METHOD1(void, RegisterUMAObserver, UMAObserver*)
PROXY_METHOD0(SignalingState, signaling_state)
PROXY_METHOD0(IceState, ice_state)
PROXY_METHOD0(IceConnectionState, ice_connection_state)
PROXY_METHOD0(IceGatheringState, ice_gathering_state)
PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)