| 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..38d823171b05611bc0a853865b62deefca5b46cc 100644
|
| --- a/media/cast/net/rtp/rtp_packetizer_unittest.cc
|
| +++ b/media/cast/net/rtp/rtp_packetizer_unittest.cc
|
| @@ -34,8 +34,7 @@ class TestRtpPacketTransport : public PacketSender {
|
| packets_sent_(0),
|
| expected_number_of_packets_(0),
|
| expected_packet_id_(0),
|
| - expected_frame_id_(0),
|
| - expected_rtp_timestamp_(0) {}
|
| + expected_frame_id_(0) {}
|
|
|
| void VerifyRtpHeader(const RtpCastHeader& rtp_header) {
|
| VerifyCommonRtpHeader(rtp_header);
|
| @@ -85,7 +84,7 @@ class TestRtpPacketTransport : public PacketSender {
|
| expected_number_of_packets_ = expected_number_of_packets;
|
| }
|
|
|
| - void set_rtp_timestamp(uint32 rtp_timestamp) {
|
| + void set_rtp_timestamp(RtpTimeTicks rtp_timestamp) {
|
| expected_rtp_timestamp_ = rtp_timestamp;
|
| }
|
|
|
| @@ -97,7 +96,7 @@ class TestRtpPacketTransport : public PacketSender {
|
| // Assuming packets arrive in sequence.
|
| int expected_packet_id_;
|
| uint32 expected_frame_id_;
|
| - uint32 expected_rtp_timestamp_;
|
| + RtpTimeTicks expected_rtp_timestamp_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(TestRtpPacketTransport);
|
| @@ -122,7 +121,7 @@ class RtpPacketizerTest : public ::testing::Test {
|
| video_frame_.frame_id = 0;
|
| video_frame_.referenced_frame_id = video_frame_.frame_id - 1;
|
| video_frame_.data.assign(kFrameSize, 123);
|
| - video_frame_.rtp_timestamp = 0x0055aa11;
|
| + video_frame_.rtp_timestamp = RtpTimeTicks().Expand(UINT32_C(0x0055aa11));
|
| }
|
|
|
| void RunTasks(int during_ms) {
|
|
|