Switch to standard integer types in media/.

media/cast/net/rtp/cast_message_builder.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 "media/cast/net/rtp/cast_message_builder.h"
 
 #include "media/cast/cast_defines.h"
 #include "media/cast/constants.h"
 #include "media/cast/net/rtp/framer.h"
 
@@ skipping 13 matching lines @@
   // frame.
   kNackRepeatIntervalMs = 30,
 };
 
 }  // namespace
 
 CastMessageBuilder::CastMessageBuilder(
     base::TickClock* clock,
     RtpPayloadFeedback* incoming_payload_feedback,
     const Framer* framer,
-    uint32 media_ssrc,
+    uint32_t media_ssrc,
     bool decoder_faster_than_max_frame_rate,
     int max_unacked_frames)
     : clock_(clock),
       cast_feedback_(incoming_payload_feedback),
       framer_(framer),
       media_ssrc_(media_ssrc),
       decoder_faster_than_max_frame_rate_(decoder_faster_than_max_frame_rate),
       max_unacked_frames_(max_unacked_frames),
       cast_msg_(media_ssrc),
       slowing_down_ack_(false),
       acked_last_frame_(true),
       last_acked_frame_id_(kFirstFrameId - 1) {
   cast_msg_.ack_frame_id = kFirstFrameId - 1;
 }
 
 CastMessageBuilder::~CastMessageBuilder() {}
 
-void CastMessageBuilder::CompleteFrameReceived(uint32 frame_id) {
-  DCHECK_GE(static_cast<int32>(frame_id - last_acked_frame_id_), 0);
+void CastMessageBuilder::CompleteFrameReceived(uint32_t frame_id) {
+  DCHECK_GE(static_cast<int32_t>(frame_id - last_acked_frame_id_), 0);
   VLOG(2) << "CompleteFrameReceived: " << frame_id;
   if (last_update_time_.is_null()) {
     // Our first update.
     last_update_time_ = clock_->NowTicks();
   }
 
   if (!UpdateAckMessage(frame_id)) {
     return;
   }
   BuildPacketList();
 
   // Send cast message.
   VLOG(2) << "Send cast message Ack:" << static_cast<int>(frame_id);
   cast_feedback_->CastFeedback(cast_msg_);
 }
 
-bool CastMessageBuilder::UpdateAckMessage(uint32 frame_id) {
+bool CastMessageBuilder::UpdateAckMessage(uint32_t frame_id) {
   if (!decoder_faster_than_max_frame_rate_) {
     int complete_frame_count = framer_->NumberOfCompleteFrames();
     if (complete_frame_count > max_unacked_frames_) {
       // We have too many frames pending in our framer; slow down ACK.
       if (!slowing_down_ack_) {
         slowing_down_ack_ = true;
         ack_queue_.push_back(last_acked_frame_id_);
       }
     } else if (complete_frame_count <= 1) {
       // We are down to one or less frames in our framer; ACK normally.
@@ skipping 81 matching lines @@
 void CastMessageBuilder::BuildPacketList() {
   base::TimeTicks now = clock_->NowTicks();
 
   // Clear message NACK list.
   cast_msg_.missing_frames_and_packets.clear();
 
   // Are we missing packets?
   if (framer_->Empty())
     return;
 
-  uint32 newest_frame_id = framer_->NewestFrameId();
-  uint32 next_expected_frame_id = cast_msg_.ack_frame_id + 1;
+  uint32_t newest_frame_id = framer_->NewestFrameId();
+  uint32_t next_expected_frame_id = cast_msg_.ack_frame_id + 1;
 
   // Iterate over all frames.
   for (; !IsNewerFrameId(next_expected_frame_id, newest_frame_id);
        ++next_expected_frame_id) {
     TimeLastNackMap::iterator it =
         time_last_nacked_map_.find(next_expected_frame_id);
     if (it != time_last_nacked_map_.end()) {
       // We have sent a NACK in this frame before, make sure enough time have
       // passed.
       if (now - it->second <
@@ skipping 15 matching lines @@
     } else {
       time_last_nacked_map_[next_expected_frame_id] = now;
       missing.insert(kRtcpCastAllPacketsLost);
       cast_msg_.missing_frames_and_packets[next_expected_frame_id] = missing;
     }
   }
 }
 
 }  //  namespace cast
 }  //  namespace media