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

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

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