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

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

Issue 1785613011: Revert of Remove candidates when doing continual gathering (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: 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
« no previous file with comments | « webrtc/api/jsepsessiondescription_unittest.cc ('k') | webrtc/api/peerconnection.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
134 const std::vector<cricket::Candidate>& candidates) override;
135 133
136 void RegisterUMAObserver(UMAObserver* observer) override; 134 void RegisterUMAObserver(UMAObserver* observer) override;
137 135
138 void Close() override; 136 void Close() override;
139 137
140 // Virtual for unit tests. 138 // Virtual for unit tests.
141 virtual const std::vector<rtc::scoped_refptr<DataChannel>>& 139 virtual const std::vector<rtc::scoped_refptr<DataChannel>>&
142 sctp_data_channels() const { 140 sctp_data_channels() const {
143 return sctp_data_channels_; 141 return sctp_data_channels_;
144 }; 142 };
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 void DestroyAudioSender(MediaStreamInterface* stream, 177 void DestroyAudioSender(MediaStreamInterface* stream,
180 AudioTrackInterface* audio_track, 178 AudioTrackInterface* audio_track,
181 uint32_t ssrc); 179 uint32_t ssrc);
182 void DestroyVideoSender(MediaStreamInterface* stream, 180 void DestroyVideoSender(MediaStreamInterface* stream,
183 VideoTrackInterface* video_track); 181 VideoTrackInterface* video_track);
184 182
185 // Implements IceObserver 183 // Implements IceObserver
186 void OnIceConnectionChange(IceConnectionState new_state) override; 184 void OnIceConnectionChange(IceConnectionState new_state) override;
187 void OnIceGatheringChange(IceGatheringState new_state) override; 185 void OnIceGatheringChange(IceGatheringState new_state) override;
188 void OnIceCandidate(const IceCandidateInterface* candidate) override; 186 void OnIceCandidate(const IceCandidateInterface* candidate) override;
189 void OnIceCandidatesRemoved(
190 const std::vector<cricket::Candidate>& candidates) override;
191 void OnIceConnectionReceivingChange(bool receiving) override; 187 void OnIceConnectionReceivingChange(bool receiving) override;
192 188
193 // Signals from WebRtcSession. 189 // Signals from WebRtcSession.
194 void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state); 190 void OnSessionStateChange(WebRtcSession* session, WebRtcSession::State state);
195 void ChangeSignalingState(SignalingState signaling_state); 191 void ChangeSignalingState(SignalingState signaling_state);
196 192
197 // Signals from MediaStreamObserver. 193 // Signals from MediaStreamObserver.
198 void OnAudioTrackAdded(AudioTrackInterface* track, 194 void OnAudioTrackAdded(AudioTrackInterface* track,
199 MediaStreamInterface* stream); 195 MediaStreamInterface* stream);
200 void OnAudioTrackRemoved(AudioTrackInterface* track, 196 void OnAudioTrackRemoved(AudioTrackInterface* track,
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 // because its destruction fires signals (such as VoiceChannelDestroyed) 396 // because its destruction fires signals (such as VoiceChannelDestroyed)
401 // which will trigger some final actions in PeerConnection... 397 // which will trigger some final actions in PeerConnection...
402 rtc::scoped_ptr<WebRtcSession> session_; 398 rtc::scoped_ptr<WebRtcSession> session_;
403 // ... But stats_ depends on session_ so it should be destroyed even earlier. 399 // ... But stats_ depends on session_ so it should be destroyed even earlier.
404 rtc::scoped_ptr<StatsCollector> stats_; 400 rtc::scoped_ptr<StatsCollector> stats_;
405 }; 401 };
406 402
407 } // namespace webrtc 403 } // namespace webrtc
408 404
409 #endif // WEBRTC_API_PEERCONNECTION_H_ 405 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/jsepsessiondescription_unittest.cc ('k') | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698