Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Side by Side Diff: webrtc/api/peerconnection.h

Issue 1648813004: Remove candidates when doing continual gathering (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: small fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 const MediaConstraintsInterface* constraints) override; 123 const MediaConstraintsInterface* constraints) override;
124 void CreateAnswer(CreateSessionDescriptionObserver* observer, 124 void CreateAnswer(CreateSessionDescriptionObserver* observer,
125 const RTCOfferAnswerOptions& options) override; 125 const RTCOfferAnswerOptions& options) override;
126 void SetLocalDescription(SetSessionDescriptionObserver* observer, 126 void SetLocalDescription(SetSessionDescriptionObserver* observer,
127 SessionDescriptionInterface* desc) override; 127 SessionDescriptionInterface* desc) override;
128 void SetRemoteDescription(SetSessionDescriptionObserver* observer, 128 void SetRemoteDescription(SetSessionDescriptionObserver* observer,
129 SessionDescriptionInterface* desc) override; 129 SessionDescriptionInterface* desc) override;
130 bool SetConfiguration( 130 bool SetConfiguration(
131 const PeerConnectionInterface::RTCConfiguration& config) override; 131 const PeerConnectionInterface::RTCConfiguration& config) override;
132 bool AddIceCandidate(const IceCandidateInterface* candidate) override; 132 bool AddIceCandidate(const IceCandidateInterface* candidate) override;
133 bool RemoveIceCandidates(const cricket::Candidates& candidates) override;
133 134
134 void RegisterUMAObserver(UMAObserver* observer) override; 135 void RegisterUMAObserver(UMAObserver* observer) override;
135 136
136 void Close() override; 137 void Close() override;
137 138
138 // Virtual for unit tests. 139 // Virtual for unit tests.
139 virtual const std::vector<rtc::scoped_refptr<DataChannel>>& 140 virtual const std::vector<rtc::scoped_refptr<DataChannel>>&
140 sctp_data_channels() const { 141 sctp_data_channels() const {
141 return sctp_data_channels_; 142 return sctp_data_channels_;
142 }; 143 };
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 void DestroyAudioSender(MediaStreamInterface* stream, 178 void DestroyAudioSender(MediaStreamInterface* stream,
178 AudioTrackInterface* audio_track, 179 AudioTrackInterface* audio_track,
179 uint32_t ssrc); 180 uint32_t ssrc);
180 void DestroyVideoSender(MediaStreamInterface* stream, 181 void DestroyVideoSender(MediaStreamInterface* stream,
181 VideoTrackInterface* video_track); 182 VideoTrackInterface* video_track);
182 183
183 // Implements IceObserver 184 // Implements IceObserver
184 void OnIceConnectionChange(IceConnectionState new_state) override; 185 void OnIceConnectionChange(IceConnectionState new_state) override;
185 void OnIceGatheringChange(IceGatheringState new_state) override; 186 void OnIceGatheringChange(IceGatheringState new_state) override;
186 void OnIceCandidate(const IceCandidateInterface* candidate) override; 187 void OnIceCandidate(const IceCandidateInterface* candidate) override;
188 void OnIceCandidatesRemoved(const cricket::Candidates& candidates) override;
187 void OnIceConnectionReceivingChange(bool receiving) override; 189 void OnIceConnectionReceivingChange(bool receiving) override;
188 190
189 // Signals from WebRtcSession. 191 // Signals from WebRtcSession.
190 void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state); 192 void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state);
191 void ChangeSignalingState(SignalingState signaling_state); 193 void ChangeSignalingState(SignalingState signaling_state);
192 194
193 // Signals from MediaStreamObserver. 195 // Signals from MediaStreamObserver.
194 void OnAudioTrackAdded(AudioTrackInterface* track, 196 void OnAudioTrackAdded(AudioTrackInterface* track,
195 MediaStreamInterface* stream); 197 MediaStreamInterface* stream);
196 void OnAudioTrackRemoved(AudioTrackInterface* track, 198 void OnAudioTrackRemoved(AudioTrackInterface* track,
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 // because its destruction fires signals (such as VoiceChannelDestroyed) 398 // because its destruction fires signals (such as VoiceChannelDestroyed)
397 // which will trigger some final actions in PeerConnection... 399 // which will trigger some final actions in PeerConnection...
398 rtc::scoped_ptr<WebRtcSession> session_; 400 rtc::scoped_ptr<WebRtcSession> session_;
399 // ... But stats_ depends on session_ so it should be destroyed even earlier. 401 // ... But stats_ depends on session_ so it should be destroyed even earlier.
400 rtc::scoped_ptr<StatsCollector> stats_; 402 rtc::scoped_ptr<StatsCollector> stats_;
401 }; 403 };
402 404
403 } // namespace webrtc 405 } // namespace webrtc
404 406
405 #endif // WEBRTC_API_PEERCONNECTION_H_ 407 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698