Use suffixed {uint,int}{8,16,32,64}_t types.

webrtc/base/ratetracker.cc

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/ratetracker.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/timeutils.h"
 
 namespace rtc {
 
-RateTracker::RateTracker(
-    uint32 bucket_milliseconds, size_t bucket_count)
+RateTracker::RateTracker(uint32_t bucket_milliseconds, size_t bucket_count)
     : bucket_milliseconds_(bucket_milliseconds),
-    bucket_count_(bucket_count),
-    sample_buckets_(new size_t[bucket_count + 1]),
-    total_sample_count_(0u),
-    bucket_start_time_milliseconds_(~0u) {
+      bucket_count_(bucket_count),
+      sample_buckets_(new size_t[bucket_count + 1]),
+      total_sample_count_(0u),
+      bucket_start_time_milliseconds_(~0u) {
   RTC_CHECK(bucket_milliseconds > 0u);
   RTC_CHECK(bucket_count > 0u);
 }
 
 RateTracker::~RateTracker() {
   delete[] sample_buckets_;
 }
 
 double RateTracker::ComputeRateForInterval(
-    uint32 interval_milliseconds) const {
+    uint32_t interval_milliseconds) const {
   if (bucket_start_time_milliseconds_ == ~0u) {
     return 0.0;
   }
-  uint32 current_time = Time();
+  uint32_t current_time = Time();
   // Calculate which buckets to sum up given the current time.  If the time
   // has passed to a new bucket then we have to skip some of the oldest buckets.
-  uint32 available_interval_milliseconds = std::min<uint32>(
+  uint32_t available_interval_milliseconds = std::min<uint32_t>(
       interval_milliseconds,
-      bucket_milliseconds_ * static_cast<uint32>(bucket_count_));
+      bucket_milliseconds_ * static_cast<uint32_t>(bucket_count_));
   // number of old buckets (i.e. after the current bucket in the ring buffer)
   // that are expired given our current time interval.
   size_t buckets_to_skip;
   // Number of milliseconds of the first bucket that are not a portion of the
   // current interval.
-  uint32 milliseconds_to_skip;
+  uint32_t milliseconds_to_skip;
   if (current_time >
       initialization_time_milliseconds_ + available_interval_milliseconds) {
-    uint32 time_to_skip = current_time - bucket_start_time_milliseconds_ +
-        static_cast<uint32>(bucket_count_) * bucket_milliseconds_ -
+    uint32_t time_to_skip =
+        current_time - bucket_start_time_milliseconds_ +
+        static_cast<uint32_t>(bucket_count_) * bucket_milliseconds_ -
         available_interval_milliseconds;
     buckets_to_skip = time_to_skip / bucket_milliseconds_;
     milliseconds_to_skip = time_to_skip % bucket_milliseconds_;
   } else {
     buckets_to_skip = bucket_count_ - current_bucket_;
     milliseconds_to_skip = 0u;
     available_interval_milliseconds =
         TimeDiff(current_time, initialization_time_milliseconds_);
   }
   // If we're skipping all buckets that means that there have been no samples
@@ skipping 16 matching lines @@
   }
   // Convert to samples per second.
   return static_cast<double>(total_samples * 1000u) /
       static_cast<double>(available_interval_milliseconds);
 }
 
 double RateTracker::ComputeTotalRate() const {
   if (bucket_start_time_milliseconds_ == ~0u) {
     return 0.0;
   }
-  uint32 current_time = Time();
+  uint32_t current_time = Time();
   if (TimeIsLaterOrEqual(current_time, initialization_time_milliseconds_)) {
     return 0.0;
   }
   return static_cast<double>(total_sample_count_ * 1000u) /
       static_cast<double>(
           TimeDiff(current_time, initialization_time_milliseconds_));
 }
 
 size_t RateTracker::TotalSampleCount() const {
   return total_sample_count_;
 }
 
 void RateTracker::AddSamples(size_t sample_count) {
   EnsureInitialized();
-  uint32 current_time = Time();
+  uint32_t current_time = Time();
   // Advance the current bucket as needed for the current time, and reset
   // bucket counts as we advance.
   for (size_t i = 0u; i <= bucket_count_ &&
       current_time >= bucket_start_time_milliseconds_ + bucket_milliseconds_;
       ++i) {
     bucket_start_time_milliseconds_ += bucket_milliseconds_;
     current_bucket_ = NextBucketIndex(current_bucket_);
     sample_buckets_[current_bucket_] = 0u;
   }
   // Ensure that bucket_start_time_milliseconds_ is updated appropriately if
   // the entire buffer of samples has been expired.
   bucket_start_time_milliseconds_ += bucket_milliseconds_ *
       ((current_time - bucket_start_time_milliseconds_) / bucket_milliseconds_);
   // Add all samples in the bucket that includes the current time.
   sample_buckets_[current_bucket_] += sample_count;
   total_sample_count_ += sample_count;
 }
 
-uint32 RateTracker::Time() const {
+uint32_t RateTracker::Time() const {
   return rtc::Time();
 }
 
 void RateTracker::EnsureInitialized() {
   if (bucket_start_time_milliseconds_ == ~0u) {
     initialization_time_milliseconds_ = Time();
     bucket_start_time_milliseconds_ = initialization_time_milliseconds_;
     current_bucket_ = 0u;
     // We only need to initialize the first bucket because we reset buckets when
     // current_bucket_ increments.
     sample_buckets_[current_bucket_] = 0u;
   }
 }
 
 size_t RateTracker::NextBucketIndex(size_t bucket_index) const {
   return (bucket_index + 1u) % (bucket_count_ + 1u);
 }
 
 }  // namespace rtc