From 825379f4dcea2819117f76e05914d2e4315b57da Mon Sep 17 00:00:00 2001 From: Boris Tsirkin Date: Wed, 8 Jan 2025 05:36:14 -0800 Subject: [PATCH] Format /pc folder 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 Reviewed-by: Harald Alvestrand Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/main@{#43689} --- pc/channel_unittest.cc | 1 - pc/media_session_unittest.cc | 1 - pc/peer_connection.cc | 4 +- pc/peer_connection_factory_unittest.cc | 4 +- pc/peer_connection_field_trial_tests.cc | 30 ++++++------ pc/peer_connection_media_unittest.cc | 60 ++++++++---------------- pc/peer_connection_signaling_unittest.cc | 24 ++++------ pc/rtp_transceiver.cc | 9 ++-- pc/srtp_session.cc | 3 +- 9 files changed, 53 insertions(+), 83 deletions(-) diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc index ac01f5ca5a..e20965f65a 100644 --- a/pc/channel_unittest.cc +++ b/pc/channel_unittest.cc @@ -95,7 +95,6 @@ const int kAudioPts[] = {0, 8}; const int kVideoPts[] = {97, 99}; enum class NetworkIsWorker { Yes, No }; - template protocol()); } - // Test that we accept a DTLS offer without SDES and create an appropriate // answer. TEST_F(MediaSessionDescriptionFactoryTest, TestCryptoOfferDtlsButNotSdes) { diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc index 00a6df25fa..3bbeecf4a0 100644 --- a/pc/peer_connection.cc +++ b/pc/peer_connection.cc @@ -613,8 +613,8 @@ RTCErrorOr> PeerConnection::Create( bool dtls_enabled = DtlsEnabled(configuration, options, dependencies); if (!dependencies.async_dns_resolver_factory) { - dependencies.async_dns_resolver_factory = - std::make_unique(); + dependencies.async_dns_resolver_factory = + std::make_unique(); } // The PeerConnection constructor consumes some, but not all, dependencies. diff --git a/pc/peer_connection_factory_unittest.cc b/pc/peer_connection_factory_unittest.cc index 0a32a36de4..9cdc469e9c 100644 --- a/pc/peer_connection_factory_unittest.cc +++ b/pc/peer_connection_factory_unittest.cc @@ -120,7 +120,9 @@ class MockNetworkManager : public rtc::NetworkManager { public: MOCK_METHOD(void, StartUpdating, (), (override)); MOCK_METHOD(void, StopUpdating, (), (override)); - MOCK_METHOD(std::vector, GetNetworks, (), + MOCK_METHOD(std::vector, + GetNetworks, + (), (const, override)); MOCK_METHOD(std::vector, GetAnyAddressNetworks, diff --git a/pc/peer_connection_field_trial_tests.cc b/pc/peer_connection_field_trial_tests.cc index 410aabeda6..e6aa9a9133 100644 --- a/pc/peer_connection_field_trial_tests.cc +++ b/pc/peer_connection_field_trial_tests.cc @@ -118,11 +118,11 @@ 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; - }) != rtp_header_extensions1.end(); + 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,11 +152,11 @@ 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; - }) != rtp_header_extensions1.end(); + 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); std::set existing_ids; @@ -196,11 +196,11 @@ 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; - }) != rtp_header_extensions2.end(); + 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); } diff --git a/pc/peer_connection_media_unittest.cc b/pc/peer_connection_media_unittest.cc index bc129fdb77..7e44cd54f1 100644 --- a/pc/peer_connection_media_unittest.cc +++ b/pc/peer_connection_media_unittest.cc @@ -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)); } diff --git a/pc/peer_connection_signaling_unittest.cc b/pc/peer_connection_signaling_unittest.cc index 7c76ea0869..c8ff14b16d 100644 --- a/pc/peer_connection_signaling_unittest.cc +++ b/pc/peer_connection_signaling_unittest.cc @@ -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"); diff --git a/pc/rtp_transceiver.cc b/pc/rtp_transceiver.cc index d696c6494b..6f4b5ae20c 100644 --- a/pc/rtp_transceiver.cc +++ b/pc/rtp_transceiver.cc @@ -97,11 +97,10 @@ RTCError VerifyCodecPreferences( return codec.MatchesRtpCodec(codec_preference); }); if (!is_recv_codec) { - LOG_AND_RETURN_ERROR( - RTCErrorType::INVALID_MODIFICATION, - std::string( - "Invalid codec preferences: invalid codec with name \"") + - codec_preference.name + "\"."); + LOG_AND_RETURN_ERROR( + RTCErrorType::INVALID_MODIFICATION, + std::string("Invalid codec preferences: invalid codec with name \"") + + codec_preference.name + "\"."); } } diff --git a/pc/srtp_session.cc b/pc/srtp_session.cc index bf27e63d39..d2dba03c40 100644 --- a/pc/srtp_session.cc +++ b/pc/srtp_session.cc @@ -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";