Index: webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h |
diff --git a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h |
index 127886300d8f95c2fd14d78ebc0ffae9ee5c1094..9930313b4f4b8a132df752844f2d880996179c12 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h |
+++ b/webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h |
@@ -12,9 +12,11 @@ |
#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_REMOTE_ESTIMATOR_PROXY_H_ |
#include <map> |
+#include <memory> |
#include <vector> |
#include "webrtc/base/criticalsection.h" |
+#include "webrtc/base/ratetracker.h" |
#include "webrtc/modules/include/module_common_types.h" |
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" |
@@ -32,7 +34,10 @@ class TransportFeedback; |
class RemoteEstimatorProxy : public RemoteBitrateEstimator { |
public: |
- RemoteEstimatorProxy(Clock* clock, PacketRouter* packet_router); |
+ RemoteEstimatorProxy( |
+ Clock* clock, |
+ PacketRouter* packet_router, |
+ std::unique_ptr<rtc::RateTracker> recieved_bitrate_tracker); |
virtual ~RemoteEstimatorProxy(); |
void IncomingPacketFeedbackVector( |
@@ -48,7 +53,11 @@ class RemoteEstimatorProxy : public RemoteBitrateEstimator { |
int64_t TimeUntilNextProcess() override; |
void Process() override; |
- static const int kDefaultProcessIntervalMs; |
+ static const int kHighBitrateProcessIntervalMs; |
+ static const int kLowBitrateProcessIntervalMs; |
+ static const int kSwitchToLowBitrateProcessIntervalBps; |
+ static const int kSwitchToHighBitrateProcessIntervalBps; |
+ static const int kMinPacketCountRecievedBitrate; |
static const int kBackWindowMs; |
private: |
@@ -68,6 +77,9 @@ class RemoteEstimatorProxy : public RemoteBitrateEstimator { |
int64_t window_start_seq_ GUARDED_BY(&lock_); |
// Map unwrapped seq -> time. |
std::map<int64_t, int64_t> packet_arrival_times_ GUARDED_BY(&lock_); |
+ int process_interval_ms_; |
+ std::unique_ptr<rtc::RateTracker> received_bitrate_tracker_bps_ |
+ GUARDED_BY(&lock_); |
}; |
} // namespace webrtc |