From cd2b8ea4e28710c634d442c6c402319f68116af2 Mon Sep 17 00:00:00 2001 From: Boris Tsirkin Date: Tue, 7 Jan 2025 02:45:45 -0800 Subject: [PATCH] Format /call folder Formatting done via: git ls-files | grep -E '^call\/.*\.(h|cc)' | xargs clang-format -i No-Iwyu: Includes didn't change and it isn't related to formatting Bug: webrtc:42225392 Change-Id: I7fc8fd3f08e6fd680f2f6cfab309b5f9abbbb6b2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/373582 Reviewed-by: Harald Alvestrand Commit-Queue: Harald Alvestrand Reviewed-by: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#43675} --- call/call_config.cc | 3 +-- call/rtp_video_sender.cc | 2 +- call/rtp_video_sender_unittest.cc | 42 +++++++++++++++---------------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/call/call_config.cc b/call/call_config.cc index 6a8117603d..34615ecee2 100644 --- a/call/call_config.cc +++ b/call/call_config.cc @@ -18,8 +18,7 @@ namespace webrtc { CallConfig::CallConfig(const Environment& env, TaskQueueBase* network_task_queue) - : env(env), - network_task_queue_(network_task_queue) {} + : env(env), network_task_queue_(network_task_queue) {} RtpTransportConfig CallConfig::ExtractTransportConfig() const { RtpTransportConfig transport_config = {.env = env}; diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc index be56eac626..37cab225b7 100644 --- a/call/rtp_video_sender.cc +++ b/call/rtp_video_sender.cc @@ -948,7 +948,7 @@ int RtpVideoSender::ProtectionRequest(const FecProtectionParams* delta_params, void RtpVideoSender::SetRetransmissionMode(int retransmission_mode) { MutexLock lock(&mutex_); for (const RtpStreamSender& stream : rtp_streams_) { - stream.sender_video->SetRetransmissionSetting(retransmission_mode); + stream.sender_video->SetRetransmissionSetting(retransmission_mode); } } diff --git a/call/rtp_video_sender_unittest.cc b/call/rtp_video_sender_unittest.cc index b35b332fbf..26e36e6567 100644 --- a/call/rtp_video_sender_unittest.cc +++ b/call/rtp_video_sender_unittest.cc @@ -681,20 +681,20 @@ TEST(RtpVideoSenderTest, EarlyRetransmits) { // Inject a transport feedback where the packet for the first frame is lost, // expect a retransmission for it. EXPECT_CALL(test.transport(), SendRtp) - .WillOnce([&frame1_rtp_sequence_number]( - rtc::ArrayView packet, - const PacketOptions& options) { - RtpPacket rtp_packet; - EXPECT_TRUE(rtp_packet.Parse(packet)); - EXPECT_EQ(rtp_packet.Ssrc(), kRtxSsrc1); + .WillOnce( + [&frame1_rtp_sequence_number](rtc::ArrayView packet, + const PacketOptions& options) { + RtpPacket rtp_packet; + EXPECT_TRUE(rtp_packet.Parse(packet)); + EXPECT_EQ(rtp_packet.Ssrc(), kRtxSsrc1); - // Retransmitted sequence number from the RTX header should match - // the lost packet. - rtc::ArrayView payload = rtp_packet.payload(); - EXPECT_EQ(ByteReader::ReadBigEndian(payload.data()), - frame1_rtp_sequence_number); - return true; - }); + // Retransmitted sequence number from the RTX header should match + // the lost packet. + rtc::ArrayView payload = rtp_packet.payload(); + EXPECT_EQ(ByteReader::ReadBigEndian(payload.data()), + frame1_rtp_sequence_number); + return true; + }); StreamFeedbackObserver::StreamPacketInfo first_packet_feedback; first_packet_feedback.rtp_sequence_number = frame1_rtp_sequence_number; @@ -1516,18 +1516,18 @@ TEST(RtpVideoSenderTest, RetransmitsBaseLayerOnly) { CodecSpecificInfo key_codec_info; key_codec_info.codecType = kVideoCodecVP8; key_codec_info.codecSpecific.VP8.temporalIdx = 0; - EXPECT_EQ(EncodedImageCallback::Result::OK, - test.router()->OnEncodedImage( - encoded_image, &key_codec_info).error); + EXPECT_EQ( + EncodedImageCallback::Result::OK, + test.router()->OnEncodedImage(encoded_image, &key_codec_info).error); encoded_image.SetRtpTimestamp(2); encoded_image.capture_time_ms_ = 3; encoded_image._frameType = VideoFrameType::kVideoFrameDelta; CodecSpecificInfo delta_codec_info; delta_codec_info.codecType = kVideoCodecVP8; delta_codec_info.codecSpecific.VP8.temporalIdx = 1; - EXPECT_EQ(EncodedImageCallback::Result::OK, - test.router()->OnEncodedImage( - encoded_image, &delta_codec_info).error); + EXPECT_EQ( + EncodedImageCallback::Result::OK, + test.router()->OnEncodedImage(encoded_image, &delta_codec_info).error); test.AdvanceTime(TimeDelta::Millis(33)); @@ -1556,8 +1556,8 @@ TEST(RtpVideoSenderTest, RetransmitsBaseLayerOnly) { test.AdvanceTime(TimeDelta::Millis(33)); // Verify that only base layer packet was retransmitted. - std::vector base_rtp_sequence_numbers(rtp_sequence_numbers.begin(), - rtp_sequence_numbers.begin() + 1); + std::vector base_rtp_sequence_numbers( + rtp_sequence_numbers.begin(), rtp_sequence_numbers.begin() + 1); EXPECT_EQ(retransmitted_rtp_sequence_numbers, base_rtp_sequence_numbers); }