Switch to standard integer types in media/.

media/cast/logging/receiver_time_offset_estimator_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/time/tick_clock.h"
 #include "media/cast/logging/receiver_time_offset_estimator_impl.h"
 
 namespace media {
 namespace cast {
 
 ReceiverTimeOffsetEstimatorImpl::BoundCalculator::BoundCalculator()
     : has_bound_(false) {}
 ReceiverTimeOffsetEstimatorImpl::BoundCalculator::~BoundCalculator() {}
 
 void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::SetSent(
-    uint32 rtp,
-    uint32 packet_id,
+    uint32_t rtp,
+    uint32_t packet_id,
     bool audio,
     base::TimeTicks t) {
-  uint64 key = (static_cast<uint64>(rtp) << 32) | (packet_id << 1) |
-      static_cast<uint64>(audio);
+  uint64_t key = (static_cast<uint64_t>(rtp) << 32) | (packet_id << 1) |
+                 static_cast<uint64_t>(audio);
   events_[key].first = t;
   CheckUpdate(key);
 }
 
 void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::SetReceived(
-    uint32 rtp,
-    uint16 packet_id,
+    uint32_t rtp,
+    uint16_t packet_id,
     bool audio,
     base::TimeTicks t) {
-  uint64 key = (static_cast<uint64>(rtp) << 32) | (packet_id << 1) |
-      static_cast<uint64>(audio);
+  uint64_t key = (static_cast<uint64_t>(rtp) << 32) | (packet_id << 1) |
+                 static_cast<uint64_t>(audio);
   events_[key].second = t;
   CheckUpdate(key);
 }
 
 void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::UpdateBound(
     base::TimeTicks sent, base::TimeTicks received) {
     base::TimeDelta delta = received - sent;
     if (has_bound_) {
       if (delta < bound_) {
         bound_ = delta;
       } else {
         bound_ += (delta - bound_) / kClockDriftSpeed;
       }
     } else {
       bound_ = delta;
     }
     has_bound_ = true;
   }
 
-void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::CheckUpdate(
-    uint64 key) {
+  void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::CheckUpdate(
+      uint64_t key) {
   const TimeTickPair& ticks = events_[key];
   if (!ticks.first.is_null() && !ticks.second.is_null()) {
     UpdateBound(ticks.first, ticks.second);
     events_.erase(key);
     return;
   }
 
   if (events_.size() > kMaxEventTimesMapSize) {
     EventMap::iterator i = ModMapOldest(&events_);
     if (i != events_.end()) {
@@ skipping 68 matching lines @@
       break;
     default:
       // Ignored
       break;
   }
 }
 
 
 }  // namespace cast
 }  // namespace media