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}
This commit is contained in:
parent
f8cb8b7854
commit
0c2cd6264f
@ -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 {
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
namespace webrtc {
|
||||
namespace test {
|
||||
|
||||
using ::testing::_;
|
||||
|
||||
TEST(CongestionWindowPushbackControllerTest, FullCongestionWindow) {
|
||||
CongestionWindowPushbackController cwnd_controller(
|
||||
ExplicitKeyValueConfig(""));
|
||||
|
||||
@ -91,7 +91,7 @@ class TrendlineEstimator : public DelayIncreaseDetectorInterface {
|
||||
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_;
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "absl/algorithm/container.h"
|
||||
#include "api/units/timestamp.h"
|
||||
|
||||
@ -23,9 +23,6 @@
|
||||
#include "test/gmock.h"
|
||||
#include "test/gtest.h"
|
||||
|
||||
using ::testing::_;
|
||||
using ::testing::Invoke;
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
namespace {
|
||||
@ -248,8 +245,9 @@ TEST_F(TransportFeedbackAdapterTest, SendTimeWrapsBothWays) {
|
||||
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 @@ TEST_F(TransportFeedbackAdapterTest, TimestampDeltas) {
|
||||
|
||||
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 @@ TEST_F(TransportFeedbackAdapterTest, TimestampDeltas) {
|
||||
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);
|
||||
|
||||
@ -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"
|
||||
|
||||
|
||||
@ -53,12 +53,13 @@ TEST(TransportFeedbackDemuxerTest, ObserverSanity) {
|
||||
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));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user