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

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

Issue 2504103002: Adding GetConfiguration to PeerConnection. (Closed)
Patch Set: Fixing typo in comment. Created 4 years, 1 month 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 | « no previous file | 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 const RTCOfferAnswerOptions& options) override; 122 const RTCOfferAnswerOptions& options) override;
123 // Deprecated, use version without constraints. 123 // Deprecated, use version without constraints.
124 void CreateAnswer(CreateSessionDescriptionObserver* observer, 124 void CreateAnswer(CreateSessionDescriptionObserver* observer,
125 const MediaConstraintsInterface* constraints) override; 125 const MediaConstraintsInterface* constraints) override;
126 void CreateAnswer(CreateSessionDescriptionObserver* observer, 126 void CreateAnswer(CreateSessionDescriptionObserver* observer,
127 const RTCOfferAnswerOptions& options) override; 127 const RTCOfferAnswerOptions& options) override;
128 void SetLocalDescription(SetSessionDescriptionObserver* observer, 128 void SetLocalDescription(SetSessionDescriptionObserver* observer,
129 SessionDescriptionInterface* desc) override; 129 SessionDescriptionInterface* desc) override;
130 void SetRemoteDescription(SetSessionDescriptionObserver* observer, 130 void SetRemoteDescription(SetSessionDescriptionObserver* observer,
131 SessionDescriptionInterface* desc) override; 131 SessionDescriptionInterface* desc) override;
132 PeerConnectionInterface::RTCConfiguration GetConfiguration() override;
132 bool SetConfiguration( 133 bool SetConfiguration(
133 const PeerConnectionInterface::RTCConfiguration& configuration) override; 134 const PeerConnectionInterface::RTCConfiguration& configuration) override;
134 bool AddIceCandidate(const IceCandidateInterface* candidate) override; 135 bool AddIceCandidate(const IceCandidateInterface* candidate) override;
135 bool RemoveIceCandidates( 136 bool RemoveIceCandidates(
136 const std::vector<cricket::Candidate>& candidates) override; 137 const std::vector<cricket::Candidate>& candidates) override;
137 138
138 void RegisterUMAObserver(UMAObserver* observer) override; 139 void RegisterUMAObserver(UMAObserver* observer) override;
139 140
140 bool StartRtcEventLog(rtc::PlatformFile file, 141 bool StartRtcEventLog(rtc::PlatformFile file,
141 int64_t max_size_bytes) override; 142 int64_t max_size_bytes) override;
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 // PeerConnection is running. It is passed to PeerConnection as a raw pointer. 381 // PeerConnection is running. It is passed to PeerConnection as a raw pointer.
381 // However, since the reference counting is done in the 382 // However, since the reference counting is done in the
382 // PeerConnectionFactoryInterface all instances created using the raw pointer 383 // PeerConnectionFactoryInterface all instances created using the raw pointer
383 // will refer to the same reference count. 384 // will refer to the same reference count.
384 rtc::scoped_refptr<PeerConnectionFactory> factory_; 385 rtc::scoped_refptr<PeerConnectionFactory> factory_;
385 PeerConnectionObserver* observer_; 386 PeerConnectionObserver* observer_;
386 UMAObserver* uma_observer_; 387 UMAObserver* uma_observer_;
387 SignalingState signaling_state_; 388 SignalingState signaling_state_;
388 IceConnectionState ice_connection_state_; 389 IceConnectionState ice_connection_state_;
389 IceGatheringState ice_gathering_state_; 390 IceGatheringState ice_gathering_state_;
391 PeerConnectionInterface::RTCConfiguration configuration_;
390 392
391 std::unique_ptr<cricket::PortAllocator> port_allocator_; 393 std::unique_ptr<cricket::PortAllocator> port_allocator_;
392 // The EventLog needs to outlive the media controller. 394 // The EventLog needs to outlive the media controller.
393 std::unique_ptr<RtcEventLog> event_log_; 395 std::unique_ptr<RtcEventLog> event_log_;
394 std::unique_ptr<MediaControllerInterface> media_controller_; 396 std::unique_ptr<MediaControllerInterface> media_controller_;
395 397
396 // One PeerConnection has only one RTCP CNAME. 398 // One PeerConnection has only one RTCP CNAME.
397 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 399 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9
398 std::string rtcp_cname_; 400 std::string rtcp_cname_;
399 401
(...skipping 11 matching lines...) Expand all
411 TrackInfos local_video_tracks_; 413 TrackInfos local_video_tracks_;
412 414
413 SctpSidAllocator sid_allocator_; 415 SctpSidAllocator sid_allocator_;
414 // label -> DataChannel 416 // label -> DataChannel
415 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_; 417 std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_;
416 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_; 418 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_;
417 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_; 419 std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
418 420
419 bool remote_peer_supports_msid_ = false; 421 bool remote_peer_supports_msid_ = false;
420 422
421 bool enable_ice_renomination_ = false;
422
423 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> 423 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
424 senders_; 424 senders_;
425 std::vector< 425 std::vector<
426 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 426 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
427 receivers_; 427 receivers_;
428 std::unique_ptr<WebRtcSession> session_; 428 std::unique_ptr<WebRtcSession> session_;
429 std::unique_ptr<StatsCollector> stats_; 429 std::unique_ptr<StatsCollector> stats_;
430 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; 430 rtc::scoped_refptr<RTCStatsCollector> stats_collector_;
431 }; 431 };
432 432
433 } // namespace webrtc 433 } // namespace webrtc
434 434
435 #endif // WEBRTC_API_PEERCONNECTION_H_ 435 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698