| Index: webrtc/video/send_statistics_proxy.h
|
| diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h
|
| index 60d962f93b3a1cdf541868fab929001fdce7d801..c127550f77c863784d9d3d67b088bd8d7b04724c 100644
|
| --- a/webrtc/video/send_statistics_proxy.h
|
| +++ b/webrtc/video/send_statistics_proxy.h
|
| @@ -13,8 +13,8 @@
|
|
|
| #include <string>
|
|
|
| +#include "webrtc/base/bucketratetracker.h"
|
| #include "webrtc/base/criticalsection.h"
|
| -#include "webrtc/base/ratetracker.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/thread_annotations.h"
|
| #include "webrtc/common_types.h"
|
| @@ -38,6 +38,7 @@ class SendStatisticsProxy : public CpuOveruseMetricsObserver,
|
| public SendSideDelayObserver {
|
| public:
|
| static const int kStatsTimeoutMs;
|
| + static const size_t kFrameRateTrackerInterval;
|
|
|
| SendStatisticsProxy(Clock* clock, const VideoSendStream::Config& config);
|
| virtual ~SendStatisticsProxy();
|
| @@ -116,9 +117,9 @@ class SendStatisticsProxy : public CpuOveruseMetricsObserver,
|
| const VideoSendStream::Config config_;
|
| mutable rtc::CriticalSection crit_;
|
| VideoSendStream::Stats stats_ GUARDED_BY(crit_);
|
| - rtc::RateTracker input_frame_rate_tracker_ GUARDED_BY(crit_);
|
| - rtc::RateTracker input_frame_rate_tracker_total_ GUARDED_BY(crit_);
|
| - rtc::RateTracker sent_frame_rate_tracker_total_ GUARDED_BY(crit_);
|
| + rtc::IntervalRateTracker input_frame_rate_tracker_ GUARDED_BY(crit_);
|
| + rtc::IntervalRateTracker input_frame_rate_tracker_total_ GUARDED_BY(crit_);
|
| + rtc::IntervalRateTracker sent_frame_rate_tracker_total_ GUARDED_BY(crit_);
|
| uint32_t last_sent_frame_timestamp_ GUARDED_BY(crit_);
|
| std::map<uint32_t, StatsUpdateTimes> update_times_ GUARDED_BY(crit_);
|
|
|
|
|