Index: webrtc/modules/congestion_controller/delay_based_bwe.h |
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe.h b/webrtc/modules/congestion_controller/delay_based_bwe.h |
index 19410c658a4f72624228b68c09d10b5a02321646..1f8a490dffe6e8bd1a4c89348ca550b076561048 100644 |
--- a/webrtc/modules/congestion_controller/delay_based_bwe.h |
+++ b/webrtc/modules/congestion_controller/delay_based_bwe.h |
@@ -22,6 +22,7 @@ |
#include "webrtc/base/rate_statistics.h" |
#include "webrtc/base/thread_checker.h" |
#include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" |
+#include "webrtc/modules/congestion_controller/include/congestion_controller.h" |
danilchap
2016/08/19 17:19:34
prefer forward declaration over including header w
Irfan
2016/08/23 05:46:57
Done
|
#include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" |
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" |
#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h" |
@@ -33,7 +34,7 @@ namespace webrtc { |
class DelayBasedBwe : public RemoteBitrateEstimator { |
public: |
- DelayBasedBwe(RemoteBitrateObserver* observer, Clock* clock); |
+ DelayBasedBwe(CongestionController* controller, Clock* clock); |
virtual ~DelayBasedBwe() {} |
void IncomingPacketFeedbackVector( |
@@ -57,15 +58,19 @@ class DelayBasedBwe : public RemoteBitrateEstimator { |
private: |
void IncomingPacketInfo(const PacketInfo& info); |
+ // Updates the current remote rate estimate and returns true if a valid |
+ // estimate exists. |
+ bool UpdateEstimate(int64_t packet_arrival_time_ms, |
+ int64_t now_ms, |
+ int* target_bitrate_bps); |
rtc::ThreadChecker network_thread_; |
Clock* const clock_; |
- RemoteBitrateObserver* const observer_; |
+ CongestionController* const controller_; |
std::unique_ptr<InterArrival> inter_arrival_; |
std::unique_ptr<OveruseEstimator> estimator_; |
OveruseDetector detector_; |
RateStatistics incoming_bitrate_; |
- int64_t first_packet_time_ms_; |
int64_t last_update_ms_; |
int64_t last_seen_packet_ms_; |
bool uma_recorded_; |