diff options
| author | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-27 23:04:10 +0000 |
|---|---|---|
| committer | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-27 23:04:10 +0000 |
| commit | 5528070a0c76057a000b877fc56ca4180ad2087b (patch) | |
| tree | c74af98296642d626249e81eed607ffd7c4aff79 /media/base/rtpdataengine_unittest.cc | |
| parent | 552571114aee32455e20a50ddb56abc089dff35d (diff) | |
| download | talk-5528070a0c76057a000b877fc56ca4180ad2087b.tar.gz | |
Update libjingle to CL 53398036.
Review URL: https://webrtc-codereview.appspot.com/2323004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/rtpdataengine_unittest.cc')
| -rw-r--r-- | media/base/rtpdataengine_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/base/rtpdataengine_unittest.cc b/media/base/rtpdataengine_unittest.cc index 456f7b0..37ea968 100644 --- a/media/base/rtpdataengine_unittest.cc +++ b/media/base/rtpdataengine_unittest.cc @@ -294,7 +294,8 @@ TEST_F(RtpDataMediaChannelTest, SendData) { cricket::RtpHeader header1 = GetSentDataHeader(1); EXPECT_EQ(header1.ssrc, 42U); EXPECT_EQ(header1.payload_type, 103); - EXPECT_EQ(header0.seq_num + 1, header1.seq_num); + EXPECT_EQ(static_cast<uint16>(header0.seq_num + 1), + static_cast<uint16>(header1.seq_num)); EXPECT_EQ(header0.timestamp + 180000, header1.timestamp); } @@ -354,9 +355,11 @@ TEST_F(RtpDataMediaChannelTest, DISABLED_SendDataMultipleClocks) { cricket::RtpHeader header1b = GetSentDataHeader(2); cricket::RtpHeader header2b = GetSentDataHeader(3); - EXPECT_EQ(header1a.seq_num + 1, header1b.seq_num); + EXPECT_EQ(static_cast<uint16>(header1a.seq_num + 1), + static_cast<uint16>(header1b.seq_num)); EXPECT_EQ(header1a.timestamp + 90000, header1b.timestamp); - EXPECT_EQ(header2a.seq_num + 1, header2b.seq_num); + EXPECT_EQ(static_cast<uint16>(header2a.seq_num + 1), + static_cast<uint16>(header2b.seq_num)); EXPECT_EQ(header2a.timestamp + 180000, header2b.timestamp); } |