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 |
(...skipping 14 matching lines...) Expand all Loading... | |
25 #include "webrtc/rtc_base/criticalsection.h" | 25 #include "webrtc/rtc_base/criticalsection.h" |
26 #include "webrtc/rtc_base/networkroute.h" | 26 #include "webrtc/rtc_base/networkroute.h" |
27 #include "webrtc/rtc_base/race_checker.h" | 27 #include "webrtc/rtc_base/race_checker.h" |
28 | 28 |
29 namespace rtc { | 29 namespace rtc { |
30 struct SentPacket; | 30 struct SentPacket; |
31 } | 31 } |
32 | 32 |
33 namespace webrtc { | 33 namespace webrtc { |
34 | 34 |
35 class AlrState; | |
35 class BitrateController; | 36 class BitrateController; |
36 class Clock; | 37 class Clock; |
37 class AcknowledgedBitrateEstimator; | 38 class AcknowledgedBitrateEstimator; |
38 class ProbeController; | 39 class ProbeController; |
39 class RateLimiter; | 40 class RateLimiter; |
40 class RtcEventLog; | 41 class RtcEventLog; |
41 | 42 |
42 class SendSideCongestionController : public CallStatsObserver, | 43 class SendSideCongestionController : public CallStatsObserver, |
43 public Module, | 44 public Module, |
44 public TransportFeedbackObserver { | 45 public TransportFeedbackObserver { |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
147 const std::unique_ptr<RateLimiter> retransmission_rate_limiter_; | 148 const std::unique_ptr<RateLimiter> retransmission_rate_limiter_; |
148 TransportFeedbackAdapter transport_feedback_adapter_; | 149 TransportFeedbackAdapter transport_feedback_adapter_; |
149 rtc::CriticalSection network_state_lock_; | 150 rtc::CriticalSection network_state_lock_; |
150 uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_); | 151 uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_); |
151 uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_); | 152 uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_); |
152 int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_); | 153 int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_); |
153 NetworkState network_state_ GUARDED_BY(network_state_lock_); | 154 NetworkState network_state_ GUARDED_BY(network_state_lock_); |
154 rtc::CriticalSection bwe_lock_; | 155 rtc::CriticalSection bwe_lock_; |
155 int min_bitrate_bps_ GUARDED_BY(bwe_lock_); | 156 int min_bitrate_bps_ GUARDED_BY(bwe_lock_); |
156 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_); | 157 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_); |
158 const std::unique_ptr<AlrState> alr_state_; | |
philipel
2017/07/14 13:56:23
No need for this to be a unique_ptr.
tschumi
2017/07/14 15:36:51
Removed AlrState
| |
157 | 159 |
158 rtc::RaceChecker worker_race_; | 160 rtc::RaceChecker worker_race_; |
159 | 161 |
160 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideCongestionController); | 162 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideCongestionController); |
161 }; | 163 }; |
162 | 164 |
163 } // namespace webrtc | 165 } // namespace webrtc |
164 | 166 |
165 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CON TROLLER_H_ | 167 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CON TROLLER_H_ |
OLD | NEW |