| Index: media/cast/net/rtp/rtp_packetizer_unittest.cc
|
| diff --git a/media/cast/net/rtp/rtp_packetizer_unittest.cc b/media/cast/net/rtp/rtp_packetizer_unittest.cc
|
| index 07eb4193347311f3ea7f5f452f1027b700553952..29afb09756e5aee90af672939042ba6f0ccd73e6 100644
|
| --- a/media/cast/net/rtp/rtp_packetizer_unittest.cc
|
| +++ b/media/cast/net/rtp/rtp_packetizer_unittest.cc
|
| @@ -19,8 +19,8 @@ namespace cast {
|
|
|
| namespace {
|
| static const int kPayload = 127;
|
| -static const uint32 kTimestampMs = 10;
|
| -static const uint16 kSeqNum = 33;
|
| +static const uint32_t kTimestampMs = 10;
|
| +static const uint16_t kSeqNum = 33;
|
| static const int kMaxPacketLength = 1500;
|
| static const int kSsrc = 0x12345;
|
| static const unsigned int kFrameSize = 5000;
|
| @@ -67,7 +67,7 @@ class TestRtpPacketTransport : public PacketSender {
|
| ++packets_sent_;
|
| RtpParser parser(kSsrc, kPayload);
|
| RtpCastHeader rtp_header;
|
| - const uint8* payload_data;
|
| + const uint8_t* payload_data;
|
| size_t payload_size;
|
| parser.ParsePacket(&packet->data[0], packet->data.size(), &rtp_header,
|
| &payload_data, &payload_size);
|
| @@ -77,7 +77,7 @@ class TestRtpPacketTransport : public PacketSender {
|
| return true;
|
| }
|
|
|
| - int64 GetBytesSent() final { return 0; }
|
| + int64_t GetBytesSent() final { return 0; }
|
|
|
| size_t number_of_packets_received() const { return packets_sent_; }
|
|
|
| @@ -85,19 +85,19 @@ class TestRtpPacketTransport : public PacketSender {
|
| expected_number_of_packets_ = expected_number_of_packets;
|
| }
|
|
|
| - void set_rtp_timestamp(uint32 rtp_timestamp) {
|
| + void set_rtp_timestamp(uint32_t rtp_timestamp) {
|
| expected_rtp_timestamp_ = rtp_timestamp;
|
| }
|
|
|
| RtpPacketizerConfig config_;
|
| - uint32 sequence_number_;
|
| + uint32_t sequence_number_;
|
| size_t packets_sent_;
|
| size_t number_of_packets_;
|
| size_t expected_number_of_packets_;
|
| // Assuming packets arrive in sequence.
|
| int expected_packet_id_;
|
| - uint32 expected_frame_id_;
|
| - uint32 expected_rtp_timestamp_;
|
| + uint32_t expected_frame_id_;
|
| + uint32_t expected_rtp_timestamp_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(TestRtpPacketTransport);
|
|
|