Index: talk/app/webrtc/webrtcsession.h |
diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h |
index 821d59db5705e34d4a8381e9f0ead48967f590e7..ceef337e1a32598c8e63277334a862063aaed65e 100644 |
--- a/talk/app/webrtc/webrtcsession.h |
+++ b/talk/app/webrtc/webrtcsession.h |
@@ -84,6 +84,8 @@ class IceObserver { |
public: |
IceObserver() {} |
// Called any time the IceConnectionState changes |
+ // TODO(honghaiz): Change the name to OnIceConnectionStateChange so as to |
+ // conform to the w3c standard. |
pthatcher1
2015/07/06 22:04:47
Just one TODO is sufficient. You can remove this
honghaiz3
2015/08/05 23:56:57
I kept this one and removed the other one because
|
virtual void OnIceConnectionChange( |
PeerConnectionInterface::IceConnectionState new_state) {} |
// Called any time the IceGatheringState changes |
@@ -96,6 +98,10 @@ class IceObserver { |
// (via PeerConnectionObserver) |
virtual void OnIceComplete() {} |
+ // Called anytime when all ICE transport channels started not receiving |
+ // packets or at least one channel changes back. |
pthatcher1
2015/07/06 22:04:47
Might be more clear with something like:
"Called
honghaiz3
2015/08/05 23:56:57
Maybe enough just with the last sentence.
|
+ virtual void OnIceConnectionReceivingChange(bool receiving) {} |
+ |
protected: |
~IceObserver() {} |
@@ -298,6 +304,7 @@ class WebRtcSession : public cricket::BaseSession, |
cricket::TransportProxy* proxy, |
const cricket::Candidates& candidates); |
virtual void OnCandidatesAllocationDone(); |
+ void OnTransportReceiving(cricket::Transport* transport) override; |
// Enables media channels to allow sending of media. |
void EnableChannels(); |
@@ -342,6 +349,7 @@ class WebRtcSession : public cricket::BaseSession, |
std::string BadStateErrMsg(State state); |
void SetIceConnectionState(PeerConnectionInterface::IceConnectionState state); |
+ void SetIceConnectionReceiving(bool receiving); |
bool ValidateBundleSettings(const cricket::SessionDescription* desc); |
bool HasRtcpMuxEnabled(const cricket::ContentInfo* content); |
@@ -381,6 +389,7 @@ class WebRtcSession : public cricket::BaseSession, |
MediaStreamSignaling* mediastream_signaling_; |
IceObserver* ice_observer_; |
PeerConnectionInterface::IceConnectionState ice_connection_state_; |
+ bool ice_connection_receiving_; |
rtc::scoped_ptr<SessionDescriptionInterface> local_desc_; |
rtc::scoped_ptr<SessionDescriptionInterface> remote_desc_; |
// Candidates that arrived before the remote description was set. |