Use webrtc name specifier instead of rtc/cricket in modules/congestion_controller WebRTC has unified all namespaces to webrtc, and the rtc:: and cricket:: name specifiers need to be replaced with webrtc::. This was generated using a combination of clang AST rewriting tools and sed. This CL was uploaded by git cl split. Bug: webrtc:42232595 Change-Id: I9ae554d18e5fd425ae61fec97b543fbd9abce9b9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/386701 Commit-Queue: Ying Wang <yinwa@webrtc.org> Auto-Submit: Evan Shrubsole <eshr@webrtc.org> Reviewed-by: Ying Wang <yinwa@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44378}
diff --git a/modules/congestion_controller/goog_cc/link_capacity_estimator.cc b/modules/congestion_controller/goog_cc/link_capacity_estimator.cc index 05664bc..5f3e523 100644 --- a/modules/congestion_controller/goog_cc/link_capacity_estimator.cc +++ b/modules/congestion_controller/goog_cc/link_capacity_estimator.cc
@@ -59,7 +59,7 @@ (1 - alpha) * deviation_kbps_ + alpha * error_kbps * error_kbps / norm; // 0.4 ~= 14 kbit/s at 500 kbit/s // 2.5f ~= 35 kbit/s at 500 kbit/s - deviation_kbps_ = rtc::SafeClamp(deviation_kbps_, 0.4f, 2.5f); + deviation_kbps_ = SafeClamp(deviation_kbps_, 0.4f, 2.5f); } bool LinkCapacityEstimator::has_estimate() const {
diff --git a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc index 2ef16df..2597859 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc +++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.cc
@@ -187,7 +187,7 @@ } void LossBasedBweV2::UpdateBandwidthEstimate( - rtc::ArrayView<const PacketResult> packet_results, + ArrayView<const PacketResult> packet_results, DataRate delay_based_estimate, bool in_alr) { delay_based_estimate_ = delay_based_estimate; @@ -1140,7 +1140,7 @@ } bool LossBasedBweV2::PushBackObservation( - rtc::ArrayView<const PacketResult> packet_results) { + ArrayView<const PacketResult> packet_results) { if (packet_results.empty()) { return false; }
diff --git a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h index a81e206..5102f46 100644 --- a/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h +++ b/modules/congestion_controller/goog_cc/loss_based_bwe_v2.h
@@ -72,10 +72,9 @@ void SetAcknowledgedBitrate(DataRate acknowledged_bitrate); void SetMinMaxBitrate(DataRate min_bitrate, DataRate max_bitrate); - void UpdateBandwidthEstimate( - rtc::ArrayView<const PacketResult> packet_results, - DataRate delay_based_estimate, - bool in_alr); + void UpdateBandwidthEstimate(ArrayView<const PacketResult> packet_results, + DataRate delay_based_estimate, + bool in_alr); bool PaceAtLossBasedEstimate() const; // For unit testing only. @@ -195,7 +194,7 @@ void NewtonsMethodUpdate(ChannelParameters& channel_parameters) const; // Returns false if no observation was created. - bool PushBackObservation(rtc::ArrayView<const PacketResult> packet_results); + bool PushBackObservation(ArrayView<const PacketResult> packet_results); bool IsEstimateIncreasingWhenLossLimited(DataRate old_estimate, DataRate new_estimate); bool IsInLossLimitedState() const;
diff --git a/modules/congestion_controller/receive_side_congestion_controller_unittest.cc b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc index b836c2e..0fb5914 100644 --- a/modules/congestion_controller/receive_side_congestion_controller_unittest.cc +++ b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc
@@ -95,7 +95,7 @@ void CheckRfc8888Feedback( const std::vector<std::unique_ptr<rtcp::RtcpPacket>>& rtcp_packets) { ASSERT_THAT(rtcp_packets, SizeIs(1)); - rtc::Buffer buffer = rtcp_packets[0]->Build(); + Buffer buffer = rtcp_packets[0]->Build(); rtcp::CommonHeader header; EXPECT_TRUE(header.Parse(buffer.data(), buffer.size())); // Check for RFC 8888 format message type 11(CCFB)
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.cc b/modules/congestion_controller/rtp/transport_feedback_adapter.cc index b26bb17..53a12f1 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter.cc +++ b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
@@ -141,7 +141,7 @@ } std::optional<SentPacket> TransportFeedbackAdapter::ProcessSentPacket( - const rtc::SentPacket& sent_packet) { + const SentPacketInfo& sent_packet) { auto send_time = Timestamp::Millis(sent_packet.send_time_ms); // TODO(srte): Only use one way to indicate that packet feedback is used. if (sent_packet.info.included_in_feedback || sent_packet.packet_id != -1) {
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.h b/modules/congestion_controller/rtp/transport_feedback_adapter.h index 55a3ced..7f6e942 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter.h +++ b/modules/congestion_controller/rtp/transport_feedback_adapter.h
@@ -75,7 +75,7 @@ Timestamp creation_time); std::optional<SentPacket> ProcessSentPacket( - const rtc::SentPacket& sent_packet); + const SentPacketInfo& sent_packet); std::optional<TransportPacketsFeedback> ProcessTransportFeedback( const rtcp::TransportFeedback& feedback,
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc index 62d6861..2ceceae 100644 --- a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc +++ b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
@@ -129,7 +129,7 @@ } rtcp::TransportFeedback BuildRtcpTransportFeedbackPacket( - rtc::ArrayView<const PacketTemplate> packets) { + ArrayView<const PacketTemplate> packets) { rtcp::TransportFeedback feedback; feedback.SetBase(packets[0].transport_sequence_number, packets[0].receive_timestamp); @@ -144,7 +144,7 @@ } rtcp::CongestionControlFeedback BuildRtcpCongestionControlFeedbackPacket( - rtc::ArrayView<const PacketTemplate> packets) { + ArrayView<const PacketTemplate> packets) { // Assume the feedback was sent when the last packet was received. Timestamp feedback_sent_time = Timestamp::MinusInfinity(); for (auto it = packets.crbegin(); it != packets.crend(); ++it) { @@ -184,7 +184,7 @@ bool UseRfc8888CongestionControlFeedback() const { return GetParam(); } std::optional<TransportPacketsFeedback> CreateAndProcessFeedback( - rtc::ArrayView<const PacketTemplate> packets, + ArrayView<const PacketTemplate> packets, TransportFeedbackAdapter& adapter) { if (UseRfc8888CongestionControlFeedback()) { rtcp::CongestionControlFeedback rtcp_feedback = @@ -216,8 +216,8 @@ for (const PacketTemplate& packet : packets) { adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } std::optional<TransportPacketsFeedback> adapted_feedback = @@ -234,8 +234,8 @@ for (const PacketTemplate& packet : sent_packets) { adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } // Note: Important to include the last packet per SSRC, as only unreceived @@ -268,8 +268,8 @@ for (const PacketTemplate& packet : sent_packets) { adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } std::vector<PacketTemplate> received_packets; @@ -300,8 +300,8 @@ adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); std::optional<TransportPacketsFeedback> adapted_feedback = CreateAndProcessFeedback(packets, adapter); @@ -331,8 +331,8 @@ for (const PacketTemplate& packet : packets) { adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } for (size_t i = 0; i < packets.size(); ++i) { @@ -342,7 +342,7 @@ if (UseRfc8888CongestionControlFeedback()) { rtcp::CongestionControlFeedback feedback = BuildRtcpCongestionControlFeedbackPacket(received_packets); - rtc::Buffer raw_packet = feedback.Build(); + Buffer raw_packet = feedback.Build(); rtcp::CommonHeader header; ASSERT_TRUE(header.Parse(raw_packet.data(), raw_packet.size())); rtcp::CongestionControlFeedback parsed_feedback; @@ -352,7 +352,7 @@ } else { rtcp::TransportFeedback feedback = BuildRtcpTransportFeedbackPacket(received_packets); - rtc::Buffer raw_packet = feedback.Build(); + Buffer raw_packet = feedback.Build(); std::unique_ptr<rtcp::TransportFeedback> parsed_feedback = rtcp::TransportFeedback::ParseFrom(raw_packet.data(), raw_packet.size()); @@ -384,8 +384,8 @@ for (const PacketTemplate& packet : packets) { adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } // Adapter keeps the packets ordered by sequence number (which is itself @@ -404,15 +404,15 @@ adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, 0u, TimeNow()); std::optional<SentPacket> sent_packet = adapter.ProcessSentPacket( - rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms(), PacketInfo())); + SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms(), PacketInfo())); EXPECT_TRUE(sent_packet.has_value()); // Call ProcessSentPacket() again with the same sequence number. This packet // has already been marked as sent and the call should be ignored. std::optional<SentPacket> duplicate_packet = adapter.ProcessSentPacket( - rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms(), PacketInfo())); + SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms(), PacketInfo())); EXPECT_FALSE(duplicate_packet.has_value()); } @@ -435,8 +435,8 @@ adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } std::optional<TransportPacketsFeedback> adapted_feedback_1 = @@ -467,7 +467,7 @@ adapter.AddPacket(CreatePacketToSend(packet_1), packet_1.pacing_info, /*overhead=*/0u, TimeNow()); std::optional<SentPacket> sent_packet_1 = - adapter.ProcessSentPacket(rtc::SentPacket( + adapter.ProcessSentPacket(SentPacketInfo( packet_1.transport_sequence_number, packet_1.send_timestamp.ms())); ASSERT_TRUE(sent_packet_1.has_value()); @@ -479,7 +479,7 @@ adapter.AddPacket(CreatePacketToSend(packet_2), packet_2.pacing_info, /*overhead=*/0u, TimeNow()); std::optional<SentPacket> sent_packet_2 = - adapter.ProcessSentPacket(rtc::SentPacket( + adapter.ProcessSentPacket(SentPacketInfo( packet_2.transport_sequence_number, packet_2.send_timestamp.ms())); ASSERT_TRUE(sent_packet_2.has_value()); @@ -516,14 +516,14 @@ adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } std::optional<TransportPacketsFeedback> adapted_feedback_1 = - CreateAndProcessFeedback(rtc::MakeArrayView(&packets[0], 1), adapter); + CreateAndProcessFeedback(MakeArrayView(&packets[0], 1), adapter); std::optional<TransportPacketsFeedback> adapted_feedback_2 = - CreateAndProcessFeedback(rtc::MakeArrayView(&packets[1], 1), adapter); + CreateAndProcessFeedback(MakeArrayView(&packets[1], 1), adapter); EXPECT_EQ(adapted_feedback_1->data_in_flight, packets[1].packet_size); EXPECT_EQ(adapted_feedback_2->data_in_flight, DataSize::Zero()); } @@ -552,8 +552,8 @@ adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } rtcp::CongestionControlFeedback rtcp_feedback = @@ -591,8 +591,8 @@ adapter.AddPacket(CreatePacketToSend(packet), packet.pacing_info, /*overhead=*/0u, TimeNow()); - adapter.ProcessSentPacket(rtc::SentPacket(packet.transport_sequence_number, - packet.send_timestamp.ms())); + adapter.ProcessSentPacket(SentPacketInfo(packet.transport_sequence_number, + packet.send_timestamp.ms())); } rtcp::CongestionControlFeedback rtcp_feedback =