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

Format /call folder

Browse Source 
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 <hta@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43675}
This commit is contained in:
Boris Tsirkin 2025-01-07 02:45:45 -08:00 committed by WebRTC LUCI CQ
parent 3905b25018
commit cd2b8ea4e2
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
call/call_config.cc
View File

@ -18,8 +18,7 @@ namespace webrtc {
CallConfig::CallConfig(const Environment& env, CallConfig::CallConfig(const Environment& env,
TaskQueueBase* network_task_queue) TaskQueueBase* network_task_queue)
: env(env), : env(env), network_task_queue_(network_task_queue) {}
network_task_queue_(network_task_queue) {}
RtpTransportConfig CallConfig::ExtractTransportConfig() const { RtpTransportConfig CallConfig::ExtractTransportConfig() const {
RtpTransportConfig transport_config = {.env = env}; RtpTransportConfig transport_config = {.env = env};

2
call/rtp_video_sender.cc
View File

@ -948,7 +948,7 @@ int RtpVideoSender::ProtectionRequest(const FecProtectionParams* delta_params,
void RtpVideoSender::SetRetransmissionMode(int retransmission_mode) { void RtpVideoSender::SetRetransmissionMode(int retransmission_mode) {
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
for (const RtpStreamSender& stream : rtp_streams_) { for (const RtpStreamSender& stream : rtp_streams_) {
stream.sender_video->SetRetransmissionSetting(retransmission_mode); stream.sender_video->SetRetransmissionSetting(retransmission_mode);
} }
} }

42
call/rtp_video_sender_unittest.cc
View File

@ -681,20 +681,20 @@ TEST(RtpVideoSenderTest, EarlyRetransmits) {
// Inject a transport feedback where the packet for the first frame is lost, // Inject a transport feedback where the packet for the first frame is lost,
// expect a retransmission for it. // expect a retransmission for it.
EXPECT_CALL(test.transport(), SendRtp) EXPECT_CALL(test.transport(), SendRtp)
.WillOnce([&frame1_rtp_sequence_number]( .WillOnce(
rtc::ArrayView<const uint8_t> packet, [&frame1_rtp_sequence_number](rtc::ArrayView<const uint8_t> packet,
const PacketOptions& options) { const PacketOptions& options) {
RtpPacket rtp_packet; RtpPacket rtp_packet;
EXPECT_TRUE(rtp_packet.Parse(packet)); EXPECT_TRUE(rtp_packet.Parse(packet));
EXPECT_EQ(rtp_packet.Ssrc(), kRtxSsrc1); EXPECT_EQ(rtp_packet.Ssrc(), kRtxSsrc1);
// Retransmitted sequence number from the RTX header should match // Retransmitted sequence number from the RTX header should match
// the lost packet. // the lost packet.
rtc::ArrayView<const uint8_t> payload = rtp_packet.payload(); rtc::ArrayView<const uint8_t> payload = rtp_packet.payload();
EXPECT_EQ(ByteReader<uint16_t>::ReadBigEndian(payload.data()), EXPECT_EQ(ByteReader<uint16_t>::ReadBigEndian(payload.data()),
frame1_rtp_sequence_number); frame1_rtp_sequence_number);
return true; return true;
}); });
StreamFeedbackObserver::StreamPacketInfo first_packet_feedback; StreamFeedbackObserver::StreamPacketInfo first_packet_feedback;
first_packet_feedback.rtp_sequence_number = frame1_rtp_sequence_number; first_packet_feedback.rtp_sequence_number = frame1_rtp_sequence_number;
@ -1516,18 +1516,18 @@ TEST(RtpVideoSenderTest, RetransmitsBaseLayerOnly) {
CodecSpecificInfo key_codec_info; CodecSpecificInfo key_codec_info;
key_codec_info.codecType = kVideoCodecVP8; key_codec_info.codecType = kVideoCodecVP8;
key_codec_info.codecSpecific.VP8.temporalIdx = 0; key_codec_info.codecSpecific.VP8.temporalIdx = 0;
EXPECT_EQ(EncodedImageCallback::Result::OK, EXPECT_EQ(
test.router()->OnEncodedImage( EncodedImageCallback::Result::OK,
encoded_image, &key_codec_info).error); test.router()->OnEncodedImage(encoded_image, &key_codec_info).error);
encoded_image.SetRtpTimestamp(2); encoded_image.SetRtpTimestamp(2);
encoded_image.capture_time_ms_ = 3; encoded_image.capture_time_ms_ = 3;
encoded_image._frameType = VideoFrameType::kVideoFrameDelta; encoded_image._frameType = VideoFrameType::kVideoFrameDelta;
CodecSpecificInfo delta_codec_info; CodecSpecificInfo delta_codec_info;
delta_codec_info.codecType = kVideoCodecVP8; delta_codec_info.codecType = kVideoCodecVP8;
delta_codec_info.codecSpecific.VP8.temporalIdx = 1; delta_codec_info.codecSpecific.VP8.temporalIdx = 1;
EXPECT_EQ(EncodedImageCallback::Result::OK, EXPECT_EQ(
test.router()->OnEncodedImage( EncodedImageCallback::Result::OK,
encoded_image, &delta_codec_info).error); test.router()->OnEncodedImage(encoded_image, &delta_codec_info).error);
test.AdvanceTime(TimeDelta::Millis(33)); test.AdvanceTime(TimeDelta::Millis(33));
@ -1556,8 +1556,8 @@ TEST(RtpVideoSenderTest, RetransmitsBaseLayerOnly) {
test.AdvanceTime(TimeDelta::Millis(33)); test.AdvanceTime(TimeDelta::Millis(33));
// Verify that only base layer packet was retransmitted. // Verify that only base layer packet was retransmitted.
std::vector<uint16_t> base_rtp_sequence_numbers(rtp_sequence_numbers.begin(), std::vector<uint16_t> base_rtp_sequence_numbers(
rtp_sequence_numbers.begin() + 1); rtp_sequence_numbers.begin(), rtp_sequence_numbers.begin() + 1);
EXPECT_EQ(retransmitted_rtp_sequence_numbers, base_rtp_sequence_numbers); EXPECT_EQ(retransmitted_rtp_sequence_numbers, base_rtp_sequence_numbers);
} }