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

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

Issue 1956453003: Relanding: Implement RTCConfiguration.iceCandidatePoolSize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing uninitialized variable (noticed by msan) Created 4 years, 7 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/test/peerconnectiontestwrapper.cc ('k') | webrtc/api/webrtcsession.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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 WebRtcSession(webrtc::MediaControllerInterface* media_controller, 140 WebRtcSession(webrtc::MediaControllerInterface* media_controller,
141 rtc::Thread* signaling_thread, 141 rtc::Thread* signaling_thread,
142 rtc::Thread* worker_thread, 142 rtc::Thread* worker_thread,
143 cricket::PortAllocator* port_allocator); 143 cricket::PortAllocator* port_allocator);
144 virtual ~WebRtcSession(); 144 virtual ~WebRtcSession();
145 145
146 // These are const to allow them to be called from const methods. 146 // These are const to allow them to be called from const methods.
147 rtc::Thread* signaling_thread() const { return signaling_thread_; } 147 rtc::Thread* signaling_thread() const { return signaling_thread_; }
148 rtc::Thread* worker_thread() const { return worker_thread_; } 148 rtc::Thread* worker_thread() const { return worker_thread_; }
149 cricket::PortAllocator* port_allocator() const { return port_allocator_; }
150 149
151 // The ID of this session. 150 // The ID of this session.
152 const std::string& id() const { return sid_; } 151 const std::string& id() const { return sid_; }
153 152
154 bool Initialize( 153 bool Initialize(
155 const PeerConnectionFactoryInterface::Options& options, 154 const PeerConnectionFactoryInterface::Options& options,
156 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 155 std::unique_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
157 const PeerConnectionInterface::RTCConfiguration& rtc_configuration); 156 const PeerConnectionInterface::RTCConfiguration& rtc_configuration);
158 // Deletes the voice, video and data channel and changes the session state 157 // Deletes the voice, video and data channel and changes the session state
159 // to STATE_CLOSED. 158 // to STATE_CLOSED.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool SetLocalDescription(SessionDescriptionInterface* desc, 206 bool SetLocalDescription(SessionDescriptionInterface* desc,
208 std::string* err_desc); 207 std::string* err_desc);
209 // The ownership of |desc| will be transferred after this call. 208 // The ownership of |desc| will be transferred after this call.
210 bool SetRemoteDescription(SessionDescriptionInterface* desc, 209 bool SetRemoteDescription(SessionDescriptionInterface* desc,
211 std::string* err_desc); 210 std::string* err_desc);
212 bool ProcessIceMessage(const IceCandidateInterface* ice_candidate); 211 bool ProcessIceMessage(const IceCandidateInterface* ice_candidate);
213 212
214 bool RemoveRemoteIceCandidates( 213 bool RemoveRemoteIceCandidates(
215 const std::vector<cricket::Candidate>& candidates); 214 const std::vector<cricket::Candidate>& candidates);
216 215
217 bool SetIceTransports(PeerConnectionInterface::IceTransportsType type);
218
219 cricket::IceConfig ParseIceConfig( 216 cricket::IceConfig ParseIceConfig(
220 const PeerConnectionInterface::RTCConfiguration& config) const; 217 const PeerConnectionInterface::RTCConfiguration& config) const;
221 218
222 void SetIceConfig(const cricket::IceConfig& ice_config); 219 void SetIceConfig(const cricket::IceConfig& ice_config);
223 220
224 // Start gathering candidates for any new transports, or transports doing an 221 // Start gathering candidates for any new transports, or transports doing an
225 // ICE restart. 222 // ICE restart.
226 void MaybeStartGathering(); 223 void MaybeStartGathering();
227 224
228 const SessionDescriptionInterface* local_description() const { 225 const SessionDescriptionInterface* local_description() const {
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 // Gather the usage of IPv4/IPv6 as best connection. 460 // Gather the usage of IPv4/IPv6 as best connection.
464 void ReportBestConnectionState(const cricket::TransportStats& stats); 461 void ReportBestConnectionState(const cricket::TransportStats& stats);
465 462
466 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); 463 void ReportNegotiatedCiphers(const cricket::TransportStats& stats);
467 464
468 void OnSentPacket_w(cricket::TransportChannel* channel, 465 void OnSentPacket_w(cricket::TransportChannel* channel,
469 const rtc::SentPacket& sent_packet); 466 const rtc::SentPacket& sent_packet);
470 467
471 rtc::Thread* const signaling_thread_; 468 rtc::Thread* const signaling_thread_;
472 rtc::Thread* const worker_thread_; 469 rtc::Thread* const worker_thread_;
473 cricket::PortAllocator* const port_allocator_;
474 470
475 State state_ = STATE_INIT; 471 State state_ = STATE_INIT;
476 Error error_ = ERROR_NONE; 472 Error error_ = ERROR_NONE;
477 std::string error_desc_; 473 std::string error_desc_;
478 474
479 const std::string sid_; 475 const std::string sid_;
480 bool initial_offerer_ = false; 476 bool initial_offerer_ = false;
481 477
482 std::unique_ptr<cricket::TransportController> transport_controller_; 478 std::unique_ptr<cricket::TransportController> transport_controller_;
483 MediaControllerInterface* media_controller_; 479 MediaControllerInterface* media_controller_;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 PeerConnectionInterface::BundlePolicy bundle_policy_; 511 PeerConnectionInterface::BundlePolicy bundle_policy_;
516 512
517 // Declares the RTCP mux policy for the WebRTCSession. 513 // Declares the RTCP mux policy for the WebRTCSession.
518 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 514 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
519 515
520 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 516 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
521 }; 517 };
522 } // namespace webrtc 518 } // namespace webrtc
523 519
524 #endif // WEBRTC_API_WEBRTCSESSION_H_ 520 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/test/peerconnectiontestwrapper.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698