commit 0e81fdf5d2c2665bc3d23e07cfd9ea7f7d36aed9
author pkasting@chromium.org <pkasting@chromium.org> Mon Feb 02 23:54:03 2015 +0000
committer pkasting@chromium.org <pkasting@chromium.org> Mon Feb 02 23:54:40 2015 +0000
tree b4ba11fc3d7af531bbb4cfea405494995b1761c6
parent 19f3f71c9873cf5f6d647becd3620ddf8fd6ba7c

Avoid implicit type truncations by inserting explicit casts or modifying prototypes to avoid needless up- and then down-casting.

BUG=chromium:82439
TEST=none
R=henrik.lundin@webrtc.org, mflodman@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40569004

Cr-Commit-Position: refs/heads/master@{#8229}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8229 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/media/base/rtputils_unittest.cc

diff --git a/talk/media/base/rtputils_unittest.cc b/talk/media/base/rtputils_unittest.cc
index cec4f71..027f395 100644
--- a/talk/media/base/rtputils_unittest.cc
+++ b/talk/media/base/rtputils_unittest.cc
@@ -75,9 +75,7 @@
 };
 
 TEST(RtpUtilsTest, GetRtp) {
-  int ver;
-  EXPECT_TRUE(GetRtpVersion(kPcmuFrame, sizeof(kPcmuFrame), &ver));
-  EXPECT_EQ(2, ver);
+  EXPECT_TRUE(IsRtpPacket(kPcmuFrame, sizeof(kPcmuFrame)));
 
   int pt;
   EXPECT_TRUE(GetRtpPayloadType(kPcmuFrame, sizeof(kPcmuFrame), &pt));
@@ -111,44 +109,24 @@
   EXPECT_FALSE(GetRtpSsrc(kInvalidPacket, sizeof(kInvalidPacket), &ssrc));
 }
 
-TEST(RtpUtilsTest, SetRtp) {
+TEST(RtpUtilsTest, SetRtpHeader) {
   unsigned char packet[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
   };
 
-  EXPECT_TRUE(SetRtpHeaderFlags(packet, sizeof(packet), false, false, 0));
-  EXPECT_TRUE(SetRtpPayloadType(packet, sizeof(packet), 9u));
-  EXPECT_TRUE(SetRtpSeqNum(packet, sizeof(packet), 1111u));
-  EXPECT_TRUE(SetRtpTimestamp(packet, sizeof(packet), 2222u));
-  EXPECT_TRUE(SetRtpSsrc(packet, sizeof(packet), 3333u));
+  RtpHeader header = { 9, 1111, 2222u, 3333u };
+  EXPECT_TRUE(SetRtpHeader(packet, sizeof(packet), header));
 
   // Bits: 10 0 0 0000
   EXPECT_EQ(128u, packet[0]);
   size_t len;
   EXPECT_TRUE(GetRtpHeaderLen(packet, sizeof(packet), &len));
   EXPECT_EQ(12U, len);
-  RtpHeader header;
   EXPECT_TRUE(GetRtpHeader(packet, sizeof(packet), &header));
   EXPECT_EQ(9, header.payload_type);
   EXPECT_EQ(1111, header.seq_num);
   EXPECT_EQ(2222u, header.timestamp);
   EXPECT_EQ(3333u, header.ssrc);
-
-  unsigned char packet2[] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-  };
-
-  EXPECT_TRUE(SetRtpHeader(packet2, sizeof(packet2), header));
-
-  // Bits: 10 0 0 0000
-  EXPECT_EQ(128u, packet2[0]);
-  EXPECT_TRUE(GetRtpHeaderLen(packet2, sizeof(packet2), &len));
-  EXPECT_EQ(12U, len);
-  EXPECT_TRUE(GetRtpHeader(packet2, sizeof(packet2), &header));
-  EXPECT_EQ(9, header.payload_type);
-  EXPECT_EQ(1111, header.seq_num);
-  EXPECT_EQ(2222u, header.timestamp);
-  EXPECT_EQ(3333u, header.ssrc);
 }
 
 TEST(RtpUtilsTest, GetRtpHeaderLen) {