Switch to standard integer types in media/.

media/cast/net/rtcp/rtcp_defines.h

 // 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.
 
 #ifndef MEDIA_CAST_RTCP_RTCP_DEFINES_H_
 #define MEDIA_CAST_RTCP_RTCP_DEFINES_H_
 
 #include <list>
 
 #include "base/callback_forward.h"
@@ skipping 20 matching lines @@
   kPacketTypeReceiverReport = 201,
   kPacketTypeApplicationDefined = 204,
   kPacketTypeGenericRtpFeedback = 205,
   kPacketTypePayloadSpecific = 206,
   kPacketTypeXr = 207,
   kPacketTypeHigh = 210,  // Port Mapping.
 };
 
 // Handle the per frame ACK and NACK messages.
 struct RtcpCastMessage {
-  explicit RtcpCastMessage(uint32 ssrc);
+  explicit RtcpCastMessage(uint32_t ssrc);
   RtcpCastMessage();
   ~RtcpCastMessage();
 
-  uint32 media_ssrc;
-  uint32 ack_frame_id;
-  uint16 target_delay_ms;
+  uint32_t media_ssrc;
+  uint32_t ack_frame_id;
+  uint16_t target_delay_ms;
   MissingFramesAndPacketsMap missing_frames_and_packets;
 };
 
 // Log messages from receiver to sender.
 struct RtcpReceiverEventLogMessage {
   RtcpReceiverEventLogMessage();
   ~RtcpReceiverEventLogMessage();
 
   CastLoggingEvent type;
   base::TimeTicks event_timestamp;
   base::TimeDelta delay_delta;
-  uint16 packet_id;
+  uint16_t packet_id;
 };
 
 typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages;
 
 struct RtcpReceiverFrameLogMessage {
-  explicit RtcpReceiverFrameLogMessage(uint32 rtp_timestamp);
+  explicit RtcpReceiverFrameLogMessage(uint32_t rtp_timestamp);
   ~RtcpReceiverFrameLogMessage();
 
-  uint32 rtp_timestamp_;
+  uint32_t rtp_timestamp_;
   RtcpReceiverEventLogMessages event_log_messages_;
 
   // TODO(mikhal): Investigate what's the best way to allow adding
   // DISALLOW_COPY_AND_ASSIGN, as currently it contradicts the implementation
   // and possible changes have a big impact on design.
 };
 
 typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage;
 
 struct RtcpReceiverReferenceTimeReport {
   RtcpReceiverReferenceTimeReport();
   ~RtcpReceiverReferenceTimeReport();
 
-  uint32 remote_ssrc;
-  uint32 ntp_seconds;
-  uint32 ntp_fraction;
+  uint32_t remote_ssrc;
+  uint32_t ntp_seconds;
+  uint32_t ntp_fraction;
 };
 
 inline bool operator==(RtcpReceiverReferenceTimeReport lhs,
                        RtcpReceiverReferenceTimeReport rhs) {
   return lhs.remote_ssrc == rhs.remote_ssrc &&
          lhs.ntp_seconds == rhs.ntp_seconds &&
          lhs.ntp_fraction == rhs.ntp_fraction;
 }
 
 // Struct used by raw event subscribers as an intermediate format before
 // sending off to the other side via RTCP.
 // (i.e., {Sender,Receiver}RtcpEventSubscriber)
 struct RtcpEvent {
   RtcpEvent();
   ~RtcpEvent();
 
   CastLoggingEvent type;
 
   // Time of event logged.
   base::TimeTicks timestamp;
 
   // Render/playout delay. Only set for FRAME_PLAYOUT events.
   base::TimeDelta delay_delta;
 
   // Only set for packet events.
-  uint16 packet_id;
+  uint16_t packet_id;
 };
 
 typedef base::Callback<void(const RtcpCastMessage&)> RtcpCastMessageCallback;
 typedef base::Callback<void(base::TimeDelta)> RtcpRttCallback;
 typedef
 base::Callback<void(const RtcpReceiverLogMessage&)> RtcpLogMessageCallback;
 
 // TODO(hubbe): Document members of this struct.
 struct RtpReceiverStatistics {
   RtpReceiverStatistics();
-  uint8 fraction_lost;
-  uint32 cumulative_lost;  // 24 bits valid.
-  uint32 extended_high_sequence_number;
-  uint32 jitter;
+  uint8_t fraction_lost;
+  uint32_t cumulative_lost;  // 24 bits valid.
+  uint32_t extended_high_sequence_number;
+  uint32_t jitter;
 };
 
 // These are intended to only be created using Rtcp::ConvertToNTPAndSave.
 struct RtcpTimeData {
-  uint32 ntp_seconds;
-  uint32 ntp_fraction;
+  uint32_t ntp_seconds;
+  uint32_t ntp_fraction;
   base::TimeTicks timestamp;
 };
 
 // This struct is used to encapsulate all the parameters of the
 // SendRtcpFromRtpReceiver for IPC transportation.
 struct SendRtcpFromRtpReceiver_Params {
   SendRtcpFromRtpReceiver_Params();
   ~SendRtcpFromRtpReceiver_Params();
-  uint32 ssrc;
-  uint32 sender_ssrc;
+  uint32_t ssrc;
+  uint32_t sender_ssrc;
   RtcpTimeData time_data;
   scoped_ptr<RtcpCastMessage> cast_message;
   base::TimeDelta target_delay;
   scoped_ptr<std::vector<std::pair<RtpTimestamp, RtcpEvent> > > rtcp_events;
   scoped_ptr<RtpReceiverStatistics> rtp_receiver_statistics;
 };
 
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RTCP_DEFINES_H_