Index: webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc |
index c3c047c6d16aa6c6f642b79404805c629f770635..4a302c4330b26034de33ce2f202f3e1fa97a79ec 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/send_time_history_unittest.cc |
@@ -17,11 +17,17 @@ |
#include "webrtc/system_wrappers/include/clock.h" |
#include "webrtc/test/gtest.h" |
+namespace { |
+ |
+constexpr int kDefaultHistoryLengthMs = 1000; |
+constexpr size_t kRtpHeadersSize = 12; |
+constexpr size_t kTransportHeadersSize = 20; |
+ |
+} // namespace |
+ |
namespace webrtc { |
namespace test { |
-static const int kDefaultHistoryLengthMs = 1000; |
- |
class SendTimeHistoryTest : public ::testing::Test { |
protected: |
SendTimeHistoryTest() |
@@ -33,10 +39,11 @@ class SendTimeHistoryTest : public ::testing::Test { |
virtual void TearDown() {} |
void AddPacketWithSendTime(uint16_t sequence_number, |
- size_t length, |
+ size_t payload_size, |
int64_t send_time_ms, |
const PacedPacketInfo& pacing_info) { |
- PacketFeedback packet(clock_.TimeInMilliseconds(), sequence_number, length, |
+ PacketFeedback packet(clock_.TimeInMilliseconds(), sequence_number, |
+ payload_size, kRtpHeadersSize, kTransportHeadersSize, |
0, 0, pacing_info); |
history_.AddAndRemoveOld(packet); |
history_.OnSentPacket(sequence_number, send_time_ms); |
@@ -51,8 +58,8 @@ TEST_F(SendTimeHistoryTest, SaveAndRestoreNetworkId) { |
uint16_t sequence_number = 0; |
int64_t now_ms = clock_.TimeInMilliseconds(); |
for (int i = 1; i < 5; ++i) { |
- PacketFeedback packet(now_ms, sequence_number, 1000, i, i - 1, |
- kPacingInfo); |
+ PacketFeedback packet(now_ms, sequence_number, 1000, kRtpHeadersSize, |
+ kTransportHeadersSize, i, i - 1, kPacingInfo); |
history_.AddAndRemoveOld(packet); |
history_.OnSentPacket(sequence_number, now_ms); |
PacketFeedback restored(now_ms, sequence_number); |
@@ -66,18 +73,22 @@ TEST_F(SendTimeHistoryTest, AddRemoveOne) { |
const uint16_t kSeqNo = 10; |
// TODO(philipel): Fix PacedPacketInfo constructor? |
const PacedPacketInfo kPacingInfo(0, 5, 1200); |
- const PacketFeedback kSentPacket(0, 1, kSeqNo, 1, kPacingInfo); |
+ const PacketFeedback kSentPacket(0, 1, kSeqNo, 1, kRtpHeadersSize, |
+ kTransportHeadersSize, kPacingInfo); |
AddPacketWithSendTime(kSeqNo, 1, 1, kPacingInfo); |
- PacketFeedback received_packet(0, 0, kSeqNo, 0, kPacingInfo); |
+ PacketFeedback received_packet(0, 0, kSeqNo, 0, kRtpHeadersSize, |
+ kTransportHeadersSize, kPacingInfo); |
EXPECT_TRUE(history_.GetFeedback(&received_packet, false)); |
EXPECT_EQ(kSentPacket, received_packet); |
- PacketFeedback received_packet2(0, 0, kSeqNo, 0, kPacingInfo); |
+ PacketFeedback received_packet2(0, 0, kSeqNo, 0, kRtpHeadersSize, |
+ kTransportHeadersSize, kPacingInfo); |
EXPECT_TRUE(history_.GetFeedback(&received_packet2, true)); |
EXPECT_EQ(kSentPacket, received_packet2); |
- PacketFeedback received_packet3(0, 0, kSeqNo, 0, kPacingInfo); |
+ PacketFeedback received_packet3(0, 0, kSeqNo, 0, kRtpHeadersSize, |
+ kTransportHeadersSize, kPacingInfo); |
EXPECT_FALSE(history_.GetFeedback(&received_packet3, true)); |
} |
@@ -103,16 +114,17 @@ TEST_F(SendTimeHistoryTest, AddThenRemoveOutOfOrder) { |
std::vector<PacketFeedback> sent_packets; |
std::vector<PacketFeedback> received_packets; |
const size_t num_items = 100; |
- const size_t kPacketSize = 400; |
+ const size_t kPayloadSize = 400; |
const size_t kTransmissionTime = 1234; |
const PacedPacketInfo kPacingInfo(1, 2, 200); |
for (size_t i = 0; i < num_items; ++i) { |
- sent_packets.push_back(PacketFeedback(0, static_cast<int64_t>(i), |
- static_cast<uint16_t>(i), kPacketSize, |
- kPacingInfo)); |
- received_packets.push_back(PacketFeedback( |
- static_cast<int64_t>(i) + kTransmissionTime, 0, |
- static_cast<uint16_t>(i), kPacketSize, PacedPacketInfo())); |
+ sent_packets.push_back(PacketFeedback( |
+ 0, static_cast<int64_t>(i), static_cast<uint16_t>(i), kPayloadSize, |
+ kRtpHeadersSize, kTransportHeadersSize, kPacingInfo)); |
+ received_packets.push_back( |
+ PacketFeedback(static_cast<int64_t>(i) + kTransmissionTime, 0, |
+ static_cast<uint16_t>(i), kPayloadSize, kRtpHeadersSize, |
+ kTransportHeadersSize, PacedPacketInfo())); |
} |
for (size_t i = 0; i < num_items; ++i) { |
PacketFeedback packet = sent_packets[i]; |
@@ -143,17 +155,19 @@ TEST_F(SendTimeHistoryTest, HistorySize) { |
AddPacketWithSendTime(i, 0, i * 100, PacedPacketInfo()); |
} |
for (int i = 0; i < kItems; ++i) { |
- PacketFeedback packet(0, 0, static_cast<uint16_t>(i), 0, PacedPacketInfo()); |
+ PacketFeedback packet(0, 0, static_cast<uint16_t>(i), 0, kRtpHeadersSize, |
+ kTransportHeadersSize, PacedPacketInfo()); |
EXPECT_TRUE(history_.GetFeedback(&packet, false)); |
EXPECT_EQ(i * 100, packet.send_time_ms); |
} |
clock_.AdvanceTimeMilliseconds(101); |
AddPacketWithSendTime(kItems, 0, kItems * 101, PacedPacketInfo()); |
- PacketFeedback packet(0, 0, 0, 0, PacedPacketInfo()); |
+ PacketFeedback packet(0, 0, 0, 0, kRtpHeadersSize, kTransportHeadersSize, |
+ PacedPacketInfo()); |
EXPECT_FALSE(history_.GetFeedback(&packet, false)); |
for (int i = 1; i < (kItems + 1); ++i) { |
- PacketFeedback packet2(0, 0, static_cast<uint16_t>(i), 0, |
- PacedPacketInfo()); |
+ PacketFeedback packet2(0, 0, static_cast<uint16_t>(i), 0, kRtpHeadersSize, |
+ kTransportHeadersSize, PacedPacketInfo()); |
EXPECT_TRUE(history_.GetFeedback(&packet2, false)); |
int64_t expected_time_ms = (i == kItems) ? i * 101 : i * 100; |
EXPECT_EQ(expected_time_ms, packet2.send_time_ms); |
@@ -208,26 +222,32 @@ TEST_F(SendTimeHistoryTest, InterlievedGetAndRemove) { |
const PacedPacketInfo kPacingInfo2(2, 2, 200); |
const PacedPacketInfo kPacingInfo3(3, 3, 300); |
PacketFeedback packets[3] = { |
- {0, kTimestamp, kSeqNo, 0, kPacingInfo1}, |
- {0, kTimestamp + 1, kSeqNo + 1, 0, kPacingInfo2}, |
- {0, kTimestamp + 2, kSeqNo + 2, 0, kPacingInfo3}}; |
+ {0, kTimestamp, kSeqNo, 0, kRtpHeadersSize, kTransportHeadersSize, |
+ kPacingInfo1}, |
+ {0, kTimestamp + 1, kSeqNo + 1, 0, kRtpHeadersSize, kTransportHeadersSize, |
+ kPacingInfo2}, |
+ {0, kTimestamp + 2, kSeqNo + 2, 0, kRtpHeadersSize, kTransportHeadersSize, |
+ kPacingInfo3}}; |
AddPacketWithSendTime(packets[0].sequence_number, packets[0].payload_size, |
packets[0].send_time_ms, packets[0].pacing_info); |
AddPacketWithSendTime(packets[1].sequence_number, packets[1].payload_size, |
packets[1].send_time_ms, packets[1].pacing_info); |
- PacketFeedback packet(0, 0, packets[0].sequence_number, 0, PacedPacketInfo()); |
+ PacketFeedback packet(0, 0, packets[0].sequence_number, 0, kRtpHeadersSize, |
+ kTransportHeadersSize, PacedPacketInfo()); |
EXPECT_TRUE(history_.GetFeedback(&packet, true)); |
EXPECT_EQ(packets[0], packet); |
AddPacketWithSendTime(packets[2].sequence_number, packets[2].payload_size, |
packets[2].send_time_ms, packets[2].pacing_info); |
- PacketFeedback packet2(0, 0, packets[1].sequence_number, 0, kPacingInfo1); |
+ PacketFeedback packet2(0, 0, packets[1].sequence_number, 0, kRtpHeadersSize, |
+ kTransportHeadersSize, kPacingInfo1); |
EXPECT_TRUE(history_.GetFeedback(&packet2, true)); |
EXPECT_EQ(packets[1], packet2); |
- PacketFeedback packet3(0, 0, packets[2].sequence_number, 0, kPacingInfo2); |
+ PacketFeedback packet3(0, 0, packets[2].sequence_number, 0, kRtpHeadersSize, |
+ kTransportHeadersSize, kPacingInfo2); |
EXPECT_TRUE(history_.GetFeedback(&packet3, true)); |
EXPECT_EQ(packets[2], packet3); |
} |