Delete deprecated functions in RateTracker that use global clock Bug: webrtc:42223992 Change-Id: I007d48d1aea0387bca5bce82d578b931def9bb18 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/417020 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45956}
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 73e1661..cf54e05 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn
@@ -310,10 +310,8 @@ ] deps = [ ":checks", - ":timeutils", "../api/units:time_delta", "../api/units:timestamp", - "//third_party/abseil-cpp/absl/base:core_headers", ] }
diff --git a/rtc_base/rate_tracker.cc b/rtc_base/rate_tracker.cc index 6d106a4..517bd50 100644 --- a/rtc_base/rate_tracker.cc +++ b/rtc_base/rate_tracker.cc
@@ -17,7 +17,6 @@ #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "rtc_base/checks.h" -#include "rtc_base/time_utils.h" namespace webrtc { @@ -123,10 +122,6 @@ total_sample_count_ += sample_count; } -int64_t RateTracker::Time() const { - return TimeMillis(); -} - void RateTracker::EnsureInitialized(int64_t current_time_ms) { if (bucket_start_time_milliseconds_ == kTimeUnset) { initialization_time_milliseconds_ = current_time_ms;
diff --git a/rtc_base/rate_tracker.h b/rtc_base/rate_tracker.h index aed873d..39ec6e7 100644 --- a/rtc_base/rate_tracker.h +++ b/rtc_base/rate_tracker.h
@@ -14,7 +14,6 @@ #include <stdint.h> #include <stdlib.h> -#include "absl/base/macros.h" #include "api/units/time_delta.h" #include "api/units/timestamp.h" @@ -26,18 +25,13 @@ class RateTracker { public: RateTracker(int64_t bucket_milliseconds, size_t bucket_count); - virtual ~RateTracker(); + ~RateTracker(); // Computes the average rate over the most recent interval_milliseconds, // or if the first sample was added within this period, computes the rate // since the first sample was added. double ComputeRateForInterval(Timestamp current_time, TimeDelta interval) const; - [[deprecated]] - double ComputeRateForInterval(int64_t interval_milliseconds) const { - return ComputeRateForInterval(Timestamp::Millis(Time()), - TimeDelta::Millis(interval_milliseconds)); - } // Computes the average rate over the rate tracker's recording interval // of bucket_milliseconds * bucket_count. @@ -46,35 +40,12 @@ current_time, TimeDelta::Millis(bucket_milliseconds_) * bucket_count_); } - [[deprecated]] - double ComputeRate() const { - return Rate(Timestamp::Millis(Time())); - } - // The total number of samples added. int64_t TotalSampleCount() const; // Increment count for bucket at `current_time`. void Update(int64_t sample_count, Timestamp now); - // Reads the current time in order to determine the appropriate bucket for - // these samples, and increments the count for that bucket by sample_count. - [[deprecated]] - void AddSamples(int64_t sample_count) { - Update(sample_count, Timestamp::Millis(Time())); - } - - ABSL_DEPRECATE_AND_INLINE() - void AddSamplesAtTime(int64_t current_time_ms, int64_t sample_count) { - Update(sample_count, Timestamp::Millis(current_time_ms)); - } - - protected: - // overrideable for tests - // TODO: bugs.webrtc.org/42223992 - Delete after Oct 27, 2025 together with - // deprecated functions that do not take current time as a parameter - virtual int64_t Time() const; - private: void EnsureInitialized(int64_t current_time_ms); size_t NextBucketIndex(size_t bucket_index) const;