Replace uses of raw uint32's with a type-checked RtpTimeTicks data type.

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 {
 
+namespace {
+
+// Bitwise merging of values to produce an ordered key for entries in the
+// BoundCalculator::events_ map.
+uint64_t MakeEventKey(RtpTimeTicks rtp, uint16_t packet_id, bool audio) {
+  return (static_cast<uint64_t>(rtp.lower_32_bits()) << 32) |
+         (static_cast<uint64_t>(packet_id) << 1) |
+         (audio ? UINT64_C(1) : UINT64_C(0));
+}
+
+}  // namespace
+
 ReceiverTimeOffsetEstimatorImpl::BoundCalculator::BoundCalculator()
     : has_bound_(false) {}
 ReceiverTimeOffsetEstimatorImpl::BoundCalculator::~BoundCalculator() {}
 
 void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::SetSent(
-    uint32 rtp,
-    uint32 packet_id,
+    RtpTimeTicks rtp,
+    uint16_t packet_id,
     bool audio,
     base::TimeTicks t) {
-  uint64 key = (static_cast<uint64>(rtp) << 32) | (packet_id << 1) |
-      static_cast<uint64>(audio);
+  const uint64_t key = MakeEventKey(rtp, packet_id, audio);
   events_[key].first = t;
   CheckUpdate(key);
 }
 
 void ReceiverTimeOffsetEstimatorImpl::BoundCalculator::SetReceived(
-    uint32 rtp,
-    uint16 packet_id,
+    RtpTimeTicks rtp,
+    uint16_t packet_id,
     bool audio,
     base::TimeTicks t) {
-  uint64 key = (static_cast<uint64>(rtp) << 32) | (packet_id << 1) |
-      static_cast<uint64>(audio);
+  const uint64_t key = MakeEventKey(rtp, packet_id, 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;
@@ skipping 89 matching lines @@
       break;
     default:
       // Ignored
       break;
   }
 }
 
 
 }  // namespace cast
 }  // namespace media