| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 |
| 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_ | 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ |
| 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_ | 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ |
| 13 | 13 |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "webrtc/base/optional.h" | 16 #include "webrtc/base/optional.h" |
| 17 | 17 |
| 18 namespace webrtc { | 18 namespace webrtc { |
| 19 | 19 |
| 20 struct PacketFeedback; | |
| 21 | |
| 22 // Computes a bayesian estimate of the throughput given acks containing | 20 // Computes a bayesian estimate of the throughput given acks containing |
| 23 // the arrival time and payload size. Samples which are far from the current | 21 // the arrival time and payload size. Samples which are far from the current |
| 24 // estimate or are based on few packets are given a smaller weight, as they | 22 // estimate or are based on few packets are given a smaller weight, as they |
| 25 // are considered to be more likely to have been caused by, e.g., delay spikes | 23 // are considered to be more likely to have been caused by, e.g., delay spikes |
| 26 // unrelated to congestion. | 24 // unrelated to congestion. |
| 27 class AcknowledgedBitrateEstimator { | 25 class BitrateEstimator { |
| 28 public: | 26 public: |
| 29 AcknowledgedBitrateEstimator(); | 27 BitrateEstimator(); |
| 28 virtual ~BitrateEstimator(); |
| 29 virtual void Update(int64_t now_ms, int bytes); |
| 30 | 30 |
| 31 void IncomingPacketFeedbackVector( | 31 virtual rtc::Optional<uint32_t> bitrate_bps() const; |
| 32 const std::vector<PacketFeedback>& packet_feedback_vector); | |
| 33 rtc::Optional<uint32_t> bitrate_bps() const; | |
| 34 | 32 |
| 35 private: | 33 private: |
| 36 void Update(int64_t now_ms, int bytes); | |
| 37 float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms); | 34 float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms); |
| 38 | |
| 39 int sum_; | 35 int sum_; |
| 40 int64_t current_win_ms_; | 36 int64_t current_win_ms_; |
| 41 int64_t prev_time_ms_; | 37 int64_t prev_time_ms_; |
| 42 float bitrate_estimate_; | 38 float bitrate_estimate_; |
| 43 float bitrate_estimate_var_; | 39 float bitrate_estimate_var_; |
| 44 }; | 40 }; |
| 45 | 41 |
| 46 } // namespace webrtc | 42 } // namespace webrtc |
| 47 | 43 |
| 48 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_ | 44 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_ |
| OLD | NEW |