* Move constants into the files/functions that use them
* Declare variables in the narrowest scope possible
* Use correct (expected, actual) order for gtest macros
* Remove unused functions
* Untabify
* 80-column limit
* Avoid C-style casts
* Prefer true typed constants to "enum hack" constants
* Print size_t using the right format macro
* Shorten and simplify code
* Other random cleanup bits and style fixes

BUG=none
TEST=none
R=henrik.lundin@webrtc.org, tommi@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8467}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8467 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pkasting@chromium.org
2015-02-23 21:28:22 +00:00
parent 722739108a
commit d324546ced
43 changed files with 393 additions and 541 deletions

View File

@@ -44,22 +44,23 @@ TEST(RtpDumpTest, ReadRtpDumpPacket) {
RtpTestUtility::kTestRawRtpPackets[0].WriteToByteBuffer(kTestSsrc, &rtp_buf);
RtpDumpPacket rtp_packet(rtp_buf.Data(), rtp_buf.Length(), 0, false);
int type;
int payload_type;
int seq_num;
uint32 ts;
uint32 ssrc;
int rtcp_type;
EXPECT_FALSE(rtp_packet.is_rtcp());
EXPECT_TRUE(rtp_packet.IsValidRtpPacket());
EXPECT_FALSE(rtp_packet.IsValidRtcpPacket());
EXPECT_TRUE(rtp_packet.GetRtpPayloadType(&type));
EXPECT_EQ(0, type);
EXPECT_TRUE(rtp_packet.GetRtpPayloadType(&payload_type));
EXPECT_EQ(0, payload_type);
EXPECT_TRUE(rtp_packet.GetRtpSeqNum(&seq_num));
EXPECT_EQ(0, seq_num);
EXPECT_TRUE(rtp_packet.GetRtpTimestamp(&ts));
EXPECT_EQ(0U, ts);
EXPECT_TRUE(rtp_packet.GetRtpSsrc(&ssrc));
EXPECT_EQ(kTestSsrc, ssrc);
EXPECT_FALSE(rtp_packet.GetRtcpType(&type));
EXPECT_FALSE(rtp_packet.GetRtcpType(&rtcp_type));
rtc::ByteBuffer rtcp_buf;
RtpTestUtility::kTestRawRtcpPackets[0].WriteToByteBuffer(&rtcp_buf);
@@ -68,8 +69,8 @@ TEST(RtpDumpTest, ReadRtpDumpPacket) {
EXPECT_TRUE(rtcp_packet.is_rtcp());
EXPECT_FALSE(rtcp_packet.IsValidRtpPacket());
EXPECT_TRUE(rtcp_packet.IsValidRtcpPacket());
EXPECT_TRUE(rtcp_packet.GetRtcpType(&type));
EXPECT_EQ(0, type);
EXPECT_TRUE(rtcp_packet.GetRtcpType(&rtcp_type));
EXPECT_EQ(0, rtcp_type);
}
// Test that we read only the RTP dump file.