| OLD | NEW |
| 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 11 matching lines...) Expand all Loading... |
| 22 #include "webrtc/api/rtpreceiver.h" | 22 #include "webrtc/api/rtpreceiver.h" |
| 23 #include "webrtc/api/rtpsender.h" | 23 #include "webrtc/api/rtpsender.h" |
| 24 #include "webrtc/api/statscollector.h" | 24 #include "webrtc/api/statscollector.h" |
| 25 #include "webrtc/api/streamcollection.h" | 25 #include "webrtc/api/streamcollection.h" |
| 26 #include "webrtc/api/webrtcsession.h" | 26 #include "webrtc/api/webrtcsession.h" |
| 27 | 27 |
| 28 namespace webrtc { | 28 namespace webrtc { |
| 29 | 29 |
| 30 class MediaStreamObserver; | 30 class MediaStreamObserver; |
| 31 class VideoRtpReceiver; | 31 class VideoRtpReceiver; |
| 32 class RtcEventLog; |
| 32 | 33 |
| 33 // Populates |session_options| from |rtc_options|, and returns true if options | 34 // Populates |session_options| from |rtc_options|, and returns true if options |
| 34 // are valid. | 35 // are valid. |
| 35 // |session_options|->transport_options map entries must exist in order for | 36 // |session_options|->transport_options map entries must exist in order for |
| 36 // them to be populated from |rtc_options|. | 37 // them to be populated from |rtc_options|. |
| 37 bool ExtractMediaSessionOptions( | 38 bool ExtractMediaSessionOptions( |
| 38 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, | 39 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, |
| 39 bool is_offer, | 40 bool is_offer, |
| 40 cricket::MediaSessionOptions* session_options); | 41 cricket::MediaSessionOptions* session_options); |
| 41 | 42 |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 rtc::scoped_refptr<PeerConnectionFactory> factory_; | 386 rtc::scoped_refptr<PeerConnectionFactory> factory_; |
| 386 PeerConnectionObserver* observer_; | 387 PeerConnectionObserver* observer_; |
| 387 UMAObserver* uma_observer_; | 388 UMAObserver* uma_observer_; |
| 388 SignalingState signaling_state_; | 389 SignalingState signaling_state_; |
| 389 // TODO(bemasc): Remove ice_state_. | 390 // TODO(bemasc): Remove ice_state_. |
| 390 IceState ice_state_; | 391 IceState ice_state_; |
| 391 IceConnectionState ice_connection_state_; | 392 IceConnectionState ice_connection_state_; |
| 392 IceGatheringState ice_gathering_state_; | 393 IceGatheringState ice_gathering_state_; |
| 393 | 394 |
| 394 std::unique_ptr<cricket::PortAllocator> port_allocator_; | 395 std::unique_ptr<cricket::PortAllocator> port_allocator_; |
| 396 // The EventLog needs to outlive the media controller. |
| 397 std::unique_ptr<RtcEventLog> event_log_; |
| 395 std::unique_ptr<MediaControllerInterface> media_controller_; | 398 std::unique_ptr<MediaControllerInterface> media_controller_; |
| 396 | 399 |
| 397 // One PeerConnection has only one RTCP CNAME. | 400 // One PeerConnection has only one RTCP CNAME. |
| 398 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 | 401 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 |
| 399 std::string rtcp_cname_; | 402 std::string rtcp_cname_; |
| 400 | 403 |
| 401 // Streams added via AddStream. | 404 // Streams added via AddStream. |
| 402 rtc::scoped_refptr<StreamCollection> local_streams_; | 405 rtc::scoped_refptr<StreamCollection> local_streams_; |
| 403 // Streams created as a result of SetRemoteDescription. | 406 // Streams created as a result of SetRemoteDescription. |
| 404 rtc::scoped_refptr<StreamCollection> remote_streams_; | 407 rtc::scoped_refptr<StreamCollection> remote_streams_; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 419 | 422 |
| 420 bool remote_peer_supports_msid_ = false; | 423 bool remote_peer_supports_msid_ = false; |
| 421 | 424 |
| 422 bool enable_ice_renomination_ = false; | 425 bool enable_ice_renomination_ = false; |
| 423 | 426 |
| 424 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> | 427 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> |
| 425 senders_; | 428 senders_; |
| 426 std::vector< | 429 std::vector< |
| 427 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> | 430 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> |
| 428 receivers_; | 431 receivers_; |
| 429 | |
| 430 std::unique_ptr<WebRtcSession> session_; | 432 std::unique_ptr<WebRtcSession> session_; |
| 431 std::unique_ptr<StatsCollector> stats_; | 433 std::unique_ptr<StatsCollector> stats_; |
| 432 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; | 434 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; |
| 433 }; | 435 }; |
| 434 | 436 |
| 435 } // namespace webrtc | 437 } // namespace webrtc |
| 436 | 438 |
| 437 #endif // WEBRTC_API_PEERCONNECTION_H_ | 439 #endif // WEBRTC_API_PEERCONNECTION_H_ |
| OLD | NEW |