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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( | 100 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( |
101 const std::string& label, | 101 const std::string& label, |
102 const DataChannelInit* config) override; | 102 const DataChannelInit* config) override; |
103 bool GetStats(StatsObserver* observer, | 103 bool GetStats(StatsObserver* observer, |
104 webrtc::MediaStreamTrackInterface* track, | 104 webrtc::MediaStreamTrackInterface* track, |
105 StatsOutputLevel level) override; | 105 StatsOutputLevel level) override; |
106 void GetStats(RTCStatsCollectorCallback* callback) override; | 106 void GetStats(RTCStatsCollectorCallback* callback) override; |
107 | 107 |
108 SignalingState signaling_state() override; | 108 SignalingState signaling_state() override; |
109 | 109 |
| 110 // TODO(bemasc): Remove ice_state() when callers are removed. |
| 111 IceState ice_state() override; |
110 IceConnectionState ice_connection_state() override; | 112 IceConnectionState ice_connection_state() override; |
111 IceGatheringState ice_gathering_state() override; | 113 IceGatheringState ice_gathering_state() override; |
112 | 114 |
113 const SessionDescriptionInterface* local_description() const override; | 115 const SessionDescriptionInterface* local_description() const override; |
114 const SessionDescriptionInterface* remote_description() const override; | 116 const SessionDescriptionInterface* remote_description() const override; |
115 | 117 |
116 // JSEP01 | 118 // JSEP01 |
117 // Deprecated, use version without constraints. | 119 // Deprecated, use version without constraints. |
118 void CreateOffer(CreateSessionDescriptionObserver* observer, | 120 void CreateOffer(CreateSessionDescriptionObserver* observer, |
119 const MediaConstraintsInterface* constraints) override; | 121 const MediaConstraintsInterface* constraints) override; |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 // Storing the factory as a scoped reference pointer ensures that the memory | 379 // Storing the factory as a scoped reference pointer ensures that the memory |
378 // in the PeerConnectionFactoryImpl remains available as long as the | 380 // in the PeerConnectionFactoryImpl remains available as long as the |
379 // 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. |
380 // However, since the reference counting is done in the | 382 // However, since the reference counting is done in the |
381 // PeerConnectionFactoryInterface all instances created using the raw pointer | 383 // PeerConnectionFactoryInterface all instances created using the raw pointer |
382 // will refer to the same reference count. | 384 // will refer to the same reference count. |
383 rtc::scoped_refptr<PeerConnectionFactory> factory_; | 385 rtc::scoped_refptr<PeerConnectionFactory> factory_; |
384 PeerConnectionObserver* observer_; | 386 PeerConnectionObserver* observer_; |
385 UMAObserver* uma_observer_; | 387 UMAObserver* uma_observer_; |
386 SignalingState signaling_state_; | 388 SignalingState signaling_state_; |
| 389 // TODO(bemasc): Remove ice_state_. |
| 390 IceState ice_state_; |
387 IceConnectionState ice_connection_state_; | 391 IceConnectionState ice_connection_state_; |
388 IceGatheringState ice_gathering_state_; | 392 IceGatheringState ice_gathering_state_; |
389 | 393 |
390 std::unique_ptr<cricket::PortAllocator> port_allocator_; | 394 std::unique_ptr<cricket::PortAllocator> port_allocator_; |
391 std::unique_ptr<MediaControllerInterface> media_controller_; | 395 std::unique_ptr<MediaControllerInterface> media_controller_; |
392 | 396 |
393 // One PeerConnection has only one RTCP CNAME. | 397 // One PeerConnection has only one RTCP CNAME. |
394 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 | 398 // https://tools.ietf.org/html/draft-ietf-rtcweb-rtp-usage-26#section-4.9 |
395 std::string rtcp_cname_; | 399 std::string rtcp_cname_; |
396 | 400 |
(...skipping 27 matching lines...) Expand all Loading... |
424 receivers_; | 428 receivers_; |
425 | 429 |
426 std::unique_ptr<WebRtcSession> session_; | 430 std::unique_ptr<WebRtcSession> session_; |
427 std::unique_ptr<StatsCollector> stats_; | 431 std::unique_ptr<StatsCollector> stats_; |
428 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; | 432 rtc::scoped_refptr<RTCStatsCollector> stats_collector_; |
429 }; | 433 }; |
430 | 434 |
431 } // namespace webrtc | 435 } // namespace webrtc |
432 | 436 |
433 #endif // WEBRTC_API_PEERCONNECTION_H_ | 437 #endif // WEBRTC_API_PEERCONNECTION_H_ |
OLD | NEW |