| Index: media/cast/net/rtcp/rtcp_defines.h
|
| diff --git a/media/cast/net/rtcp/rtcp_defines.h b/media/cast/net/rtcp/rtcp_defines.h
|
| index 72fdc31123366099db5fddb1763856f40afe7fd5..032383a2190724b08b5c89bfbc3255a10c885b79 100644
|
| --- a/media/cast/net/rtcp/rtcp_defines.h
|
| +++ b/media/cast/net/rtcp/rtcp_defines.h
|
| @@ -38,13 +38,13 @@ enum RtcpPacketFields {
|
|
|
| // 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;
|
| };
|
|
|
| @@ -56,16 +56,16 @@ struct 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
|
| @@ -79,9 +79,9 @@ 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,
|
| @@ -107,7 +107,7 @@ struct RtcpEvent {
|
| base::TimeDelta delay_delta;
|
|
|
| // Only set for packet events.
|
| - uint16 packet_id;
|
| + uint16_t packet_id;
|
| };
|
|
|
| typedef base::Callback<void(const RtcpCastMessage&)> RtcpCastMessageCallback;
|
| @@ -118,16 +118,16 @@ 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;
|
| };
|
|
|
| @@ -136,8 +136,8 @@ struct RtcpTimeData {
|
| 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;
|
|
|