OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 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_CALL_CONGESTION_CONTROLLER_H_ | 11 #ifndef WEBRTC_CALL_CONGESTION_CONTROLLER_H_ |
12 #define WEBRTC_CALL_CONGESTION_CONTROLLER_H_ | 12 #define WEBRTC_CALL_CONGESTION_CONTROLLER_H_ |
13 | 13 |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
16 #include "webrtc/base/criticalsection.h" | 16 #include "webrtc/base/criticalsection.h" |
17 #include "webrtc/base/scoped_ptr.h" | 17 #include "webrtc/base/scoped_ptr.h" |
18 #include "webrtc/base/socket.h" | 18 #include "webrtc/base/socket.h" |
19 #include "webrtc/stream.h" | 19 #include "webrtc/stream.h" |
20 #include "webrtc/system_wrappers/include/clock.h" | |
mflodman
2015/12/09 10:11:25
Forward declare and move to cc file.
pbos-webrtc
2015/12/09 10:19:04
Removed.
| |
20 | 21 |
21 namespace webrtc { | 22 namespace webrtc { |
22 | 23 |
23 class BitrateController; | 24 class BitrateController; |
24 class BitrateObserver; | 25 class BitrateObserver; |
25 class CallStats; | 26 class CallStats; |
26 class Config; | 27 class Config; |
27 class PacedSender; | 28 class PacedSender; |
28 class PacketRouter; | 29 class PacketRouter; |
29 class ProcessThread; | 30 class ProcessThread; |
(...skipping 27 matching lines...) Expand all Loading... | |
57 PacedSender* pacer() const { return pacer_.get(); } | 58 PacedSender* pacer() const { return pacer_.get(); } |
58 PacketRouter* packet_router() const { return packet_router_.get(); } | 59 PacketRouter* packet_router() const { return packet_router_.get(); } |
59 TransportFeedbackObserver* GetTransportFeedbackObserver(); | 60 TransportFeedbackObserver* GetTransportFeedbackObserver(); |
60 | 61 |
61 void UpdatePacerBitrate(int bitrate_kbps, int max_bitrate_kbps, | 62 void UpdatePacerBitrate(int bitrate_kbps, int max_bitrate_kbps, |
62 int min_bitrate_kbps); | 63 int min_bitrate_kbps); |
63 | 64 |
64 void OnSentPacket(const rtc::SentPacket& sent_packet); | 65 void OnSentPacket(const rtc::SentPacket& sent_packet); |
65 | 66 |
66 private: | 67 private: |
68 Clock* const clock_; | |
67 rtc::scoped_ptr<VieRemb> remb_; | 69 rtc::scoped_ptr<VieRemb> remb_; |
68 rtc::scoped_ptr<PacketRouter> packet_router_; | 70 rtc::scoped_ptr<PacketRouter> packet_router_; |
69 rtc::scoped_ptr<PacedSender> pacer_; | 71 rtc::scoped_ptr<PacedSender> pacer_; |
70 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; | 72 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; |
71 rtc::scoped_ptr<RemoteEstimatorProxy> remote_estimator_proxy_; | 73 rtc::scoped_ptr<RemoteEstimatorProxy> remote_estimator_proxy_; |
72 | 74 |
73 mutable rtc::CriticalSection encoder_crit_; | 75 mutable rtc::CriticalSection encoder_crit_; |
74 std::vector<ViEEncoder*> encoders_ GUARDED_BY(encoder_crit_); | 76 std::vector<ViEEncoder*> encoders_ GUARDED_BY(encoder_crit_); |
75 | 77 |
76 // Registered at construct time and assumed to outlive this class. | 78 // Registered at construct time and assumed to outlive this class. |
77 ProcessThread* const process_thread_; | 79 ProcessThread* const process_thread_; |
78 CallStats* const call_stats_; | 80 CallStats* const call_stats_; |
79 | 81 |
80 rtc::scoped_ptr<ProcessThread> pacer_thread_; | 82 rtc::scoped_ptr<ProcessThread> pacer_thread_; |
81 | 83 |
82 rtc::scoped_ptr<BitrateController> bitrate_controller_; | 84 rtc::scoped_ptr<BitrateController> bitrate_controller_; |
83 rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_; | 85 rtc::scoped_ptr<TransportFeedbackAdapter> transport_feedback_adapter_; |
84 int min_bitrate_bps_; | 86 int min_bitrate_bps_; |
85 }; | 87 }; |
86 | 88 |
87 } // namespace webrtc | 89 } // namespace webrtc |
88 | 90 |
89 #endif // WEBRTC_CALL_CONGESTION_CONTROLLER_H_ | 91 #endif // WEBRTC_CALL_CONGESTION_CONTROLLER_H_ |
OLD | NEW |