Reformat the WebRTC code base
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}diff --git a/pc/webrtcsdp_unittest.cc b/pc/webrtcsdp_unittest.cc
index 6a4d5a6..e7471af 100644
--- a/pc/webrtcsdp_unittest.cc
+++ b/pc/webrtcsdp_unittest.cc
@@ -16,8 +16,8 @@
#include "api/jsepsessiondescription.h"
#include "media/base/mediaconstants.h"
#include "media/engine/webrtcvideoengine.h"
-#include "p2p/base/port.h"
#include "p2p/base/p2pconstants.h"
+#include "p2p/base/port.h"
#include "pc/mediasession.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
@@ -86,7 +86,8 @@
static const char kAttributeCryptoVideo[] =
"a=crypto:1 AES_CM_128_HMAC_SHA1_80 "
"inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32\r\n";
-static const char kFingerprint[] = "a=fingerprint:sha-1 "
+static const char kFingerprint[] =
+ "a=fingerprint:sha-1 "
"4A:AD:B9:B1:3F:82:18:3B:54:02:12:DF:3E:5D:49:6B:19:E5:7C:AB\r\n";
static const int kExtmapId = 1;
static const char kExtmapUri[] = "http://example.com/082005/ext.htm#ttime";
@@ -796,15 +797,15 @@
const std::string& newlines,
std::string* message) {
const std::string tmp = line + newlines;
- rtc::replace_substrs(line.c_str(), line.length(),
- tmp.c_str(), tmp.length(), message);
+ rtc::replace_substrs(line.c_str(), line.length(), tmp.c_str(), tmp.length(),
+ message);
}
static void Replace(const std::string& line,
const std::string& newlines,
std::string* message) {
- rtc::replace_substrs(line.c_str(), line.length(),
- newlines.c_str(), newlines.length(), message);
+ rtc::replace_substrs(line.c_str(), line.length(), newlines.c_str(),
+ newlines.length(), message);
}
// Expect fail to parase |bad_sdp| and expect |bad_part| be part of the error
@@ -855,7 +856,8 @@
Replace("a=sendrecv", new_direction, message);
}
-static void ReplaceRejected(bool audio_rejected, bool video_rejected,
+static void ReplaceRejected(bool audio_rejected,
+ bool video_rejected,
std::string* message) {
if (audio_rejected) {
Replace("m=audio 9", "m=audio 0", message);
@@ -998,22 +1000,20 @@
candidates_.push_back(candidate11);
candidates_.push_back(candidate12);
- jcandidate_.reset(new JsepIceCandidate(std::string("audio_content_name"),
- 0, candidate1));
+ jcandidate_.reset(
+ new JsepIceCandidate(std::string("audio_content_name"), 0, candidate1));
// Set up JsepSessionDescription.
jdesc_.Initialize(desc_.Copy(), kSessionId, kSessionVersion);
std::string mline_id;
int mline_index = 0;
- for (size_t i = 0; i< candidates_.size(); ++i) {
+ for (size_t i = 0; i < candidates_.size(); ++i) {
// In this test, the audio m line index will be 0, and the video m line
// will be 1.
bool is_video = (i > 5);
mline_id = is_video ? "video_content_name" : "audio_content_name";
mline_index = is_video ? 1 : 0;
- JsepIceCandidate jice(mline_id,
- mline_index,
- candidates_.at(i));
+ JsepIceCandidate jice(mline_id, mline_index, candidates_.at(i));
jdesc_.AddCandidate(&jice);
}
}
@@ -1141,7 +1141,8 @@
AudioContentDescription* audio = new AudioContentDescription();
audio->set_rtcp_mux(true);
audio->set_rtcp_reduced_size(true);
- audio->AddCrypto(CryptoParams(1, "AES_CM_128_HMAC_SHA1_32",
+ audio->AddCrypto(CryptoParams(
+ 1, "AES_CM_128_HMAC_SHA1_32",
"inline:NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32",
"dummy_session_params"));
audio->set_protocol(cricket::kMediaProtocolSavpf);
@@ -1227,8 +1228,7 @@
}
template <class MCD>
- void CompareMediaContentDescription(const MCD* cd1,
- const MCD* cd2) {
+ void CompareMediaContentDescription(const MCD* cd1, const MCD* cd2) {
// type
EXPECT_EQ(cd1->type(), cd1->type());
@@ -1247,7 +1247,7 @@
ADD_FAILURE();
return;
}
- for (size_t i = 0; i< cd1->cryptos().size(); ++i) {
+ for (size_t i = 0; i < cd1->cryptos().size(); ++i) {
const CryptoParams c1 = cd1->cryptos().at(i);
const CryptoParams c2 = cd2->cryptos().at(i);
EXPECT_TRUE(c1.Matches(c2));
@@ -1258,13 +1258,13 @@
// protocol
// Use an equivalence class here, for old and new versions of the
// protocol description.
- if (cd1->protocol() == cricket::kMediaProtocolDtlsSctp
- || cd1->protocol() == cricket::kMediaProtocolUdpDtlsSctp
- || cd1->protocol() == cricket::kMediaProtocolTcpDtlsSctp) {
+ if (cd1->protocol() == cricket::kMediaProtocolDtlsSctp ||
+ cd1->protocol() == cricket::kMediaProtocolUdpDtlsSctp ||
+ cd1->protocol() == cricket::kMediaProtocolTcpDtlsSctp) {
const bool cd2_is_also_dtls_sctp =
- cd2->protocol() == cricket::kMediaProtocolDtlsSctp
- || cd2->protocol() == cricket::kMediaProtocolUdpDtlsSctp
- || cd2->protocol() == cricket::kMediaProtocolTcpDtlsSctp;
+ cd2->protocol() == cricket::kMediaProtocolDtlsSctp ||
+ cd2->protocol() == cricket::kMediaProtocolUdpDtlsSctp ||
+ cd2->protocol() == cricket::kMediaProtocolTcpDtlsSctp;
EXPECT_TRUE(cd2_is_also_dtls_sctp);
} else {
EXPECT_EQ(cd1->protocol(), cd2->protocol());
@@ -1282,7 +1282,7 @@
// extmap
ASSERT_EQ(cd1->rtp_header_extensions().size(),
cd2->rtp_header_extensions().size());
- for (size_t i = 0; i< cd1->rtp_header_extensions().size(); ++i) {
+ for (size_t i = 0; i < cd1->rtp_header_extensions().size(); ++i) {
const RtpExtension ext1 = cd1->rtp_header_extensions().at(i);
const RtpExtension ext2 = cd2->rtp_header_extensions().at(i);
EXPECT_EQ(ext1.uri, ext2.uri);
@@ -1304,7 +1304,7 @@
ADD_FAILURE();
return;
}
- for (size_t i = 0 ; i < desc1.contents().size(); ++i) {
+ for (size_t i = 0; i < desc1.contents().size(); ++i) {
const cricket::ContentInfo& c1 = desc1.contents().at(i);
const cricket::ContentInfo& c2 = desc2.contents().at(i);
// ContentInfo properties.
@@ -1379,8 +1379,7 @@
EXPECT_EQ(transport1.content_name, transport2.content_name);
EXPECT_EQ(transport1.description.ice_ufrag,
transport2.description.ice_ufrag);
- EXPECT_EQ(transport1.description.ice_pwd,
- transport2.description.ice_pwd);
+ EXPECT_EQ(transport1.description.ice_pwd, transport2.description.ice_pwd);
EXPECT_EQ(transport1.description.ice_mode,
transport2.description.ice_mode);
if (transport1.description.identity_fingerprint) {
@@ -1398,9 +1397,8 @@
EXPECT_EQ(desc1.msid_supported(), desc2.msid_supported());
}
- bool CompareSessionDescription(
- const JsepSessionDescription& desc1,
- const JsepSessionDescription& desc2) {
+ bool CompareSessionDescription(const JsepSessionDescription& desc1,
+ const JsepSessionDescription& desc2) {
EXPECT_EQ(desc1.session_id(), desc2.session_id());
EXPECT_EQ(desc1.session_version(), desc2.session_version());
CompareSessionDescription(*desc1.description(), *desc2.description());
@@ -1431,16 +1429,18 @@
const char ice_ufragx[] = "a=xice-ufrag";
const char ice_pwd[] = "a=ice-pwd";
const char ice_pwdx[] = "a=xice-pwd";
- rtc::replace_substrs(ice_ufrag, strlen(ice_ufrag),
- ice_ufragx, strlen(ice_ufragx), sdp);
- rtc::replace_substrs(ice_pwd, strlen(ice_pwd),
- ice_pwdx, strlen(ice_pwdx), sdp);
+ rtc::replace_substrs(ice_ufrag, strlen(ice_ufrag), ice_ufragx,
+ strlen(ice_ufragx), sdp);
+ rtc::replace_substrs(ice_pwd, strlen(ice_pwd), ice_pwdx, strlen(ice_pwdx),
+ sdp);
return true;
}
// Update the candidates in |jdesc| to use the given |ufrag| and |pwd|.
- bool UpdateCandidateUfragPwd(JsepSessionDescription* jdesc, int mline_index,
- const std::string& ufrag, const std::string& pwd) {
+ bool UpdateCandidateUfragPwd(JsepSessionDescription* jdesc,
+ int mline_index,
+ const std::string& ufrag,
+ const std::string& pwd) {
std::string content_name;
if (mline_index == 0) {
content_name = kAudioContentName;
@@ -1449,8 +1449,8 @@
} else {
RTC_NOTREACHED();
}
- TransportInfo transport_info(
- content_name, TransportDescription(ufrag, pwd));
+ TransportInfo transport_info(content_name,
+ TransportDescription(ufrag, pwd));
SessionDescription* desc =
const_cast<SessionDescription*>(jdesc->description());
desc->RemoveTransportInfoByName(content_name);
@@ -1459,10 +1459,8 @@
const IceCandidateCollection* cc = jdesc_.candidates(i);
for (size_t j = 0; j < cc->count(); ++j) {
if (cc->at(j)->sdp_mline_index() == mline_index) {
- const_cast<Candidate&>(cc->at(j)->candidate()).set_username(
- ufrag);
- const_cast<Candidate&>(cc->at(j)->candidate()).set_password(
- pwd);
+ const_cast<Candidate&>(cc->at(j)->candidate()).set_username(ufrag);
+ const_cast<Candidate&>(cc->at(j)->candidate()).set_password(pwd);
}
}
}
@@ -1494,9 +1492,8 @@
void AddFingerprint() {
desc_.RemoveTransportInfoByName(kAudioContentName);
desc_.RemoveTransportInfoByName(kVideoContentName);
- rtc::SSLFingerprint fingerprint(rtc::DIGEST_SHA_1,
- kIdentityDigest,
- sizeof(kIdentityDigest));
+ rtc::SSLFingerprint fingerprint(rtc::DIGEST_SHA_1, kIdentityDigest,
+ sizeof(kIdentityDigest));
EXPECT_TRUE(desc_.AddTransportInfo(TransportInfo(
kAudioContentName,
TransportDescription(std::vector<std::string>(), kUfragVoice, kPwdVoice,
@@ -1557,8 +1554,7 @@
std::string new_sdp = kSdpFullString;
ReplaceDirection(direction, &new_sdp);
- if (!jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ if (!jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version())) {
return false;
}
@@ -1618,9 +1614,9 @@
data_stream.set_stream_ids({kDataChannelLabel});
data_stream.ssrcs.push_back(kDataChannelSsrc);
data_desc_->AddStream(data_stream);
- data_desc_->AddCrypto(CryptoParams(
- 1, "AES_CM_128_HMAC_SHA1_80",
- "inline:FvLcvU2P3ZWmQxgPAgcDu7Zl9vftYElFOjEzhWs5", ""));
+ data_desc_->AddCrypto(
+ CryptoParams(1, "AES_CM_128_HMAC_SHA1_80",
+ "inline:FvLcvU2P3ZWmQxgPAgcDu7Zl9vftYElFOjEzhWs5", ""));
data_desc_->set_protocol(cricket::kMediaProtocolSavpf);
desc_.AddContent(kDataContentName, MediaProtocolType::kRtp, data.release());
EXPECT_TRUE(desc_.AddTransportInfo(TransportInfo(
@@ -1636,8 +1632,7 @@
audio_desc_->set_direction(direction);
video_desc_->set_direction(direction);
- if (!jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ if (!jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version())) {
return false;
}
@@ -1672,12 +1667,12 @@
return true;
}
- void TestDeserializeExtmap(bool session_level, bool media_level,
- bool encrypted) {
+ void TestDeserializeExtmap(bool session_level,
+ bool media_level,
+ bool encrypted) {
AddExtmap(encrypted);
JsepSessionDescription new_jdesc(SdpType::kOffer);
- ASSERT_TRUE(new_jdesc.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(new_jdesc.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
JsepSessionDescription jdesc_with_extmap(SdpType::kOffer);
std::string sdp_with_extmap = kSdpString;
@@ -1701,8 +1696,8 @@
// media level.
if (session_level && media_level) {
SdpParseError error;
- EXPECT_FALSE(webrtc::SdpDeserialize(sdp_with_extmap,
- &jdesc_with_extmap, &error));
+ EXPECT_FALSE(
+ webrtc::SdpDeserialize(sdp_with_extmap, &jdesc_with_extmap, &error));
EXPECT_NE(std::string::npos, error.description.find("a=extmap"));
} else {
EXPECT_TRUE(SdpDeserialize(sdp_with_extmap, &jdesc_with_extmap));
@@ -1711,7 +1706,8 @@
}
void VerifyCodecParameter(const cricket::CodecParameterMap& params,
- const std::string& name, int expected_value) {
+ const std::string& name,
+ int expected_value) {
cricket::CodecParameterMap::const_iterator found = params.find(name);
ASSERT_TRUE(found != params.end());
EXPECT_EQ(found->second, rtc::ToString<int>(expected_value));
@@ -1812,9 +1808,9 @@
"a=rtcp-fb:101 goog-remb\r\n";
std::ostringstream os;
os << sdp_session_and_audio;
- os << "a=rtcp-fb:" << (use_wildcard ? "*" : "111") << " nack\r\n";
+ os << "a=rtcp-fb:" << (use_wildcard ? "*" : "111") << " nack\r\n";
os << sdp_video;
- os << "a=rtcp-fb:" << (use_wildcard ? "*" : "101") << " ccm fir\r\n";
+ os << "a=rtcp-fb:" << (use_wildcard ? "*" : "101") << " ccm fir\r\n";
std::string sdp = os.str();
// Deserialize
SdpParseError error;
@@ -1825,9 +1821,8 @@
ASSERT_FALSE(acd->codecs().empty());
cricket::AudioCodec opus = acd->codecs()[0];
EXPECT_EQ(111, opus.id);
- EXPECT_TRUE(opus.HasFeedbackParam(
- cricket::FeedbackParam(cricket::kRtcpFbParamNack,
- cricket::kParamValueEmpty)));
+ EXPECT_TRUE(opus.HasFeedbackParam(cricket::FeedbackParam(
+ cricket::kRtcpFbParamNack, cricket::kParamValueEmpty)));
const VideoContentDescription* vcd =
GetFirstVideoContentDescription(jdesc_output->description());
@@ -1837,18 +1832,14 @@
EXPECT_STREQ(webrtc::JsepSessionDescription::kDefaultVideoCodecName,
vp8.name.c_str());
EXPECT_EQ(101, vp8.id);
- EXPECT_TRUE(vp8.HasFeedbackParam(
- cricket::FeedbackParam(cricket::kRtcpFbParamNack,
- cricket::kParamValueEmpty)));
- EXPECT_TRUE(vp8.HasFeedbackParam(
- cricket::FeedbackParam(cricket::kRtcpFbParamNack,
- cricket::kRtcpFbNackParamPli)));
- EXPECT_TRUE(vp8.HasFeedbackParam(
- cricket::FeedbackParam(cricket::kRtcpFbParamRemb,
- cricket::kParamValueEmpty)));
- EXPECT_TRUE(vp8.HasFeedbackParam(
- cricket::FeedbackParam(cricket::kRtcpFbParamCcm,
- cricket::kRtcpFbCcmParamFir)));
+ EXPECT_TRUE(vp8.HasFeedbackParam(cricket::FeedbackParam(
+ cricket::kRtcpFbParamNack, cricket::kParamValueEmpty)));
+ EXPECT_TRUE(vp8.HasFeedbackParam(cricket::FeedbackParam(
+ cricket::kRtcpFbParamNack, cricket::kRtcpFbNackParamPli)));
+ EXPECT_TRUE(vp8.HasFeedbackParam(cricket::FeedbackParam(
+ cricket::kRtcpFbParamRemb, cricket::kParamValueEmpty)));
+ EXPECT_TRUE(vp8.HasFeedbackParam(cricket::FeedbackParam(
+ cricket::kRtcpFbParamCcm, cricket::kRtcpFbCcmParamFir)));
}
// Two SDP messages can mean the same thing but be different strings, e.g.
@@ -1921,10 +1912,8 @@
std::string message = webrtc::SdpSerialize(jdesc_with_fingerprint);
std::string sdp_with_fingerprint = kSdpString;
- InjectAfter(kAttributeIcePwdVoice,
- kFingerprint, &sdp_with_fingerprint);
- InjectAfter(kAttributeIcePwdVideo,
- kFingerprint, &sdp_with_fingerprint);
+ InjectAfter(kAttributeIcePwdVoice, kFingerprint, &sdp_with_fingerprint);
+ InjectAfter(kAttributeIcePwdVideo, kFingerprint, &sdp_with_fingerprint);
EXPECT_EQ(sdp_with_fingerprint, message);
}
@@ -1941,10 +1930,8 @@
std::string sdp_with_fingerprint = kSdpString;
Replace(kAttributeCryptoVoice, "", &sdp_with_fingerprint);
Replace(kAttributeCryptoVideo, "", &sdp_with_fingerprint);
- InjectAfter(kAttributeIcePwdVoice,
- kFingerprint, &sdp_with_fingerprint);
- InjectAfter(kAttributeIcePwdVideo,
- kFingerprint, &sdp_with_fingerprint);
+ InjectAfter(kAttributeIcePwdVoice, kFingerprint, &sdp_with_fingerprint);
+ InjectAfter(kAttributeIcePwdVideo, kFingerprint, &sdp_with_fingerprint);
EXPECT_EQ(sdp_with_fingerprint, message);
}
@@ -1962,8 +1949,7 @@
group.AddContentName(kAudioContentName);
group.AddContentName(kVideoContentName);
desc_.AddGroup(group);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_bundle = kSdpFullString;
@@ -1978,16 +1964,13 @@
vcd->set_bandwidth(100 * 1000);
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(50 * 1000);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_bandwidth = kSdpFullString;
- InjectAfter("c=IN IP4 74.125.224.39\r\n",
- "b=AS:100\r\n",
+ InjectAfter("c=IN IP4 74.125.224.39\r\n", "b=AS:100\r\n",
&sdp_with_bandwidth);
- InjectAfter("c=IN IP4 74.125.127.126\r\n",
- "b=AS:50\r\n",
+ InjectAfter("c=IN IP4 74.125.127.126\r\n", "b=AS:50\r\n",
&sdp_with_bandwidth);
EXPECT_EQ(sdp_with_bandwidth, message);
}
@@ -2001,16 +1984,13 @@
transport_options.push_back(kIceOption2);
transport_options.push_back(kIceOption3);
AddIceOptions(kVideoContentName, transport_options);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_ice_options = kSdpFullString;
- InjectAfter(kAttributeIcePwdVoice,
- "a=ice-options:iceoption1 iceoption3\r\n",
+ InjectAfter(kAttributeIcePwdVoice, "a=ice-options:iceoption1 iceoption3\r\n",
&sdp_with_ice_options);
- InjectAfter(kAttributeIcePwdVideo,
- "a=ice-options:iceoption2 iceoption3\r\n",
+ InjectAfter(kAttributeIcePwdVideo, "a=ice-options:iceoption2 iceoption3\r\n",
&sdp_with_ice_options);
EXPECT_EQ(sdp_with_ice_options, message);
}
@@ -2088,11 +2068,10 @@
char default_portstr[16];
char new_portstr[16];
rtc::sprintfn(default_portstr, sizeof(default_portstr), "%d",
- kDefaultSctpPort);
+ kDefaultSctpPort);
rtc::sprintfn(new_portstr, sizeof(new_portstr), "%d", kNewPort);
- rtc::replace_substrs(default_portstr, strlen(default_portstr),
- new_portstr, strlen(new_portstr),
- &expected_sdp);
+ rtc::replace_substrs(default_portstr, strlen(default_portstr), new_portstr,
+ strlen(new_portstr), &expected_sdp);
EXPECT_EQ(expected_sdp, message);
}
@@ -2100,7 +2079,7 @@
TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithDataChannelAndBandwidth) {
JsepSessionDescription jsep_desc(kDummyType);
AddRtpDataChannel();
- data_desc_->set_bandwidth(100*1000);
+ data_desc_->set_bandwidth(100 * 1000);
MakeDescriptionWithoutCandidates(&jsep_desc);
std::string message = webrtc::SdpSerialize(jsep_desc);
@@ -2108,8 +2087,7 @@
expected_sdp.append(kSdpRtpDataChannelString);
// Serializing data content shouldn't ignore bandwidth settings.
InjectAfter("m=application 9 RTP/SAVPF 101\r\nc=IN IP4 0.0.0.0\r\n",
- "b=AS:100\r\n",
- &expected_sdp);
+ "b=AS:100\r\n", &expected_sdp);
EXPECT_EQ(expected_sdp, message);
}
@@ -2121,10 +2099,8 @@
std::string message = webrtc::SdpSerialize(desc_with_extmap);
std::string sdp_with_extmap = kSdpString;
- InjectAfter("a=mid:audio_content_name\r\n",
- kExtmap, &sdp_with_extmap);
- InjectAfter("a=mid:video_content_name\r\n",
- kExtmap, &sdp_with_extmap);
+ InjectAfter("a=mid:audio_content_name\r\n", kExtmap, &sdp_with_extmap);
+ InjectAfter("a=mid:video_content_name\r\n", kExtmap, &sdp_with_extmap);
EXPECT_EQ(sdp_with_extmap, message);
}
@@ -2133,8 +2109,8 @@
bool encrypted = true;
AddExtmap(encrypted);
JsepSessionDescription desc_with_extmap(kDummyType);
- ASSERT_TRUE(desc_with_extmap.Initialize(desc_.Copy(),
- kSessionId, kSessionVersion));
+ ASSERT_TRUE(
+ desc_with_extmap.Initialize(desc_.Copy(), kSessionId, kSessionVersion));
TestSerialize(desc_with_extmap);
}
@@ -2220,11 +2196,11 @@
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutMline) {
JsepSessionDescription jdesc(kDummyType);
const char kSdpWithoutMline[] =
- "v=0\r\n"
- "o=- 18446744069414584320 18446462598732840960 IN IP4 127.0.0.1\r\n"
- "s=-\r\n"
- "t=0 0\r\n"
- "a=msid-semantic: WMS local_stream_1 local_stream_2\r\n";
+ "v=0\r\n"
+ "o=- 18446744069414584320 18446462598732840960 IN IP4 127.0.0.1\r\n"
+ "s=-\r\n"
+ "t=0 0\r\n"
+ "a=msid-semantic: WMS local_stream_1 local_stream_2\r\n";
// Deserialize
EXPECT_TRUE(SdpDeserialize(kSdpWithoutMline, &jdesc));
EXPECT_EQ(0u, jdesc.description()->contents().size());
@@ -2243,8 +2219,8 @@
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutCandidates) {
// SessionDescription with desc but without candidates.
JsepSessionDescription jdesc_no_candidates(kDummyType);
- ASSERT_TRUE(jdesc_no_candidates.Initialize(desc_.Copy(),
- kSessionId, kSessionVersion));
+ ASSERT_TRUE(jdesc_no_candidates.Initialize(desc_.Copy(), kSessionId,
+ kSessionVersion));
JsepSessionDescription new_jdesc(kDummyType);
EXPECT_TRUE(SdpDeserialize(kSdpString, &new_jdesc));
EXPECT_TRUE(CompareSessionDescription(jdesc_no_candidates, new_jdesc));
@@ -2299,8 +2275,7 @@
EXPECT_EQ("G729", g729.name);
EXPECT_EQ(8000, g729.clockrate);
EXPECT_EQ(18, g729.id);
- cricket::CodecParameterMap::iterator found =
- g729.params.find("annexb");
+ cricket::CodecParameterMap::iterator found = g729.params.find("annexb");
ASSERT_TRUE(found != g729.params.end());
EXPECT_EQ(found->second, "yes");
@@ -2315,8 +2290,7 @@
// Add a DTLS a=fingerprint attribute to our session description.
AddFingerprint();
JsepSessionDescription new_jdesc(kDummyType);
- ASSERT_TRUE(new_jdesc.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(new_jdesc.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
JsepSessionDescription jdesc_with_fingerprint(kDummyType);
@@ -2338,8 +2312,7 @@
group.AddContentName(kAudioContentName);
group.AddContentName(kVideoContentName);
desc_.AddGroup(group);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bundle));
}
@@ -2347,20 +2320,16 @@
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithBandwidth) {
JsepSessionDescription jdesc_with_bandwidth(kDummyType);
std::string sdp_with_bandwidth = kSdpFullString;
- InjectAfter("a=mid:video_content_name\r\na=sendrecv\r\n",
- "b=AS:100\r\n",
+ InjectAfter("a=mid:video_content_name\r\na=sendrecv\r\n", "b=AS:100\r\n",
&sdp_with_bandwidth);
- InjectAfter("a=mid:audio_content_name\r\na=sendrecv\r\n",
- "b=AS:50\r\n",
+ InjectAfter("a=mid:audio_content_name\r\na=sendrecv\r\n", "b=AS:50\r\n",
&sdp_with_bandwidth);
- EXPECT_TRUE(
- SdpDeserialize(sdp_with_bandwidth, &jdesc_with_bandwidth));
+ EXPECT_TRUE(SdpDeserialize(sdp_with_bandwidth, &jdesc_with_bandwidth));
VideoContentDescription* vcd = GetFirstVideoContentDescription(&desc_);
vcd->set_bandwidth(100 * 1000);
AudioContentDescription* acd = GetFirstAudioContentDescription(&desc_);
acd->set_bandwidth(50 * 1000);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_bandwidth));
}
@@ -2368,14 +2337,11 @@
TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithIceOptions) {
JsepSessionDescription jdesc_with_ice_options(kDummyType);
std::string sdp_with_ice_options = kSdpFullString;
- InjectAfter(kSessionTime,
- "a=ice-options:iceoption3\r\n",
+ InjectAfter(kSessionTime, "a=ice-options:iceoption3\r\n",
&sdp_with_ice_options);
- InjectAfter(kAttributeIcePwdVoice,
- "a=ice-options:iceoption1\r\n",
+ InjectAfter(kAttributeIcePwdVoice, "a=ice-options:iceoption1\r\n",
&sdp_with_ice_options);
- InjectAfter(kAttributeIcePwdVideo,
- "a=ice-options:iceoption2\r\n",
+ InjectAfter(kAttributeIcePwdVideo, "a=ice-options:iceoption2\r\n",
&sdp_with_ice_options);
EXPECT_TRUE(SdpDeserialize(sdp_with_ice_options, &jdesc_with_ice_options));
std::vector<std::string> transport_options;
@@ -2386,8 +2352,7 @@
transport_options.push_back(kIceOption3);
transport_options.push_back(kIceOption2);
AddIceOptions(kVideoContentName, transport_options);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_ice_options));
}
@@ -2399,18 +2364,19 @@
EXPECT_TRUE(RemoveCandidateUfragPwd(&sdp_with_ufrag_pwd));
// Add session level ufrag and pwd
InjectAfter(kSessionTime,
- "a=ice-pwd:session+level+icepwd\r\n"
- "a=ice-ufrag:session+level+iceufrag\r\n",
- &sdp_with_ufrag_pwd);
+ "a=ice-pwd:session+level+icepwd\r\n"
+ "a=ice-ufrag:session+level+iceufrag\r\n",
+ &sdp_with_ufrag_pwd);
// Add media level ufrag and pwd for audio
- InjectAfter("a=mid:audio_content_name\r\n",
+ InjectAfter(
+ "a=mid:audio_content_name\r\n",
"a=ice-pwd:media+level+icepwd\r\na=ice-ufrag:media+level+iceufrag\r\n",
&sdp_with_ufrag_pwd);
// Update the candidate ufrag and pwd to the expected ones.
- EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 0,
- "media+level+iceufrag", "media+level+icepwd"));
- EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 1,
- "session+level+iceufrag", "session+level+icepwd"));
+ EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 0, "media+level+iceufrag",
+ "media+level+icepwd"));
+ EXPECT_TRUE(UpdateCandidateUfragPwd(&jdesc_, 1, "session+level+iceufrag",
+ "session+level+icepwd"));
EXPECT_TRUE(SdpDeserialize(sdp_with_ufrag_pwd, &jdesc_with_ufrag_pwd));
EXPECT_TRUE(CompareSessionDescription(jdesc_, jdesc_with_ufrag_pwd));
}
@@ -2497,8 +2463,8 @@
kCandidateFoundation1);
std::unique_ptr<IceCandidateInterface> jcandidate_template(
new JsepIceCandidate(std::string("audio_content_name"), 0, candidate));
- EXPECT_TRUE(jcandidate.candidate().IsEquivalent(
- jcandidate_template->candidate()));
+ EXPECT_TRUE(
+ jcandidate.candidate().IsEquivalent(jcandidate_template->candidate()));
sdp = kSdpTcpPassiveCandidate;
EXPECT_TRUE(SdpDeserializeCandidate(sdp, &jcandidate));
sdp = kSdpTcpSOCandidate;
@@ -2541,7 +2507,7 @@
// This test verifies that the deserialization of an invalid candidate string
// fails.
TEST_F(WebRtcSdpTest, DeserializeInvalidCandidiate) {
- JsepIceCandidate jcandidate(kDummyMid, kDummyIndex);
+ JsepIceCandidate jcandidate(kDummyMid, kDummyIndex);
std::string candidate_attribute = kRawCandidate;
candidate_attribute.replace(0, 1, "x");
@@ -2589,14 +2555,14 @@
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
// Verify with UDP/DTLS/SCTP.
- sdp_with_data.replace(sdp_with_data.find(kDtlsSctp),
- strlen(kDtlsSctp), kUdpDtlsSctp);
+ sdp_with_data.replace(sdp_with_data.find(kDtlsSctp), strlen(kDtlsSctp),
+ kUdpDtlsSctp);
EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
// Verify with TCP/DTLS/SCTP.
- sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp),
- strlen(kUdpDtlsSctp), kTcpDtlsSctp);
+ sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp), strlen(kUdpDtlsSctp),
+ kTcpDtlsSctp);
EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
}
@@ -2616,14 +2582,14 @@
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
// Verify with UDP/DTLS/SCTP.
- sdp_with_data.replace(sdp_with_data.find(kDtlsSctp),
- strlen(kDtlsSctp), kUdpDtlsSctp);
+ sdp_with_data.replace(sdp_with_data.find(kDtlsSctp), strlen(kDtlsSctp),
+ kUdpDtlsSctp);
EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
// Verify with TCP/DTLS/SCTP.
- sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp),
- strlen(kUdpDtlsSctp), kTcpDtlsSctp);
+ sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp), strlen(kUdpDtlsSctp),
+ kTcpDtlsSctp);
EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
}
@@ -2643,14 +2609,14 @@
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
// Verify with UDP/DTLS/SCTP.
- sdp_with_data.replace(sdp_with_data.find(kDtlsSctp),
- strlen(kDtlsSctp), kUdpDtlsSctp);
+ sdp_with_data.replace(sdp_with_data.find(kDtlsSctp), strlen(kDtlsSctp),
+ kUdpDtlsSctp);
EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
// Verify with TCP/DTLS/SCTP.
- sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp),
- strlen(kUdpDtlsSctp), kTcpDtlsSctp);
+ sdp_with_data.replace(sdp_with_data.find(kUdpDtlsSctp), strlen(kUdpDtlsSctp),
+ kTcpDtlsSctp);
EXPECT_TRUE(SdpDeserialize(sdp_with_data, &jdesc_output));
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_output));
}
@@ -2753,8 +2719,7 @@
// See: https://code.google.com/p/chromium/issues/detail?id=280726
std::string sdp_with_bandwidth = kSdpString;
sdp_with_bandwidth.append(kSdpRtpDataChannelString);
- InjectAfter("a=mid:data_content_name\r\n",
- "b=AS:100\r\n",
+ InjectAfter("a=mid:data_content_name\r\n", "b=AS:100\r\n",
&sdp_with_bandwidth);
JsepSessionDescription jdesc_with_bandwidth(kDummyType);
@@ -2771,8 +2736,7 @@
std::string sdp_with_bandwidth = kSdpString;
sdp_with_bandwidth.append(kSdpSctpDataChannelString);
- InjectAfter("a=mid:data_content_name\r\n",
- "b=AS:100\r\n",
+ InjectAfter("a=mid:data_content_name\r\n", "b=AS:100\r\n",
&sdp_with_bandwidth);
JsepSessionDescription jdesc_with_bandwidth(kDummyType);
@@ -2782,24 +2746,21 @@
EXPECT_TRUE(CompareSessionDescription(jdesc, jdesc_with_bandwidth));
}
-class WebRtcSdpExtmapTest
- : public WebRtcSdpTest, public testing::WithParamInterface<bool> {
-};
+class WebRtcSdpExtmapTest : public WebRtcSdpTest,
+ public testing::WithParamInterface<bool> {};
TEST_P(WebRtcSdpExtmapTest,
- DeserializeSessionDescriptionWithSessionLevelExtmap) {
+ DeserializeSessionDescriptionWithSessionLevelExtmap) {
bool encrypted = GetParam();
TestDeserializeExtmap(true, false, encrypted);
}
-TEST_P(WebRtcSdpExtmapTest,
- DeserializeSessionDescriptionWithMediaLevelExtmap) {
+TEST_P(WebRtcSdpExtmapTest, DeserializeSessionDescriptionWithMediaLevelExtmap) {
bool encrypted = GetParam();
TestDeserializeExtmap(false, true, encrypted);
}
-TEST_P(WebRtcSdpExtmapTest,
- DeserializeSessionDescriptionWithInvalidExtmap) {
+TEST_P(WebRtcSdpExtmapTest, DeserializeSessionDescriptionWithInvalidExtmap) {
bool encrypted = GetParam();
TestDeserializeExtmap(true, true, encrypted);
}
@@ -2897,14 +2858,18 @@
const char kSdpEmptyLine[] = "";
const char kSdpMissingValue[] = "a=";
- const char kSdpBrokenFingerprint[] = "a=fingerprint:sha-1 "
+ const char kSdpBrokenFingerprint[] =
+ "a=fingerprint:sha-1 "
"4AAD:B9:B1:3F:82:18:3B:54:02:12:DF:3E:5D:49:6B:19:E5:7C:AB";
- const char kSdpExtraField[] = "a=fingerprint:sha-1 "
+ const char kSdpExtraField[] =
+ "a=fingerprint:sha-1 "
"4A:AD:B9:B1:3F:82:18:3B:54:02:12:DF:3E:5D:49:6B:19:E5:7C:AB XXX";
- const char kSdpMissingSpace[] = "a=fingerprint:sha-1"
+ const char kSdpMissingSpace[] =
+ "a=fingerprint:sha-1"
"4A:AD:B9:B1:3F:82:18:3B:54:02:12:DF:3E:5D:49:6B:19:E5:7C:AB";
// MD5 is not allowed in fingerprints.
- const char kSdpMd5[] = "a=fingerprint:md5 "
+ const char kSdpMd5[] =
+ "a=fingerprint:md5 "
"4A:AD:B9:B1:3F:82:18:3B:54:02:12:DF:3E:5D:49:6B";
// Broken session description
@@ -2960,8 +2925,7 @@
// bandwidth
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
- "b=AS:badvalue\r\n",
- "b=AS:badvalue");
+ "b=AS:badvalue\r\n", "b=AS:badvalue");
// rtcp-fb
ExpectParseFailureWithNewLines("a=mid:video_content_name\r\n",
"a=rtcp-fb:badvalue nack\r\n",
@@ -2981,8 +2945,8 @@
"s=-\r\n"
"t=0 0\r\n"
"m=audio 9 RTP/SAVPF 104 103\r\n" // Pl type 104 preferred.
- "a=rtpmap:111 opus/48000/2\r\n" // Pltype 111 listed before 103 and 104
- // in the map.
+ "a=rtpmap:111 opus/48000/2\r\n" // Pltype 111 listed before 103 and 104
+ // in the map.
"a=rtpmap:103 ISAC/16000\r\n" // Pltype 103 listed before 104 in the map.
"a=rtpmap:104 ISAC/32000\r\n";
@@ -3107,8 +3071,8 @@
// Deserialize
SdpParseError error;
- EXPECT_TRUE(webrtc::SdpDeserialize(kSdpWithFmtpString, &jdesc_output,
- &error));
+ EXPECT_TRUE(
+ webrtc::SdpDeserialize(kSdpWithFmtpString, &jdesc_output, &error));
const VideoContentDescription* vcd =
GetFirstVideoContentDescription(jdesc_output.description());
@@ -3133,8 +3097,7 @@
codecs[0].params["unknown-future-parameter"] = "SomeFutureValue";
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_fmtp = kSdpFullString;
@@ -3151,13 +3114,11 @@
codecs[0].params["stereo"] = "1";
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_fmtp = kSdpFullString;
- InjectAfter("a=rtpmap:111 opus/48000/2\r\n",
- "a=fmtp:111 stereo=1\r\n",
+ InjectAfter("a=rtpmap:111 opus/48000/2\r\n", "a=fmtp:111 stereo=1\r\n",
&sdp_with_fmtp);
EXPECT_EQ(sdp_with_fmtp, message);
}
@@ -3170,8 +3131,7 @@
codecs[0].params["maxptime"] = "120";
acd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_fmtp = kSdpFullString;
@@ -3189,14 +3149,12 @@
codecs[0].params["x-google-min-bitrate"] = "10";
vcd->set_codecs(codecs);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_fmtp = kSdpFullString;
InjectAfter("a=rtpmap:120 VP8/90000\r\n",
- "a=fmtp:120 x-google-min-bitrate=10\r\n",
- &sdp_with_fmtp);
+ "a=fmtp:120 x-google-min-bitrate=10\r\n", &sdp_with_fmtp);
EXPECT_EQ(sdp_with_fmtp, message);
}
@@ -3214,16 +3172,14 @@
EXPECT_EQ(cricket::ICEMODE_FULL, tinfo2->description.ice_mode);
// Add "a=ice-lite" and deserialize, making sure it's ICE lite.
- InjectAfter(kSessionTime,
- "a=ice-lite\r\n",
- &sdp_with_icelite);
+ InjectAfter(kSessionTime, "a=ice-lite\r\n", &sdp_with_icelite);
EXPECT_TRUE(SdpDeserialize(sdp_with_icelite, &jdesc_with_icelite));
desc = jdesc_with_icelite.description();
const cricket::TransportInfo* atinfo =
desc->GetTransportInfoByName("audio_content_name");
EXPECT_EQ(cricket::ICEMODE_LITE, atinfo->description.ice_mode);
const cricket::TransportInfo* vtinfo =
- desc->GetTransportInfoByName("video_content_name");
+ desc->GetTransportInfoByName("video_content_name");
EXPECT_EQ(cricket::ICEMODE_LITE, vtinfo->description.ice_mode);
// Now that we know deserialization works, we can use TestSerialize to test
@@ -3249,14 +3205,14 @@
EXPECT_EQ(cricket::CONNECTIONROLE_NONE,
audio_transport_info.description.connection_role);
audio_transport_info.description.connection_role =
- cricket::CONNECTIONROLE_ACTIVE;
+ cricket::CONNECTIONROLE_ACTIVE;
TransportInfo video_transport_info =
*(desc_.GetTransportInfoByName(kVideoContentName));
EXPECT_EQ(cricket::CONNECTIONROLE_NONE,
video_transport_info.description.connection_role);
video_transport_info.description.connection_role =
- cricket::CONNECTIONROLE_ACTIVE;
+ cricket::CONNECTIONROLE_ACTIVE;
desc_.RemoveTransportInfoByName(kAudioContentName);
desc_.RemoveTransportInfoByName(kVideoContentName);
@@ -3264,29 +3220,23 @@
desc_.AddTransportInfo(audio_transport_info);
desc_.AddTransportInfo(video_transport_info);
- ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(),
- jdesc_.session_id(),
+ ASSERT_TRUE(jdesc_.Initialize(desc_.Copy(), jdesc_.session_id(),
jdesc_.session_version()));
std::string message = webrtc::SdpSerialize(jdesc_);
std::string sdp_with_dtlssetup = kSdpFullString;
// Fingerprint attribute is necessary to add DTLS setup attribute.
- InjectAfter(kAttributeIcePwdVoice,
- kFingerprint, &sdp_with_dtlssetup);
- InjectAfter(kAttributeIcePwdVideo,
- kFingerprint, &sdp_with_dtlssetup);
+ InjectAfter(kAttributeIcePwdVoice, kFingerprint, &sdp_with_dtlssetup);
+ InjectAfter(kAttributeIcePwdVideo, kFingerprint, &sdp_with_dtlssetup);
// Now adding |setup| attribute.
- InjectAfter(kFingerprint,
- "a=setup:active\r\n", &sdp_with_dtlssetup);
+ InjectAfter(kFingerprint, "a=setup:active\r\n", &sdp_with_dtlssetup);
EXPECT_EQ(sdp_with_dtlssetup, message);
}
TEST_F(WebRtcSdpTest, DeserializeDtlsSetupAttribute) {
JsepSessionDescription jdesc_with_dtlssetup(kDummyType);
std::string sdp_with_dtlssetup = kSdpFullString;
- InjectAfter(kSessionTime,
- "a=setup:actpass\r\n",
- &sdp_with_dtlssetup);
+ InjectAfter(kSessionTime, "a=setup:actpass\r\n", &sdp_with_dtlssetup);
EXPECT_TRUE(SdpDeserialize(sdp_with_dtlssetup, &jdesc_with_dtlssetup));
cricket::SessionDescription* desc = jdesc_with_dtlssetup.description();
const cricket::TransportInfo* atinfo =
@@ -3294,7 +3244,7 @@
EXPECT_EQ(cricket::CONNECTIONROLE_ACTPASS,
atinfo->description.connection_role);
const cricket::TransportInfo* vtinfo =
- desc->GetTransportInfoByName("video_content_name");
+ desc->GetTransportInfoByName("video_content_name");
EXPECT_EQ(cricket::CONNECTIONROLE_ACTPASS,
vtinfo->description.connection_role);
}
@@ -3303,16 +3253,11 @@
// ContentInfo in SessionDescription, and vise versa for deserialization.
TEST_F(WebRtcSdpTest, MediaContentOrderMaintainedRoundTrip) {
JsepSessionDescription jdesc(kDummyType);
- const std::string media_content_sdps[3] = {
- kSdpAudioString,
- kSdpVideoString,
- kSdpSctpDataChannelString
- };
- const cricket::MediaType media_types[3] = {
- cricket::MEDIA_TYPE_AUDIO,
- cricket::MEDIA_TYPE_VIDEO,
- cricket::MEDIA_TYPE_DATA
- };
+ const std::string media_content_sdps[3] = {kSdpAudioString, kSdpVideoString,
+ kSdpSctpDataChannelString};
+ const cricket::MediaType media_types[3] = {cricket::MEDIA_TYPE_AUDIO,
+ cricket::MEDIA_TYPE_VIDEO,
+ cricket::MEDIA_TYPE_DATA};
// Verifies all 6 permutations.
for (size_t i = 0; i < 6; ++i) {
