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

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: Fix a Windows compiling error 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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const RTCOfferAnswerOptions& options) override; 109 const RTCOfferAnswerOptions& options) override;
110 void CreateAnswer(CreateSessionDescriptionObserver* observer, 110 void CreateAnswer(CreateSessionDescriptionObserver* observer,
111 const MediaConstraintsInterface* constraints) override; 111 const MediaConstraintsInterface* constraints) override;
112 void SetLocalDescription(SetSessionDescriptionObserver* observer, 112 void SetLocalDescription(SetSessionDescriptionObserver* observer,
113 SessionDescriptionInterface* desc) override; 113 SessionDescriptionInterface* desc) override;
114 void SetRemoteDescription(SetSessionDescriptionObserver* observer, 114 void SetRemoteDescription(SetSessionDescriptionObserver* observer,
115 SessionDescriptionInterface* desc) override; 115 SessionDescriptionInterface* desc) override;
116 bool SetConfiguration( 116 bool SetConfiguration(
117 const PeerConnectionInterface::RTCConfiguration& config) override; 117 const PeerConnectionInterface::RTCConfiguration& config) override;
118 bool AddIceCandidate(const IceCandidateInterface* candidate) override; 118 bool AddIceCandidate(const IceCandidateInterface* candidate) override;
119 bool RemoveIceCandidates(
120 const std::vector<IceCandidateInterfaceRefPtr>& candidates) override;
119 121
120 void RegisterUMAObserver(UMAObserver* observer) override; 122 void RegisterUMAObserver(UMAObserver* observer) override;
121 123
122 void Close() override; 124 void Close() override;
123 125
124 // Virtual for unit tests. 126 // Virtual for unit tests.
125 virtual const std::vector<rtc::scoped_refptr<DataChannel>>& 127 virtual const std::vector<rtc::scoped_refptr<DataChannel>>&
126 sctp_data_channels() const { 128 sctp_data_channels() const {
127 return sctp_data_channels_; 129 return sctp_data_channels_;
128 }; 130 };
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 void DestroyAudioSender(MediaStreamInterface* stream, 165 void DestroyAudioSender(MediaStreamInterface* stream,
164 AudioTrackInterface* audio_track, 166 AudioTrackInterface* audio_track,
165 uint32_t ssrc); 167 uint32_t ssrc);
166 void DestroyVideoSender(MediaStreamInterface* stream, 168 void DestroyVideoSender(MediaStreamInterface* stream,
167 VideoTrackInterface* video_track); 169 VideoTrackInterface* video_track);
168 170
169 // Implements IceObserver 171 // Implements IceObserver
170 void OnIceConnectionChange(IceConnectionState new_state) override; 172 void OnIceConnectionChange(IceConnectionState new_state) override;
171 void OnIceGatheringChange(IceGatheringState new_state) override; 173 void OnIceGatheringChange(IceGatheringState new_state) override;
172 void OnIceCandidate(const IceCandidateInterface* candidate) override; 174 void OnIceCandidate(const IceCandidateInterface* candidate) override;
175 void OnIceCandidatesRemoved(
176 const std::vector<IceCandidateInterfaceRefPtr>& candidates) override;
173 void OnIceConnectionReceivingChange(bool receiving) override; 177 void OnIceConnectionReceivingChange(bool receiving) override;
174 178
175 // Signals from WebRtcSession. 179 // Signals from WebRtcSession.
176 void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state); 180 void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state);
177 void ChangeSignalingState(SignalingState signaling_state); 181 void ChangeSignalingState(SignalingState signaling_state);
178 182
179 // Signals from MediaStreamObserver. 183 // Signals from MediaStreamObserver.
180 void OnAudioTrackAdded(AudioTrackInterface* track, 184 void OnAudioTrackAdded(AudioTrackInterface* track,
181 MediaStreamInterface* stream); 185 MediaStreamInterface* stream);
182 void OnAudioTrackRemoved(AudioTrackInterface* track, 186 void OnAudioTrackRemoved(AudioTrackInterface* track,
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 // because its destruction fires signals (such as VoiceChannelDestroyed) 377 // because its destruction fires signals (such as VoiceChannelDestroyed)
374 // which will trigger some final actions in PeerConnection... 378 // which will trigger some final actions in PeerConnection...
375 rtc::scoped_ptr<WebRtcSession> session_; 379 rtc::scoped_ptr<WebRtcSession> session_;
376 // ... But stats_ depends on session_ so it should be destroyed even earlier. 380 // ... But stats_ depends on session_ so it should be destroyed even earlier.
377 rtc::scoped_ptr<StatsCollector> stats_; 381 rtc::scoped_ptr<StatsCollector> stats_;
378 }; 382 };
379 383
380 } // namespace webrtc 384 } // namespace webrtc
381 385
382 #endif // WEBRTC_API_PEERCONNECTION_H_ 386 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698