Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(192)

Unified Diff: webrtc/modules/congestion_controller/congestion_controller_unittest.cc

Issue 2827333005: Moving overhead counting to bitrate estimators.
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/congestion_controller/congestion_controller_unittest.cc
diff --git a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
index 3f140684f07a5b6876556ab126a1076e9d16015a..2a66d6dc69977a9aa1fda3ce0c65441d9ed2f86d 100644
--- a/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
+++ b/webrtc/modules/congestion_controller/congestion_controller_unittest.cc
@@ -49,7 +49,9 @@ class MockPacketRouter : public PacketRouter {
uint32_t bitrate));
};
-const uint32_t kInitialBitrateBps = 60000;
+constexpr uint32_t kInitialBitrateBps = 60000;
+constexpr size_t kRtpHeadersSize = 12;
+constexpr size_t kTransportHeadersSize = 20;
} // namespace
@@ -90,9 +92,9 @@ class CongestionControllerTest : public ::testing::Test {
void OnSentPacket(const PacketFeedback& packet_feedback) {
constexpr uint32_t ssrc = 0;
- controller_->AddPacket(ssrc, packet_feedback.sequence_number,
- packet_feedback.payload_size,
- packet_feedback.pacing_info);
+ controller_->AddPacket(
+ ssrc, packet_feedback.sequence_number, packet_feedback.payload_size,
+ packet_feedback.rtp_headers_size, packet_feedback.pacing_info);
controller_->OnSentPacket(rtc::SentPacket(packet_feedback.sequence_number,
packet_feedback.send_time_ms));
}
@@ -124,6 +126,7 @@ class CongestionControllerTest : public ::testing::Test {
constexpr size_t kPayloadSize = 1000;
PacketFeedback packet(clock_.TimeInMilliseconds() + delay_buildup,
clock_.TimeInMilliseconds(), *seq_num, kPayloadSize,
+ kRtpHeadersSize, kTransportHeadersSize,
PacedPacketInfo());
delay_buildup += delay; // Delay has to increase, or it's just RTT.
OnSentPacket(packet);
@@ -253,11 +256,16 @@ TEST_F(CongestionControllerTest, OldFeedback) {
// Send a few packets on the first network route.
std::vector<PacketFeedback> packets;
- packets.push_back(PacketFeedback(0, 0, 0, 1500, kPacingInfo0));
- packets.push_back(PacketFeedback(10, 10, 1, 1500, kPacingInfo0));
- packets.push_back(PacketFeedback(20, 20, 2, 1500, kPacingInfo0));
- packets.push_back(PacketFeedback(30, 30, 3, 1500, kPacingInfo1));
- packets.push_back(PacketFeedback(40, 40, 4, 1500, kPacingInfo1));
+ packets.push_back(PacketFeedback(0, 0, 0, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo0));
+ packets.push_back(PacketFeedback(10, 10, 1, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo0));
+ packets.push_back(PacketFeedback(20, 20, 2, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo0));
+ packets.push_back(PacketFeedback(30, 30, 3, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo1));
+ packets.push_back(PacketFeedback(40, 40, 4, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo1));
for (const PacketFeedback& packet : packets)
OnSentPacket(packet);
@@ -390,16 +398,21 @@ TEST_F(CongestionControllerTest, LongFeedbackDelays) {
const int kMaxConsecutiveFailedLookups = 5;
for (int i = 0; i < kMaxConsecutiveFailedLookups; ++i) {
std::vector<PacketFeedback> packets;
- packets.push_back(
- PacketFeedback(i * 100, 2 * i * 100, 0, 1500, kPacingInfo0));
- packets.push_back(
- PacketFeedback(i * 100 + 10, 2 * i * 100 + 10, 1, 1500, kPacingInfo0));
- packets.push_back(
- PacketFeedback(i * 100 + 20, 2 * i * 100 + 20, 2, 1500, kPacingInfo0));
- packets.push_back(
- PacketFeedback(i * 100 + 30, 2 * i * 100 + 30, 3, 1500, kPacingInfo1));
- packets.push_back(
- PacketFeedback(i * 100 + 40, 2 * i * 100 + 40, 4, 1500, kPacingInfo1));
+ packets.push_back(PacketFeedback(i * 100, 2 * i * 100, 0, 1500,
+ kRtpHeadersSize, kTransportHeadersSize,
+ kPacingInfo0));
+ packets.push_back(PacketFeedback(i * 100 + 10, 2 * i * 100 + 10, 1, 1500,
+ kRtpHeadersSize, kTransportHeadersSize,
+ kPacingInfo0));
+ packets.push_back(PacketFeedback(i * 100 + 20, 2 * i * 100 + 20, 2, 1500,
+ kRtpHeadersSize, kTransportHeadersSize,
+ kPacingInfo0));
+ packets.push_back(PacketFeedback(i * 100 + 30, 2 * i * 100 + 30, 3, 1500,
+ kRtpHeadersSize, kTransportHeadersSize,
+ kPacingInfo1));
+ packets.push_back(PacketFeedback(i * 100 + 40, 2 * i * 100 + 40, 4, 1500,
+ kRtpHeadersSize, kTransportHeadersSize,
+ kPacingInfo1));
for (const PacketFeedback& packet : packets)
OnSentPacket(packet);
@@ -416,9 +429,9 @@ TEST_F(CongestionControllerTest, LongFeedbackDelays) {
feedback.Build();
clock_.AdvanceTimeMilliseconds(kFeedbackTimeoutMs);
- PacketFeedback later_packet(kFeedbackTimeoutMs + i * 100 + 40,
- kFeedbackTimeoutMs + i * 200 + 40, 5, 1500,
- kPacingInfo1);
+ PacketFeedback later_packet(
+ kFeedbackTimeoutMs + i * 100 + 40, kFeedbackTimeoutMs + i * 200 + 40, 5,
+ 1500, kRtpHeadersSize, kTransportHeadersSize, kPacingInfo1);
OnSentPacket(later_packet);
controller_->OnTransportFeedback(feedback);
@@ -440,11 +453,16 @@ TEST_F(CongestionControllerTest, LongFeedbackDelays) {
// Test with feedback that isn't late enough to time out.
{
std::vector<PacketFeedback> packets;
- packets.push_back(PacketFeedback(100, 200, 0, 1500, kPacingInfo0));
- packets.push_back(PacketFeedback(110, 210, 1, 1500, kPacingInfo0));
- packets.push_back(PacketFeedback(120, 220, 2, 1500, kPacingInfo0));
- packets.push_back(PacketFeedback(130, 230, 3, 1500, kPacingInfo1));
- packets.push_back(PacketFeedback(140, 240, 4, 1500, kPacingInfo1));
+ packets.push_back(PacketFeedback(100, 200, 0, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo0));
+ packets.push_back(PacketFeedback(110, 210, 1, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo0));
+ packets.push_back(PacketFeedback(120, 220, 2, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo0));
+ packets.push_back(PacketFeedback(130, 230, 3, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo1));
+ packets.push_back(PacketFeedback(140, 240, 4, 1500, kRtpHeadersSize,
+ kTransportHeadersSize, kPacingInfo1));
for (const PacketFeedback& packet : packets)
OnSentPacket(packet);
@@ -461,9 +479,9 @@ TEST_F(CongestionControllerTest, LongFeedbackDelays) {
feedback.Build();
clock_.AdvanceTimeMilliseconds(kFeedbackTimeoutMs - 1);
- PacketFeedback later_packet(kFeedbackTimeoutMs + 140,
- kFeedbackTimeoutMs + 240, 5, 1500,
- kPacingInfo1);
+ PacketFeedback later_packet(
+ kFeedbackTimeoutMs + 140, kFeedbackTimeoutMs + 240, 5, 1500,
+ kRtpHeadersSize, kTransportHeadersSize, kPacingInfo1);
OnSentPacket(later_packet);
controller_->OnTransportFeedback(feedback);

Powered by Google App Engine
This is Rietveld 408576698