| 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 AudioTrackInterface* audio_track, | 135 AudioTrackInterface* audio_track, |
| 136 uint32 ssrc) override; | 136 uint32 ssrc) override; |
| 137 void OnAddLocalVideoTrack(MediaStreamInterface* stream, | 137 void OnAddLocalVideoTrack(MediaStreamInterface* stream, |
| 138 VideoTrackInterface* video_track, | 138 VideoTrackInterface* video_track, |
| 139 uint32 ssrc) override; | 139 uint32 ssrc) override; |
| 140 void OnRemoveLocalAudioTrack(MediaStreamInterface* stream, | 140 void OnRemoveLocalAudioTrack(MediaStreamInterface* stream, |
| 141 AudioTrackInterface* audio_track, | 141 AudioTrackInterface* audio_track, |
| 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 void OnRemoveLocalStream(MediaStreamInterface* stream) override; |
| 146 | 146 |
| 147 // Implements IceObserver | 147 // Implements IceObserver |
| 148 virtual void OnIceConnectionChange(IceConnectionState new_state); | 148 // TODO(honghaiz): Change to OnIceConnectionStateChange so as to conform to |
| 149 virtual void OnIceGatheringChange(IceGatheringState new_state); | 149 // the w3c standard. |
| 150 virtual void OnIceCandidate(const IceCandidateInterface* candidate); | 150 void OnIceConnectionChange(IceConnectionState new_state) override; |
| 151 virtual void OnIceComplete(); | 151 void OnIceGatheringChange(IceGatheringState new_state) override; |
| 152 void OnIceCandidate(const IceCandidateInterface* candidate) override; |
| 153 void OnIceComplete() override; |
| 154 void OnIceConnectionReceivingChange(bool receiving) override; |
| 152 | 155 |
| 153 // Signals from WebRtcSession. | 156 // Signals from WebRtcSession. |
| 154 void OnSessionStateChange(cricket::BaseSession* session, | 157 void OnSessionStateChange(cricket::BaseSession* session, |
| 155 cricket::BaseSession::State state); | 158 cricket::BaseSession::State state); |
| 156 void ChangeSignalingState(SignalingState signaling_state); | 159 void ChangeSignalingState(SignalingState signaling_state); |
| 157 | 160 |
| 158 bool DoInitialize(IceTransportsType type, | 161 bool DoInitialize(IceTransportsType type, |
| 159 const StunConfigurations& stun_config, | 162 const StunConfigurations& stun_config, |
| 160 const TurnConfigurations& turn_config, | 163 const TurnConfigurations& turn_config, |
| 161 const MediaConstraintsInterface* constraints, | 164 const MediaConstraintsInterface* constraints, |
| (...skipping 30 matching lines...) Expand all Loading... |
| 192 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; | 195 rtc::scoped_ptr<cricket::PortAllocator> port_allocator_; |
| 193 rtc::scoped_ptr<WebRtcSession> session_; | 196 rtc::scoped_ptr<WebRtcSession> session_; |
| 194 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; | 197 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; |
| 195 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; | 198 rtc::scoped_ptr<MediaStreamHandlerContainer> stream_handler_container_; |
| 196 rtc::scoped_ptr<StatsCollector> stats_; | 199 rtc::scoped_ptr<StatsCollector> stats_; |
| 197 }; | 200 }; |
| 198 | 201 |
| 199 } // namespace webrtc | 202 } // namespace webrtc |
| 200 | 203 |
| 201 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ | 204 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ |
| OLD | NEW |