| Index: talk/app/webrtc/webrtcsession.h
|
| diff --git a/talk/app/webrtc/webrtcsession.h b/talk/app/webrtc/webrtcsession.h
|
| index 821d59db5705e34d4a8381e9f0ead48967f590e7..a2cba209703068437ea7728995f1196499d45c09 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.
|
| virtual void OnIceConnectionChange(
|
| PeerConnectionInterface::IceConnectionState new_state) {}
|
| // Called any time the IceGatheringState changes
|
| @@ -96,6 +98,9 @@ class IceObserver {
|
| // (via PeerConnectionObserver)
|
| virtual void OnIceComplete() {}
|
|
|
| + // Called whenever the state changes between receiving and not receiving.
|
| + virtual void OnIceConnectionReceivingChange(bool receiving) {}
|
| +
|
| protected:
|
| ~IceObserver() {}
|
|
|
| @@ -298,6 +303,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 +348,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 +388,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.
|
|
|