Index: media/cast/net/rtp/rtp_defines.h |
diff --git a/media/cast/net/rtp/rtp_defines.h b/media/cast/net/rtp/rtp_defines.h |
index 250619003df7c7d728ca79e7bac7108d35334f8b..719fdf4ecf71aa1e74f06f6b8beac602d474d605 100644 |
--- a/media/cast/net/rtp/rtp_defines.h |
+++ b/media/cast/net/rtp/rtp_defines.h |
@@ -5,47 +5,46 @@ |
#ifndef MEDIA_CAST_NET_RTP_RTP_DEFINES_H_ |
#define MEDIA_CAST_NET_RTP_RTP_DEFINES_H_ |
-#include "base/basictypes.h" |
#include "media/cast/net/rtcp/rtcp_defines.h" |
namespace media { |
namespace cast { |
-static const uint16 kRtpHeaderLength = 12; |
-static const uint16 kCastHeaderLength = 7; |
+static const uint16_t kRtpHeaderLength = 12; |
+static const uint16_t kCastHeaderLength = 7; |
// RTP Header |
-static const uint8 kRtpExtensionBitMask = 0x10; |
-static const uint8 kRtpMarkerBitMask = 0x80; |
-static const uint8 kRtpNumCsrcsMask = 0x0f; |
+static const uint8_t kRtpExtensionBitMask = 0x10; |
+static const uint8_t kRtpMarkerBitMask = 0x80; |
+static const uint8_t kRtpNumCsrcsMask = 0x0f; |
// Cast Header |
-static const uint8 kCastKeyFrameBitMask = 0x80; |
-static const uint8 kCastReferenceFrameIdBitMask = 0x40; |
-static const uint8 kCastExtensionCountmask = 0x3f; |
+static const uint8_t kCastKeyFrameBitMask = 0x80; |
+static const uint8_t kCastReferenceFrameIdBitMask = 0x40; |
+static const uint8_t kCastExtensionCountmask = 0x3f; |
// Cast RTP extensions. |
-static const uint8 kCastRtpExtensionAdaptiveLatency = 1; |
+static const uint8_t kCastRtpExtensionAdaptiveLatency = 1; |
struct RtpCastHeader { |
RtpCastHeader(); |
// Elements from RTP packet header. |
bool marker; |
- uint8 payload_type; |
- uint16 sequence_number; |
- uint32 rtp_timestamp; |
- uint32 sender_ssrc; |
- uint8 num_csrcs; |
+ uint8_t payload_type; |
+ uint16_t sequence_number; |
+ uint32_t rtp_timestamp; |
+ uint32_t sender_ssrc; |
+ uint8_t num_csrcs; |
// Elements from Cast header (at beginning of RTP payload). |
bool is_key_frame; |
bool is_reference; |
- uint32 frame_id; |
- uint16 packet_id; |
- uint16 max_packet_id; |
- uint32 reference_frame_id; |
- uint16 new_playout_delay_ms; |
- uint8 num_extensions; |
+ uint32_t frame_id; |
+ uint16_t packet_id; |
+ uint16_t max_packet_id; |
+ uint32_t reference_frame_id; |
+ uint16_t new_playout_delay_ms; |
+ uint8_t num_extensions; |
}; |
class RtpPayloadFeedback { |