zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat the WebRTC code base

Browse Source 
Running clang-format with chromium's style guide.

The goal is n-fold:
 * providing consistency and readability (that's what code guidelines are for)
 * preventing noise with presubmit checks and git cl format
 * building on the previous point: making it easier to automatically fix format issues
 * you name it

Please consider using git-hyper-blame to ignore this commit.

Bug: webrtc:9340
Change-Id: I694567c4cdf8cee2860958cfe82bfaf25848bb87
Reviewed-on: https://webrtc-review.googlesource.com/81185
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23660}
This commit is contained in:
Yves Gerey
2018-06-19 15:03:05 +02:00
parent b602123a5a
commit 665174fdbb
1569 changed files with 30495 additions and 30309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
View File

@ -97,11 +97,10 @@ TEST(RtcpPacketSdesTest, CreateAndParseCnameItemWithEmptyString) {
TEST(RtcpPacketSdesTest, ParseSkipsNonCNameField) {
const uint8_t kName[] = "abc";
const uint8_t kCname[] = "de";
const uint8_t kValidPacket[] = {0x81, 202, 0x00, 0x04,
0x12, 0x34, 0x56, 0x78,
kNameTag, 3, kName[0], kName[1], kName[2],
kCnameTag, 2, kCname[0], kCname[1],
kTerminatorTag, kPadding, kPadding};
const uint8_t kValidPacket[] = {
0x81, 202, 0x00, 0x04, 0x12, 0x34, 0x56,
0x78, kNameTag, 3, kName[0], kName[1], kName[2], kCnameTag,
2, kCname[0], kCname[1], kTerminatorTag, kPadding, kPadding};
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kValidPacket) % 4);
ASSERT_EQ(kValidPacket[3] + 1u, sizeof(kValidPacket) / 4);
@ -118,13 +117,14 @@ TEST(RtcpPacketSdesTest, ParseSkipsChunksWithoutCName) {
const uint8_t kName[] = "ab";
const uint8_t kEmail[] = "de";
const uint8_t kCname[] = "def";
const uint8_t kPacket[] = {0x82, 202, 0x00, 0x07,
0x12, 0x34, 0x56, 0x78, // 1st chunk.
kNameTag, 3, kName[0], kName[1], kName[2],
kEmailTag, 2, kEmail[0], kEmail[1],
kTerminatorTag, kPadding, kPadding,
0x23, 0x45, 0x67, 0x89, // 2nd chunk.
kCnameTag, 3, kCname[0], kCname[1], kCname[2],
const uint8_t kPacket[] = {
0x82, 202, 0x00, 0x07, 0x12,
0x34, 0x56, 0x78, // 1st chunk.
kNameTag, 3, kName[0], kName[1], kName[2],
kEmailTag, 2, kEmail[0], kEmail[1], kTerminatorTag,
kPadding, kPadding, 0x23, 0x45, 0x67,
0x89, // 2nd chunk.
kCnameTag, 3, kCname[0], kCname[1], kCname[2],
kTerminatorTag, kPadding, kPadding};
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kPacket) % 4);
@ -141,10 +141,9 @@ TEST(RtcpPacketSdesTest, ParseFailsWithoutChunkItemTerminator) {
const uint8_t kName[] = "abc";
const uint8_t kCname[] = "d";
// No place for next chunk item.
const uint8_t kInvalidPacket[] = {0x81, 202, 0x00, 0x03,
0x12, 0x34, 0x56, 0x78,
kNameTag, 3, kName[0], kName[1], kName[2],
kCnameTag, 1, kCname[0]};
const uint8_t kInvalidPacket[] = {
0x81, 202, 0x00, 0x03, 0x12, 0x34, 0x56, 0x78,
kNameTag, 3, kName[0], kName[1], kName[2], kCnameTag, 1, kCname[0]};
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kInvalidPacket) % 4);
ASSERT_EQ(kInvalidPacket[3] + 1u, sizeof(kInvalidPacket) / 4);
@ -157,11 +156,9 @@ TEST(RtcpPacketSdesTest, ParseFailsWithDamagedChunkItem) {
const uint8_t kName[] = "ab";
const uint8_t kCname[] = "d";
// Next chunk item has non-terminator type, but not the size.
const uint8_t kInvalidPacket[] = {0x81, 202, 0x00, 0x03,
0x12, 0x34, 0x56, 0x78,
kNameTag, 2, kName[0], kName[1],
kCnameTag, 1, kCname[0],
kEmailTag};
const uint8_t kInvalidPacket[] = {
0x81, 202, 0x00, 0x03, 0x12, 0x34, 0x56, 0x78,
kNameTag, 2, kName[0], kName[1], kCnameTag, 1, kCname[0], kEmailTag};
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kInvalidPacket) % 4);
ASSERT_EQ(kInvalidPacket[3] + 1u, sizeof(kInvalidPacket) / 4);
@ -174,10 +171,9 @@ TEST(RtcpPacketSdesTest, ParseFailsWithTooLongChunkItem) {
const uint8_t kName[] = "abc";
const uint8_t kCname[] = "d";
// Last chunk item has length that goes beyond the buffer end.
const uint8_t kInvalidPacket[] = {0x81, 202, 0x00, 0x03,
0x12, 0x34, 0x56, 0x78,
kNameTag, 3, kName[0], kName[1], kName[2],
kCnameTag, 2, kCname[0]};
const uint8_t kInvalidPacket[] = {
0x81, 202, 0x00, 0x03, 0x12, 0x34, 0x56, 0x78,
kNameTag, 3, kName[0], kName[1], kName[2], kCnameTag, 2, kCname[0]};
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kInvalidPacket) % 4);
ASSERT_EQ(kInvalidPacket[3] + 1u, sizeof(kInvalidPacket) / 4);
@ -189,11 +185,10 @@ TEST(RtcpPacketSdesTest, ParseFailsWithTooLongChunkItem) {
TEST(RtcpPacketSdesTest, ParseFailsWithTwoCNames) {
const uint8_t kCname1[] = "a";
const uint8_t kCname2[] = "de";
const uint8_t kInvalidPacket[] = {0x81, 202, 0x00, 0x03,
0x12, 0x34, 0x56, 0x78,
kCnameTag, 1, kCname1[0],
kCnameTag, 2, kCname2[0], kCname2[1],
kTerminatorTag};
const uint8_t kInvalidPacket[] = {
0x81, 202, 0x00, 0x03, 0x12, 0x34, 0x56,
0x78, kCnameTag, 1, kCname1[0], kCnameTag, 2, kCname2[0],
kCname2[1], kTerminatorTag};
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kInvalidPacket) % 4);
ASSERT_EQ(kInvalidPacket[3] + 1u, sizeof(kInvalidPacket) / 4);
@ -206,12 +201,11 @@ TEST(RtcpPacketSdesTest, ParseFailsWithTooLittleSpaceForNextChunk) {
const uint8_t kCname[] = "a";
const uint8_t kEmail[] = "de";
// Two chunks are promised in the header, but no place for the second chunk.
const uint8_t kInvalidPacket[] = {0x82, 202, 0x00, 0x04,
0x12, 0x34, 0x56, 0x78, // 1st chunk.
kCnameTag, 1, kCname[0],
kEmailTag, 2, kEmail[0], kEmail[1],
kTerminatorTag,
0x23, 0x45, 0x67, 0x89}; // 2nd chunk.
const uint8_t kInvalidPacket[] = {
0x82, 202, 0x00, 0x04, 0x12, 0x34, 0x56,
0x78, // 1st chunk.
kCnameTag, 1, kCname[0], kEmailTag, 2, kEmail[0], kEmail[1],
kTerminatorTag, 0x23, 0x45, 0x67, 0x89}; // 2nd chunk.
// Sanity checks packet was assembled correctly.
ASSERT_EQ(0u, sizeof(kInvalidPacket) % 4);
ASSERT_EQ(kInvalidPacket[3] + 1u, sizeof(kInvalidPacket) / 4);