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

Side by Side Diff: webrtc/modules/congestion_controller/include/send_side_congestion_controller.h

Issue 2795643002: Add methods to register congestion controller observer after construction. (Closed)
Patch Set: Created 3 years, 8 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 (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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 PacketRouter* packet_router); 63 PacketRouter* packet_router);
64 SendSideCongestionController(const Clock* clock, 64 SendSideCongestionController(const Clock* clock,
65 Observer* observer, 65 Observer* observer,
66 RtcEventLog* event_log, 66 RtcEventLog* event_log,
67 std::unique_ptr<PacedSender> pacer); 67 std::unique_ptr<PacedSender> pacer);
68 virtual ~SendSideCongestionController(); 68 virtual ~SendSideCongestionController();
69 69
70 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); 70 void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
71 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer); 71 void DeRegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
72 72
73 // Currently, there can be at most one observer.
74 void RegisterNetworkObserver(Observer* observer);
75 void DeRegisterNetworkObserver(Observer* observer);
76
73 virtual void SetBweBitrates(int min_bitrate_bps, 77 virtual void SetBweBitrates(int min_bitrate_bps,
74 int start_bitrate_bps, 78 int start_bitrate_bps,
75 int max_bitrate_bps); 79 int max_bitrate_bps);
76 // Resets the BWE state. Note the first argument is the bitrate_bps. 80 // Resets the BWE state. Note the first argument is the bitrate_bps.
77 virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route, 81 virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route,
78 int bitrate_bps, 82 int bitrate_bps,
79 int min_bitrate_bps, 83 int min_bitrate_bps,
80 int max_bitrate_bps); 84 int max_bitrate_bps);
81 virtual void SignalNetworkState(NetworkState state); 85 virtual void SignalNetworkState(NetworkState state);
82 virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet); 86 virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 127
124 private: 128 private:
125 void MaybeTriggerOnNetworkChanged(); 129 void MaybeTriggerOnNetworkChanged();
126 130
127 bool IsSendQueueFull() const; 131 bool IsSendQueueFull() const;
128 bool IsNetworkDown() const; 132 bool IsNetworkDown() const;
129 bool HasNetworkParametersToReportChanged(uint32_t bitrate_bps, 133 bool HasNetworkParametersToReportChanged(uint32_t bitrate_bps,
130 uint8_t fraction_loss, 134 uint8_t fraction_loss,
131 int64_t rtt); 135 int64_t rtt);
132 const Clock* const clock_; 136 const Clock* const clock_;
133 Observer* const observer_; 137 rtc::CriticalSection observer_lock_;
138 Observer* observer_ GUARDED_BY(observer_lock_);
134 RtcEventLog* const event_log_; 139 RtcEventLog* const event_log_;
135 const std::unique_ptr<PacedSender> pacer_; 140 const std::unique_ptr<PacedSender> pacer_;
136 const std::unique_ptr<BitrateController> bitrate_controller_; 141 const std::unique_ptr<BitrateController> bitrate_controller_;
137 const std::unique_ptr<ProbeController> probe_controller_; 142 const std::unique_ptr<ProbeController> probe_controller_;
138 const std::unique_ptr<RateLimiter> retransmission_rate_limiter_; 143 const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
139 TransportFeedbackAdapter transport_feedback_adapter_; 144 TransportFeedbackAdapter transport_feedback_adapter_;
140 rtc::CriticalSection network_state_lock_; 145 rtc::CriticalSection network_state_lock_;
141 uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_); 146 uint32_t last_reported_bitrate_bps_ GUARDED_BY(network_state_lock_);
142 uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_); 147 uint8_t last_reported_fraction_loss_ GUARDED_BY(network_state_lock_);
143 int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_); 148 int64_t last_reported_rtt_ GUARDED_BY(network_state_lock_);
144 NetworkState network_state_ GUARDED_BY(network_state_lock_); 149 NetworkState network_state_ GUARDED_BY(network_state_lock_);
145 rtc::CriticalSection bwe_lock_; 150 rtc::CriticalSection bwe_lock_;
146 int min_bitrate_bps_ GUARDED_BY(bwe_lock_); 151 int min_bitrate_bps_ GUARDED_BY(bwe_lock_);
147 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_); 152 std::unique_ptr<DelayBasedBwe> delay_based_bwe_ GUARDED_BY(bwe_lock_);
148 153
149 rtc::ThreadChecker worker_thread_checker_; 154 rtc::ThreadChecker worker_thread_checker_;
150 155
151 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideCongestionController); 156 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(SendSideCongestionController);
152 }; 157 };
153 158
154 } // namespace webrtc 159 } // namespace webrtc
155 160
156 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CON TROLLER_H_ 161 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CON TROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698