| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 class Observer { | 50 class Observer { |
| 51 public: | 51 public: |
| 52 virtual void OnNetworkChanged(uint32_t bitrate_bps, | 52 virtual void OnNetworkChanged(uint32_t bitrate_bps, |
| 53 uint8_t fraction_loss, // 0 - 255. | 53 uint8_t fraction_loss, // 0 - 255. |
| 54 int64_t rtt_ms, | 54 int64_t rtt_ms, |
| 55 int64_t probing_interval_ms) = 0; | 55 int64_t probing_interval_ms) = 0; |
| 56 | 56 |
| 57 protected: | 57 protected: |
| 58 virtual ~Observer() {} | 58 virtual ~Observer() {} |
| 59 }; | 59 }; |
| 60 // TODO(nisse): Consider deleting the |observer| argument to constructors. |
| 60 SendSideCongestionController(const Clock* clock, | 61 SendSideCongestionController(const Clock* clock, |
| 61 Observer* observer, | 62 Observer* observer, |
| 62 RtcEventLog* event_log, | 63 RtcEventLog* event_log, |
| 63 PacketRouter* packet_router); | 64 PacketRouter* packet_router); |
| 64 SendSideCongestionController(const Clock* clock, | 65 SendSideCongestionController(const Clock* clock, |
| 65 Observer* observer, | 66 Observer* observer, |
| 66 RtcEventLog* event_log, | 67 RtcEventLog* event_log, |
| 67 std::unique_ptr<PacedSender> pacer); | 68 std::unique_ptr<PacedSender> pacer); |
| 68 virtual ~SendSideCongestionController(); | 69 virtual ~SendSideCongestionController(); |
| 69 | 70 |
| 70 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); | 71 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); |
| 71 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); | 72 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); |
| 72 | 73 |
| 74 // Currently, there can be at most one observer. |
| 75 void RegisterNetworkObserver(Observer* observer); |
| 76 void DeRegisterNetworkObserver(Observer* observer); |
| 77 |
| 73 virtual void SetBweBitrates(int min_bitrate_bps, | 78 virtual void SetBweBitrates(int min_bitrate_bps, |
| 74 int start_bitrate_bps, | 79 int start_bitrate_bps, |
| 75 int max_bitrate_bps); | 80 int max_bitrate_bps); |
| 76 // Resets the BWE state. Note the first argument is the bitrate_bps. | 81 // Resets the BWE state. Note the first argument is the bitrate_bps. |
| 77 virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route, | 82 virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route, |
| 78 int bitrate_bps, | 83 int bitrate_bps, |
| 79 int min_bitrate_bps, | 84 int min_bitrate_bps, |
| 80 int max_bitrate_bps); | 85 int max_bitrate_bps); |
| 81 virtual void SignalNetworkState(NetworkState state); | 86 virtual void SignalNetworkState(NetworkState state); |
| 82 virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet); | 87 virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 | 128 |
| 124 private: | 129 private: |
| 125 void MaybeTriggerOnNetworkChanged(); | 130 void MaybeTriggerOnNetworkChanged(); |
| 126 | 131 |
| 127 bool IsSendQueueFull() const; | 132 bool IsSendQueueFull() const; |
| 128 bool IsNetworkDown() const; | 133 bool IsNetworkDown() const; |
| 129 bool HasNetworkParametersToReportChanged(uint32_t bitrate_bps, | 134 bool HasNetworkParametersToReportChanged(uint32_t bitrate_bps, |
| 130 uint8_t fraction_loss, | 135 uint8_t fraction_loss, |
| 131 int64_t rtt); | 136 int64_t rtt); |
| 132 const Clock* const clock_; | 137 const Clock* const clock_; |
| 133 Observer* const observer_; | 138 rtc::CriticalSection observer_lock_; |
| 139 Observer* observer_ GUARDED_BY(observer_lock_); |
| 134 RtcEventLog* const event_log_; | 140 RtcEventLog* const event_log_; |
| 135 const std::unique_ptr<PacedSender> pacer_; | 141 const std::unique_ptr<PacedSender> pacer_; |
| 136 const std::unique_ptr<BitrateController> bitrate_controller_; | 142 const std::unique_ptr<BitrateController> bitrate_controller_; |
| 137 const std::unique_ptr<ProbeController> probe_controller_; | 143 const std::unique_ptr<ProbeController> probe_controller_; |
| 138 const std::unique_ptr<RateLimiter> retransmission_rate_limiter_; | 144 const std::unique_ptr<RateLimiter> retransmission_rate_limiter_; |
| 139 TransportFeedbackAdapter transport_feedback_adapter_; | 145 TransportFeedbackAdapter transport_feedback_adapter_; |
| 140 rtc::CriticalSection network_state_lock_; | 146 rtc::CriticalSection network_state_lock_; |
| 141 uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_); | 147 uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_); |
| 142 uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_); | 148 uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_); |
| 143 int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_); | 149 int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_); |
| 144 NetworkState network_state_ GUARDED_BY(network_state_lock_); | 150 NetworkState network_state_ GUARDED_BY(network_state_lock_); |
| 145 rtc::CriticalSection bwe_lock_; | 151 rtc::CriticalSection bwe_lock_; |
| 146 int min_bitrate_bps_ GUARDED_BY(bwe_lock_); | 152 int min_bitrate_bps_ GUARDED_BY(bwe_lock_); |
| 147 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_); | 153 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_); |
| 148 | 154 |
| 149 rtc::ThreadChecker worker_thread_checker_; | 155 rtc::ThreadChecker worker_thread_checker_; |
| 150 | 156 |
| 151 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideCongestionController); | 157 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideCongestionController); |
| 152 }; | 158 }; |
| 153 | 159 |
| 154 } // namespace webrtc | 160 } // namespace webrtc |
| 155 | 161 |
| 156 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CON
TROLLER_H_ | 162 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CON
TROLLER_H_ |
| OLD | NEW |