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

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

Issue 2335553006: Moving webrtc/stats/ into webrtc/api/ to resolve a circular dependency (Closed)
Patch Set: Created 4 years, 3 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
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
11 #ifndef WEBRTC_API_PEERCONNECTION_H_ 11 #ifndef WEBRTC_API_PEERCONNECTION_H_
12 #define WEBRTC_API_PEERCONNECTION_H_ 12 #define WEBRTC_API_PEERCONNECTION_H_
13 13
14 #include <string> 14 #include <string>
15 #include <map> 15 #include <map>
16 #include <memory> 16 #include <memory>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/api/peerconnectionfactory.h" 19 #include "webrtc/api/peerconnectionfactory.h"
20 #include "webrtc/api/peerconnectioninterface.h" 20 #include "webrtc/api/peerconnectioninterface.h"
21 #include "webrtc/api/rtcstatscollector.h"
21 #include "webrtc/api/rtpreceiver.h" 22 #include "webrtc/api/rtpreceiver.h"
22 #include "webrtc/api/rtpsender.h" 23 #include "webrtc/api/rtpsender.h"
23 #include "webrtc/api/statscollector.h" 24 #include "webrtc/api/statscollector.h"
24 #include "webrtc/api/streamcollection.h" 25 #include "webrtc/api/streamcollection.h"
25 #include "webrtc/api/webrtcsession.h" 26 #include "webrtc/api/webrtcsession.h"
26 27
27 namespace webrtc { 28 namespace webrtc {
28 29
29 class MediaStreamObserver; 30 class MediaStreamObserver;
30 class VideoRtpReceiver; 31 class VideoRtpReceiver;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 const override; 96 const override;
96 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() 97 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers()
97 const override; 98 const override;
98 99
99 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( 100 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
100 const std::string& label, 101 const std::string& label,
101 const DataChannelInit* config) override; 102 const DataChannelInit* config) override;
102 bool GetStats(StatsObserver* observer, 103 bool GetStats(StatsObserver* observer,
103 webrtc::MediaStreamTrackInterface* track, 104 webrtc::MediaStreamTrackInterface* track,
104 StatsOutputLevel level) override; 105 StatsOutputLevel level) override;
106 void GetRTCStats(
107 const rtc::scoped_refptr<RTCStatsCollectorCallback>& callback) override;
nisse-webrtc 2016/09/13 08:16:40 Passing references to "smart pointers" is no longe
105 108
106 SignalingState signaling_state() override; 109 SignalingState signaling_state() override;
107 110
108 // TODO(bemasc): Remove ice_state() when callers are removed. 111 // TODO(bemasc): Remove ice_state() when callers are removed.
109 IceState ice_state() override; 112 IceState ice_state() override;
110 IceConnectionState ice_connection_state() override; 113 IceConnectionState ice_connection_state() override;
111 IceGatheringState ice_gathering_state() override; 114 IceGatheringState ice_gathering_state() override;
112 115
113 const SessionDescriptionInterface* local_description() const override; 116 const SessionDescriptionInterface* local_description() const override;
114 const SessionDescriptionInterface* remote_description() const override; 117 const SessionDescriptionInterface* remote_description() const override;
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 bool enable_ice_renomination_ = false; 423 bool enable_ice_renomination_ = false;
421 424
422 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>> 425 std::vector<rtc::scoped_refptr<RtpSenderProxyWithInternal<RtpSenderInternal>>>
423 senders_; 426 senders_;
424 std::vector< 427 std::vector<
425 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 428 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
426 receivers_; 429 receivers_;
427 430
428 std::unique_ptr<WebRtcSession> session_; 431 std::unique_ptr<WebRtcSession> session_;
429 std::unique_ptr<StatsCollector> stats_; 432 std::unique_ptr<StatsCollector> stats_;
433 rtc::scoped_refptr<RTCStatsCollector> stats_collector_;
430 }; 434 };
431 435
432 } // namespace webrtc 436 } // namespace webrtc
433 437
434 #endif // WEBRTC_API_PEERCONNECTION_H_ 438 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698