Index: webrtc/modules/congestion_controller/bitrate_estimator.h |
diff --git a/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h b/webrtc/modules/congestion_controller/bitrate_estimator.h |
similarity index 66% |
rename from webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h |
rename to webrtc/modules/congestion_controller/bitrate_estimator.h |
index 7a9d669a1cb6a5473f99d77d30152cacc71e4955..7d562081b2e45bb55955a03e288c55598992c836 100644 |
--- a/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h |
+++ b/webrtc/modules/congestion_controller/bitrate_estimator.h |
@@ -8,8 +8,8 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_ |
-#define WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_ |
+#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ |
+#define WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ |
#include <vector> |
@@ -17,25 +17,21 @@ |
namespace webrtc { |
-struct PacketFeedback; |
- |
// Computes a bayesian estimate of the throughput given acks containing |
// the arrival time and payload size. Samples which are far from the current |
// estimate or are based on few packets are given a smaller weight, as they |
// are considered to be more likely to have been caused by, e.g., delay spikes |
// unrelated to congestion. |
-class AcknowledgedBitrateEstimator { |
+class BitrateEstimator { |
public: |
- AcknowledgedBitrateEstimator(); |
+ BitrateEstimator(); |
+ virtual ~BitrateEstimator(); |
+ virtual void Update(int64_t now_ms, int bytes); |
- void IncomingPacketFeedbackVector( |
- const std::vector<PacketFeedback>& packet_feedback_vector); |
- rtc::Optional<uint32_t> bitrate_bps() const; |
+ virtual rtc::Optional<uint32_t> bitrate_bps() const; |
private: |
- void Update(int64_t now_ms, int bytes); |
float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms); |
- |
int sum_; |
int64_t current_win_ms_; |
int64_t prev_time_ms_; |
@@ -45,4 +41,4 @@ class AcknowledgedBitrateEstimator { |
} // namespace webrtc |
-#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_ |
+#endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ |