Fix lint issues in congestion_controller.
Bug: None
Change-Id: I178c26044d5d678259181a9290c621bf64d3d7a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/361361
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42935}
diff --git a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
index 81fb4fb..cc6e4a0 100644
--- a/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
+++ b/modules/congestion_controller/goog_cc/acknowledged_bitrate_estimator_unittest.cc
@@ -26,9 +26,7 @@
#include "test/gmock.h"
#include "test/gtest.h"
-using ::testing::_;
using ::testing::InSequence;
-using ::testing::NiceMock;
using ::testing::Return;
namespace webrtc {
diff --git a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc
index 5f17883..ec0f813 100644
--- a/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc
+++ b/modules/congestion_controller/goog_cc/congestion_window_pushback_controller_unittest.cc
@@ -20,8 +20,6 @@
namespace webrtc {
namespace test {
-using ::testing::_;
-
TEST(CongestionWindowPushbackControllerTest, FullCongestionWindow) {
CongestionWindowPushbackController cwnd_controller(
ExplicitKeyValueConfig(""));
diff --git a/modules/congestion_controller/goog_cc/trendline_estimator.h b/modules/congestion_controller/goog_cc/trendline_estimator.h
index 5636c08..70336ea 100644
--- a/modules/congestion_controller/goog_cc/trendline_estimator.h
+++ b/modules/congestion_controller/goog_cc/trendline_estimator.h
@@ -91,7 +91,7 @@
friend class GoogCcStatePrinter;
void Detect(double trend, double ts_delta, int64_t now_ms);
- void UpdateThreshold(double modified_offset, int64_t now_ms);
+ void UpdateThreshold(double modified_trend, int64_t now_ms);
// Parameters.
TrendlineEstimatorSettings settings_;
diff --git a/modules/congestion_controller/receive_side_congestion_controller.cc b/modules/congestion_controller/receive_side_congestion_controller.cc
index 591dba3..abf4fac 100644
--- a/modules/congestion_controller/receive_side_congestion_controller.cc
+++ b/modules/congestion_controller/receive_side_congestion_controller.cc
@@ -10,7 +10,9 @@
#include "modules/congestion_controller/include/receive_side_congestion_controller.h"
+#include <algorithm>
#include <memory>
+#include <utility>
#include "absl/base/nullability.h"
#include "api/environment/environment.h"
diff --git a/modules/congestion_controller/receive_side_congestion_controller_unittest.cc b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc
index 8681560..50141ce 100644
--- a/modules/congestion_controller/receive_side_congestion_controller_unittest.cc
+++ b/modules/congestion_controller/receive_side_congestion_controller_unittest.cc
@@ -10,6 +10,9 @@
#include "modules/congestion_controller/include/receive_side_congestion_controller.h"
+#include <memory>
+#include <vector>
+
#include "api/environment/environment_factory.h"
#include "api/media_types.h"
#include "api/test/network_emulation/create_cross_traffic.h"
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter.cc b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
index 2f5e6a7..4b7ec5a 100644
--- a/modules/congestion_controller/rtp/transport_feedback_adapter.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_adapter.cc
@@ -15,6 +15,7 @@
#include <algorithm>
#include <cmath>
#include <utility>
+#include <vector>
#include "absl/algorithm/container.h"
#include "api/units/timestamp.h"
diff --git a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
index c6a6b6d..82d93ed 100644
--- a/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_adapter_unittest.cc
@@ -23,9 +23,6 @@
#include "test/gmock.h"
#include "test/gtest.h"
-using ::testing::_;
-using ::testing::Invoke;
-
namespace webrtc {
namespace {
@@ -248,8 +245,9 @@
std::vector<PacketResult> expected_packets;
expected_packets.push_back(packets[i]);
- auto res = adapter_->ProcessTransportFeedback(*feedback.get(),
- clock_.CurrentTime());
+ ASSERT_TRUE(feedback.get() != nullptr);
+ auto res =
+ adapter_->ProcessTransportFeedback(*feedback, clock_.CurrentTime());
ComparePacketFeedbackVectors(expected_packets, res->packet_feedbacks);
}
}
@@ -348,9 +346,9 @@
std::vector<PacketResult> received_feedback;
- EXPECT_TRUE(feedback.get() != nullptr);
+ ASSERT_TRUE(feedback.get() != nullptr);
auto res =
- adapter_->ProcessTransportFeedback(*feedback.get(), clock_.CurrentTime());
+ adapter_->ProcessTransportFeedback(*feedback, clock_.CurrentTime());
ComparePacketFeedbackVectors(sent_packets, res->packet_feedbacks);
// Create a new feedback message and add the trailing item.
@@ -364,10 +362,10 @@
feedback =
rtcp::TransportFeedback::ParseFrom(raw_packet.data(), raw_packet.size());
- EXPECT_TRUE(feedback.get() != nullptr);
+ ASSERT_TRUE(feedback.get() != nullptr);
{
- auto res = adapter_->ProcessTransportFeedback(*feedback.get(),
- clock_.CurrentTime());
+ auto res =
+ adapter_->ProcessTransportFeedback(*feedback, clock_.CurrentTime());
std::vector<PacketResult> expected_packets;
expected_packets.push_back(packet_feedback);
ComparePacketFeedbackVectors(expected_packets, res->packet_feedbacks);
diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc
index 5a6a2e1..140c83c 100644
--- a/modules/congestion_controller/rtp/transport_feedback_demuxer.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_demuxer.cc
@@ -9,6 +9,9 @@
*/
#include "modules/congestion_controller/rtp/transport_feedback_demuxer.h"
+#include <utility>
+#include <vector>
+
#include "absl/algorithm/container.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
diff --git a/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc b/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc
index 52d8018..5aa4ffc 100644
--- a/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc
+++ b/modules/congestion_controller/rtp/transport_feedback_demuxer_unittest.cc
@@ -53,12 +53,13 @@
const uint16_t kRtpStartSeq = 55;
const int64_t kTransportStartSeq = 1;
demuxer.AddPacket(CreatePacket(kSsrc, kRtpStartSeq, kTransportStartSeq,
- /*is_retransmit=*/false));
+ /*is_retransmission=*/false));
demuxer.AddPacket(CreatePacket(kSsrc, kRtpStartSeq + 1,
kTransportStartSeq + 1,
- /*is_retransmit=*/false));
- demuxer.AddPacket(CreatePacket(
- kSsrc, kRtpStartSeq + 2, kTransportStartSeq + 2, /*is_retransmit=*/true));
+ /*is_retransmission=*/false));
+ demuxer.AddPacket(CreatePacket(kSsrc, kRtpStartSeq + 2,
+ kTransportStartSeq + 2,
+ /*is_retransmission=*/true));
rtcp::TransportFeedback feedback;
feedback.SetBase(kTransportStartSeq, Timestamp::Millis(1));
