admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format /pc folder

Browse Source 
Formatting done via:

git ls-files | grep -E '^pc\/.*\.(h|cc|mm)' | xargs clang-format -i

No-Iwyu: Includes didn't change and it isn't related to formatting
Bug: webrtc:42225392
Change-Id: I3d04503bab53c12927bf408dc63b92cde545b4c8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/373900
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43689}
This commit is contained in:
Boris Tsirkin 2025-01-08 05:36:14 -08:00 committed by WebRTC LUCI CQ
parent 5654f891bb
commit 825379f4dc
9 changed files with 53 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc/channel_unittest.cc
View File

@ -95,7 +95,6 @@ const int kAudioPts[] = {0, 8};
const int kVideoPts[] = {97, 99};
enum class NetworkIsWorker { Yes, No };
template <class ChannelT,
class MediaSendChannelT,
class MediaReceiveChannelT,

1
pc/media_session_unittest.cc
View File

@ -3894,7 +3894,6 @@ TEST_F(MediaSessionDescriptionFactoryTest, TestOfferDtlsSavpfCreateAnswer) {
EXPECT_EQ(kMediaProtocolDtlsSavpf, answer_audio_desc->protocol());
}
// Test that we accept a DTLS offer without SDES and create an appropriate
// answer.
TEST_F(MediaSessionDescriptionFactoryTest, TestCryptoOfferDtlsButNotSdes) {

4
pc/peer_connection_factory_unittest.cc
View File

@ -120,7 +120,9 @@ class MockNetworkManager : public rtc::NetworkManager {
public:
MOCK_METHOD(void, StartUpdating, (), (override));
MOCK_METHOD(void, StopUpdating, (), (override));
MOCK_METHOD(std::vector<const rtc::Network*>, GetNetworks, (),
MOCK_METHOD(std::vector<const rtc::Network*>,
GetNetworks,
(),
(const, override));
MOCK_METHOD(std::vector<const rtc::Network*>,
GetAnyAddressNetworks,

24
pc/peer_connection_field_trial_tests.cc
View File

@ -118,10 +118,10 @@ TEST_F(PeerConnectionFieldTrialTest, EnableDependencyDescriptorAdvertised) {
const cricket::RtpHeaderExtensions& rtp_header_extensions1 =
media_description1->rtp_header_extensions();
bool found = absl::c_find_if(rtp_header_extensions1,
[](const RtpExtension& rtp_extension) {
return rtp_extension.uri ==
RtpExtension::kDependencyDescriptorUri;
bool found =
absl::c_find_if(
rtp_header_extensions1, [](const RtpExtension& rtp_extension) {
return rtp_extension.uri == RtpExtension::kDependencyDescriptorUri;
}) != rtp_header_extensions1.end();
EXPECT_TRUE(found);
}
@ -152,10 +152,10 @@ TEST_F(PeerConnectionFieldTrialTest, MAYBE_InjectDependencyDescriptor) {
cricket::RtpHeaderExtensions rtp_header_extensions1 =
media_description1->rtp_header_extensions();
bool found1 = absl::c_find_if(rtp_header_extensions1,
[](const RtpExtension& rtp_extension) {
return rtp_extension.uri ==
RtpExtension::kDependencyDescriptorUri;
bool found1 =
absl::c_find_if(
rtp_header_extensions1, [](const RtpExtension& rtp_extension) {
return rtp_extension.uri == RtpExtension::kDependencyDescriptorUri;
}) != rtp_header_extensions1.end();
EXPECT_FALSE(found1);
@ -196,10 +196,10 @@ TEST_F(PeerConnectionFieldTrialTest, MAYBE_InjectDependencyDescriptor) {
cricket::RtpHeaderExtensions rtp_header_extensions2 =
media_description2->rtp_header_extensions();
bool found2 = absl::c_find_if(rtp_header_extensions2,
[](const RtpExtension& rtp_extension) {
return rtp_extension.uri ==
RtpExtension::kDependencyDescriptorUri;
bool found2 =
absl::c_find_if(
rtp_header_extensions2, [](const RtpExtension& rtp_extension) {
return rtp_extension.uri == RtpExtension::kDependencyDescriptorUri;
}) != rtp_header_extensions2.end();
EXPECT_TRUE(found2);
}

60
pc/peer_connection_media_unittest.cc
View File

@ -1585,10 +1585,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan, SetCodecPreferencesAllAudioCodecs) {
// Normal case, set all capabilities as preferences
EXPECT_TRUE(audio_transceiver->SetCodecPreferences(sender_audio_codecs).ok());
auto offer = caller->CreateOffer();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(sender_audio_codecs, codecs));
}
@ -1607,10 +1605,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
// Normal case, reset codec preferences
EXPECT_TRUE(audio_transceiver->SetCodecPreferences(empty_codecs).ok());
auto offer = caller->CreateOffer();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(sender_audio_codecs, codecs));
}
@ -1678,10 +1674,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan, SetCodecPreferencesAllVideoCodecs) {
// Normal case, setting preferences to normal capabilities
EXPECT_TRUE(video_transceiver->SetCodecPreferences(sender_video_codecs).ok());
auto offer = caller->CreateOffer();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(sender_video_codecs, codecs));
}
@ -1701,10 +1695,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
// Normal case, resetting preferences with empty list of codecs
EXPECT_TRUE(video_transceiver->SetCodecPreferences(empty_codecs).ok());
auto offer = caller->CreateOffer();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(sender_video_codecs, codecs));
}
@ -1729,10 +1721,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
EXPECT_TRUE(video_transceiver->SetCodecPreferences(duplicate_codec).ok());
auto offer = caller->CreateOffer();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(single_codec, codecs));
}
@ -1773,10 +1763,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan, SetCodecPreferencesVideoWithRtx) {
EXPECT_TRUE(
video_transceiver->SetCodecPreferences(video_codecs_vpx_rtx).ok());
auto offer = caller->CreateOffer();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(video_codecs_vpx_rtx, codecs));
EXPECT_EQ(codecs.size(), 4u);
@ -1819,10 +1807,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
EXPECT_TRUE(send_transceiver->SetCodecPreferences(video_codecs_vpx).ok());
auto offer = caller->CreateOfferAndSetAsLocal();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_EQ(codecs.size(), 2u); // VP8, VP9
EXPECT_TRUE(CompareCodecs(video_codecs_vpx, codecs));
@ -1843,10 +1829,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
auto answer = callee->CreateAnswerAndSetAsLocal();
auto recv_codecs = answer->description()
->contents()[0]
.media_description()
->codecs();
auto recv_codecs =
answer->description()->contents()[0].media_description()->codecs();
EXPECT_EQ(recv_codecs.size(), 1u); // VP8
}
@ -1890,10 +1874,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
absl::c_reverse(video_codecs_vpx_reverse);
auto offer = caller->CreateOfferAndSetAsLocal();
auto codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
offer->description()->contents()[0].media_description()->codecs();
EXPECT_EQ(codecs.size(), 2u); // VP9, VP8
EXPECT_TRUE(CompareCodecs(video_codecs_vpx, codecs));
@ -1904,10 +1886,8 @@ TEST_F(PeerConnectionMediaTestUnifiedPlan,
auto answer = callee->CreateAnswerAndSetAsLocal();
auto recv_codecs = answer->description()
->contents()[0]
.media_description()
->codecs();
auto recv_codecs =
answer->description()->contents()[0].media_description()->codecs();
EXPECT_TRUE(CompareCodecs(video_codecs_vpx_reverse, recv_codecs));
}

