OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
142 uint32 ssrc) override; | 142 uint32 ssrc) override; |
143 void OnRemoveLocalVideoTrack(MediaStreamInterface* stream, | 143 void OnRemoveLocalVideoTrack(MediaStreamInterface* stream, |
144 VideoTrackInterface* video_track) override; | 144 VideoTrackInterface* video_track) override; |
145 virtual void OnRemoveLocalStream(MediaStreamInterface* stream); | 145 virtual void OnRemoveLocalStream(MediaStreamInterface* stream); |
146 | 146 |
147 // Implements IceObserver | 147 // Implements IceObserver |
148 virtual void OnIceConnectionChange(IceConnectionState new_state); | 148 virtual void OnIceConnectionChange(IceConnectionState new_state); |
149 virtual void OnIceGatheringChange(IceGatheringState new_state); | 149 virtual void OnIceGatheringChange(IceGatheringState new_state); |
150 virtual void OnIceCandidate(const IceCandidateInterface* candidate); | 150 virtual void OnIceCandidate(const IceCandidateInterface* candidate); |
151 virtual void OnIceComplete(); | 151 virtual void OnIceComplete(); |
152 void OnIceFlakinessChange(bool flaky) override; | |
pthatcher1
2015/06/24 23:42:52
Can you make them all "override", then, to be cons
honghaiz3
2015/08/05 23:56:56
Done.
| |
152 | 153 |
153 // Signals from WebRtcSession. | 154 // Signals from WebRtcSession. |
154 void OnSessionStateChange(cricket::BaseSession* session, | 155 void OnSessionStateChange(cricket::BaseSession* session, |
155 cricket::BaseSession::State state); | 156 cricket::BaseSession::State state); |
156 void ChangeSignalingState(SignalingState signaling_state); | 157 void ChangeSignalingState(SignalingState signaling_state); |
157 | 158 |
158 bool DoInitialize(IceTransportsType type, | 159 bool DoInitialize(IceTransportsType type, |
159 const StunConfigurations& stun_config, | 160 const StunConfigurations& stun_config, |
160 const TurnConfigurations& turn_config, | 161 const TurnConfigurations& turn_config, |
161 const MediaConstraintsInterface* constraints, | 162 const MediaConstraintsInterface* constraints, |
(...skipping 30 matching lines...) Expand all Loading... | |
192 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; | 193 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; |
193 rtc::scoped_ptr<WebRtcSession> session_; | 194 rtc::scoped_ptr<WebRtcSession> session_; |
194 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; | 195 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; |
195 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; | 196 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; |
196 rtc::scoped_ptr<StatsCollector> stats_; | 197 rtc::scoped_ptr<StatsCollector> stats_; |
197 }; | 198 }; |
198 | 199 |
199 } // namespace webrtc | 200 } // namespace webrtc |
200 | 201 |
201 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 202 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ |
OLD | NEW |