| Index: webrtc/common_video/include/bitrate_adjuster.h
|
| diff --git a/webrtc/common_video/include/bitrate_adjuster.h b/webrtc/common_video/include/bitrate_adjuster.h
|
| index 1b70ebdbd9cad3f53f7f77dbaf7466796396625f..d04486ca0ebc5353c0bcff07bf2a02ad5fc9884f 100644
|
| --- a/webrtc/common_video/include/bitrate_adjuster.h
|
| +++ b/webrtc/common_video/include/bitrate_adjuster.h
|
| @@ -59,29 +59,30 @@ class BitrateAdjuster {
|
| bool IsWithinTolerance(uint32_t bitrate_bps, uint32_t target_bitrate_bps);
|
|
|
| // Returns smallest possible adjusted value.
|
| - uint32_t GetMinAdjustedBitrateBps() const EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
| + uint32_t GetMinAdjustedBitrateBps() const RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
| // Returns largest possible adjusted value.
|
| - uint32_t GetMaxAdjustedBitrateBps() const EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
| + uint32_t GetMaxAdjustedBitrateBps() const RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
| void Reset();
|
| - void UpdateBitrate(uint32_t current_time_ms) EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
| + void UpdateBitrate(uint32_t current_time_ms)
|
| + RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_);
|
|
|
| rtc::CriticalSection crit_;
|
| Clock* const clock_;
|
| const float min_adjusted_bitrate_pct_;
|
| const float max_adjusted_bitrate_pct_;
|
| // The bitrate we want.
|
| - volatile uint32_t target_bitrate_bps_ GUARDED_BY(crit_);
|
| + volatile uint32_t target_bitrate_bps_ RTC_GUARDED_BY(crit_);
|
| // The bitrate we use to get what we want.
|
| - volatile uint32_t adjusted_bitrate_bps_ GUARDED_BY(crit_);
|
| + volatile uint32_t adjusted_bitrate_bps_ RTC_GUARDED_BY(crit_);
|
| // The target bitrate that the adjusted bitrate was computed from.
|
| - volatile uint32_t last_adjusted_target_bitrate_bps_ GUARDED_BY(crit_);
|
| + volatile uint32_t last_adjusted_target_bitrate_bps_ RTC_GUARDED_BY(crit_);
|
| // Used to estimate bitrate.
|
| - RateStatistics bitrate_tracker_ GUARDED_BY(crit_);
|
| + RateStatistics bitrate_tracker_ RTC_GUARDED_BY(crit_);
|
| // The last time we tried to adjust the bitrate.
|
| - uint32_t last_bitrate_update_time_ms_ GUARDED_BY(crit_);
|
| + uint32_t last_bitrate_update_time_ms_ RTC_GUARDED_BY(crit_);
|
| // The number of frames since the last time we tried to adjust the bitrate.
|
| - uint32_t frames_since_last_update_ GUARDED_BY(crit_);
|
| + uint32_t frames_since_last_update_ RTC_GUARDED_BY(crit_);
|
| };
|
|
|
| } // namespace webrtc
|
|
|