24
pc/peer_connection_signaling_unittest.cc
View File

@ -1010,10 +1010,8 @@ TEST_P(PeerConnectionSignalingTest, ReceiveFlexFec) {
auto answer = caller->CreateAnswer();
ASSERT_EQ(answer->description()->contents().size(), 1u);
ASSERT_NE(answer->description()->contents()[0].media_description(), nullptr);
auto codecs = answer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
answer->description()->contents()[0].media_description()->codecs();
ASSERT_EQ(codecs.size(), 2u);
EXPECT_EQ(codecs[1].name, "flexfec-03");
@ -1063,10 +1061,8 @@ TEST_P(PeerConnectionSignalingTest, ReceiveFlexFecReoffer) {
auto answer = caller->CreateAnswer();
ASSERT_EQ(answer->description()->contents().size(), 1u);
ASSERT_NE(answer->description()->contents()[0].media_description(), nullptr);
auto codecs = answer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
answer->description()->contents()[0].media_description()->codecs();
ASSERT_EQ(codecs.size(), 2u);
EXPECT_EQ(codecs[1].name, "flexfec-03");
EXPECT_EQ(codecs[1].id, 35);
@ -1075,10 +1071,8 @@ TEST_P(PeerConnectionSignalingTest, ReceiveFlexFecReoffer) {
// This generates a collision for AV1 which needs to be remapped.
auto offer = caller->CreateOffer(RTCOfferAnswerOptions());
auto offer_codecs = offer->description()
->contents()[0]
.media_description()
->codecs();
auto offer_codecs =
offer->description()->contents()[0].media_description()->codecs();
auto flexfec_it = std::find_if(
offer_codecs.begin(), offer_codecs.end(),
[](const cricket::Codec& codec) { return codec.name == "flexfec-03"; });
@ -1373,10 +1367,8 @@ TEST_F(PeerConnectionSignalingUnifiedPlanTest, RtxReofferApt) {
callee->pc()->GetTransceivers()[0]->StopStandard();
auto reoffer = callee->CreateOffer(RTCOfferAnswerOptions());
auto codecs = reoffer->description()
->contents()[0]
.media_description()
->codecs();
auto codecs =
reoffer->description()->contents()[0].media_description()->codecs();
ASSERT_GT(codecs.size(), 2u);
EXPECT_EQ(codecs[0].name, "VP8");
EXPECT_EQ(codecs[1].name, "rtx");

3
pc/rtp_transceiver.cc
View File

@ -99,8 +99,7 @@ RTCError VerifyCodecPreferences(
if (!is_recv_codec) {
LOG_AND_RETURN_ERROR(
RTCErrorType::INVALID_MODIFICATION,
std::string(
"Invalid codec preferences: invalid codec with name \"") +
std::string("Invalid codec preferences: invalid codec with name \"") +
codec_preference.name + "\".");
}
}

3
pc/srtp_session.cc
View File

@ -548,8 +548,7 @@ void SrtpSession::DumpPacket(const void* buf, int len, bool outbound) {
<< std::setw(2) << hours << ":" << std::setfill('0')
<< std::setw(2) << minutes << ":" << std::setfill('0')
<< std::setw(2) << seconds << "." << std::setfill('0')
<< std::setw(3) << millis << " "
<< "000000 "
<< std::setw(3) << millis << " " << "000000 "
<< rtc::hex_encode_with_delimiter(
absl::string_view((const char*)buf, len), ' ')
<< " # RTP_DUMP";