Reset InterArrival if arrival time clock makes a jump.

webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc

Index: webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
diff --git a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
index a78dd7fb08ed0a7074ec1719095c892ba9837927..ce0a32d4b00cf503250dd4130249826c478458df 100644
--- a/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
+++ b/webrtc/modules/congestion_controller/delay_based_bwe_unittest.cc
@@ -8,116 +8,75 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/congestion_controller/delay_based_bwe.h"
-
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/pacing/paced_sender.h"
+#include "webrtc/modules/congestion_controller/delay_based_bwe.h"
+#include "webrtc/modules/congestion_controller/delay_based_bwe_unittest_helper.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
 
-class TestDelayBasedBwe : public ::testing::Test, public RemoteBitrateObserver {
- public:
-  static constexpr int kArrivalTimeClockOffsetMs = 60000;
-  static constexpr int kNumProbes = 5;
-
-  TestDelayBasedBwe()
-      : bwe_(this), clock_(0), bitrate_updated_(false), latest_bitrate_(0) {}
-
-  uint32_t AbsSendTime(int64_t t, int64_t denom) {
-    return (((t << 18) + (denom >> 1)) / denom) & 0x00fffffful;
-  }
-
-  void IncomingPacket(uint32_t ssrc,
-                      size_t payload_size,
-                      int64_t arrival_time,
-                      uint32_t rtp_timestamp,
-                      uint32_t absolute_send_time,
-                      int probe_cluster_id) {
-    RTPHeader header;
-    memset(&header, 0, sizeof(header));
-    header.ssrc = ssrc;
-    header.timestamp = rtp_timestamp;
-    header.extension.hasAbsoluteSendTime = true;
-    header.extension.absoluteSendTime = absolute_send_time;
-    bwe_.IncomingPacket(arrival_time + kArrivalTimeClockOffsetMs, payload_size,
-                        header, probe_cluster_id);
-  }
-
-  void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
-                               uint32_t bitrate) {
-    bitrate_updated_ = true;
-    latest_bitrate_ = bitrate;
-  }
-
-  bool bitrate_updated() {
-    bool res = bitrate_updated_;
-    bitrate_updated_ = false;
-    return res;
-  }
-
-  int latest_bitrate() { return latest_bitrate_; }
-
-  DelayBasedBwe bwe_;
-  SimulatedClock clock_;
+namespace {
 
- private:
-  bool bitrate_updated_;
-  int latest_bitrate_;
-};
+constexpr int kNumProbes = 5;
+}  // namespace
 
-TEST_F(TestDelayBasedBwe, ProbeDetection) {
+TEST_F(DelayBasedBweTest, ProbeDetection) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
 
   // First burst sent at 8 * 1000 / 10 = 800 kbps.
   for (int i = 0; i < kNumProbes; ++i) {
     clock_.AdvanceTimeMilliseconds(10);
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), 0);
+    IncomingFeedback(now_ms, now_ms, seq_num++, 1000, 0);
   }
-  EXPECT_TRUE(bitrate_updated());
+  EXPECT_TRUE(bitrate_observer_->updated());
 
   // Second burst sent at 8 * 1000 / 5 = 1600 kbps.
   for (int i = 0; i < kNumProbes; ++i) {
     clock_.AdvanceTimeMilliseconds(5);
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), 1);
+    IncomingFeedback(now_ms, now_ms, seq_num++, 1000, 1);
   }
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_GT(latest_bitrate(), 1500000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_GT(bitrate_observer_->latest_bitrate(), 1500000u);
 }
 
-TEST_F(TestDelayBasedBwe, ProbeDetectionNonPacedPackets) {
+TEST_F(DelayBasedBweTest, ProbeDetectionNonPacedPackets) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
   // First burst sent at 8 * 1000 / 10 = 800 kbps, but with every other packet
   // not being paced which could mess things up.
   for (int i = 0; i < kNumProbes; ++i) {
     clock_.AdvanceTimeMilliseconds(5);
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), 0);
+    IncomingFeedback(now_ms, now_ms, seq_num++, 1000, 0);
     // Non-paced packet, arriving 5 ms after.
     clock_.AdvanceTimeMilliseconds(5);
-    IncomingPacket(0, PacedSender::kMinProbePacketSize + 1, now_ms, 90 * now_ms,
-                   AbsSendTime(now_ms, 1000), PacketInfo::kNotAProbe);
+    IncomingFeedback(now_ms, now_ms, seq_num++,
+                     PacedSender::kMinProbePacketSize + 1,
+                     PacketInfo::kNotAProbe);
   }
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_GT(latest_bitrate(), 800000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_GT(bitrate_observer_->latest_bitrate(), 800000u);
 }
 
 // Packets will require 5 ms to be transmitted to the receiver, causing packets
 // of the second probe to be dispersed.
-TEST_F(TestDelayBasedBwe, ProbeDetectionTooHighBitrate) {
+TEST_F(DelayBasedBweTest, ProbeDetectionTooHighBitrate) {
   int64_t now_ms = clock_.TimeInMilliseconds();
   int64_t send_time_ms = 0;
+  uint16_t seq_num = 0;
   // First burst sent at 8 * 1000 / 10 = 800 kbps.
   for (int i = 0; i < kNumProbes; ++i) {
     clock_.AdvanceTimeMilliseconds(10);
     now_ms = clock_.TimeInMilliseconds();
     send_time_ms += 10;
-    IncomingPacket(0, 1000, now_ms, 90 * send_time_ms,
-                   AbsSendTime(send_time_ms, 1000), 0);
+    IncomingFeedback(now_ms, send_time_ms, seq_num++, 1000, 0);
   }
 
   // Second burst sent at 8 * 1000 / 5 = 1600 kbps, arriving at 8 * 1000 / 8 =
@@ -126,16 +85,16 @@ TEST_F(TestDelayBasedBwe, ProbeDetectionTooHighBitrate) {
     clock_.AdvanceTimeMilliseconds(8);
     now_ms = clock_.TimeInMilliseconds();
     send_time_ms += 5;
-    IncomingPacket(0, 1000, now_ms, send_time_ms,
-                   AbsSendTime(send_time_ms, 1000), 1);
+    IncomingFeedback(now_ms, send_time_ms, seq_num++, 1000, 1);
   }
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_NEAR(latest_bitrate(), 800000, 10000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 800000u, 10000u);
 }
 
-TEST_F(TestDelayBasedBwe, ProbeDetectionSlightlyFasterArrival) {
+TEST_F(DelayBasedBweTest, ProbeDetectionSlightlyFasterArrival) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
   // First burst sent at 8 * 1000 / 10 = 800 kbps.
   // Arriving at 8 * 1000 / 5 = 1600 kbps.
   int64_t send_time_ms = 0;
@@ -143,16 +102,16 @@ TEST_F(TestDelayBasedBwe, ProbeDetectionSlightlyFasterArrival) {
     clock_.AdvanceTimeMilliseconds(5);
     send_time_ms += 10;
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * send_time_ms,
-                   AbsSendTime(send_time_ms, 1000), 23);
+    IncomingFeedback(now_ms, send_time_ms, seq_num++, 1000, 23);
   }
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_GT(latest_bitrate(), 800000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_GT(bitrate_observer_->latest_bitrate(), 800000u);
 }
 
-TEST_F(TestDelayBasedBwe, ProbeDetectionFasterArrival) {
+TEST_F(DelayBasedBweTest, ProbeDetectionFasterArrival) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
   // First burst sent at 8 * 1000 / 10 = 800 kbps.
   // Arriving at 8 * 1000 / 5 = 1600 kbps.
   int64_t send_time_ms = 0;
@@ -160,15 +119,15 @@ TEST_F(TestDelayBasedBwe, ProbeDetectionFasterArrival) {
     clock_.AdvanceTimeMilliseconds(1);
     send_time_ms += 10;
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * send_time_ms,
-                   AbsSendTime(send_time_ms, 1000), 0);
+    IncomingFeedback(now_ms, send_time_ms, seq_num++, 1000, 0);
   }
 
-  EXPECT_FALSE(bitrate_updated());
+  EXPECT_FALSE(bitrate_observer_->updated());
 }
 
-TEST_F(TestDelayBasedBwe, ProbeDetectionSlowerArrival) {
+TEST_F(DelayBasedBweTest, ProbeDetectionSlowerArrival) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
   // First burst sent at 8 * 1000 / 5 = 1600 kbps.
   // Arriving at 8 * 1000 / 7 = 1142 kbps.
   int64_t send_time_ms = 0;
@@ -176,16 +135,16 @@ TEST_F(TestDelayBasedBwe, ProbeDetectionSlowerArrival) {
     clock_.AdvanceTimeMilliseconds(7);
     send_time_ms += 5;
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * send_time_ms,
-                   AbsSendTime(send_time_ms, 1000), 1);
+    IncomingFeedback(now_ms, send_time_ms, seq_num++, 1000, 1);
   }
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_NEAR(latest_bitrate(), 1140000, 10000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 1140000u, 10000u);
 }
 
-TEST_F(TestDelayBasedBwe, ProbeDetectionSlowerArrivalHighBitrate) {
+TEST_F(DelayBasedBweTest, ProbeDetectionSlowerArrivalHighBitrate) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
   // Burst sent at 8 * 1000 / 1 = 8000 kbps.
   // Arriving at 8 * 1000 / 2 = 4000 kbps.
   int64_t send_time_ms = 0;
@@ -193,39 +152,106 @@ TEST_F(TestDelayBasedBwe, ProbeDetectionSlowerArrivalHighBitrate) {
     clock_.AdvanceTimeMilliseconds(2);
     send_time_ms += 1;
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * send_time_ms,
-                   AbsSendTime(send_time_ms, 1000), 1);
+    IncomingFeedback(now_ms, send_time_ms, seq_num++, 1000, 1);
   }
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_NEAR(latest_bitrate(), 4000000u, 10000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 4000000u, 10000u);
 }
 
-TEST_F(TestDelayBasedBwe, ProbingIgnoresSmallPackets) {
+TEST_F(DelayBasedBweTest, ProbingIgnoresSmallPackets) {
   int64_t now_ms = clock_.TimeInMilliseconds();
+  uint16_t seq_num = 0;
   // Probing with 200 bytes every 10 ms, should be ignored by the probe
   // detection.
   for (int i = 0; i < kNumProbes; ++i) {
     clock_.AdvanceTimeMilliseconds(10);
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, PacedSender::kMinProbePacketSize, now_ms, 90 * now_ms,
-                   AbsSendTime(now_ms, 1000), 1);
+    IncomingFeedback(now_ms, now_ms, seq_num++,
+                     PacedSender::kMinProbePacketSize, 1);
   }
 
-  EXPECT_FALSE(bitrate_updated());
+  EXPECT_FALSE(bitrate_observer_->updated());
 
   // Followed by a probe with 1000 bytes packets, should be detected as a
   // probe.
   for (int i = 0; i < kNumProbes; ++i) {
     clock_.AdvanceTimeMilliseconds(10);
     now_ms = clock_.TimeInMilliseconds();
-    IncomingPacket(0, 1000, now_ms, 90 * now_ms, AbsSendTime(now_ms, 1000), 1);
+    IncomingFeedback(now_ms, now_ms, seq_num++, 1000, 1);
   }
 
   // Wait long enough so that we can call Process again.
   clock_.AdvanceTimeMilliseconds(1000);
 
-  EXPECT_TRUE(bitrate_updated());
-  EXPECT_NEAR(latest_bitrate(), 800000u, 10000);
+  EXPECT_TRUE(bitrate_observer_->updated());
+  EXPECT_NEAR(bitrate_observer_->latest_bitrate(), 800000u, 10000u);
+}
+
+TEST_F(DelayBasedBweTest, InitialBehavior) {
+  InitialBehaviorTestHelper(674840);
+}
+
+TEST_F(DelayBasedBweTest, RateIncreaseReordering) {
+  RateIncreaseReorderingTestHelper(674840);
+}
+
+TEST_F(DelayBasedBweTest, RateIncreaseRtpTimestamps) {
+  RateIncreaseRtpTimestampsTestHelper(1240);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropOneStream) {
+  CapacityDropTestHelper(1, false, 633, 0);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropPosOffsetChange) {
+  CapacityDropTestHelper(1, false, 200, 30000);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropNegOffsetChange) {
+  CapacityDropTestHelper(1, false, 733, -30000);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropOneStreamWrap) {
+  CapacityDropTestHelper(1, true, 633, 0);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropTwoStreamsWrap) {
+  CapacityDropTestHelper(2, true, 567, 0);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropThreeStreamsWrap) {
+  CapacityDropTestHelper(3, true, 633, 0);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropThirteenStreamsWrap) {
+  CapacityDropTestHelper(13, true, 733, 0);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropNineteenStreamsWrap) {
+  CapacityDropTestHelper(19, true, 667, 0);
+}
+
+TEST_F(DelayBasedBweTest, CapacityDropThirtyStreamsWrap) {
+  CapacityDropTestHelper(30, true, 667, 0);
+}
+
+TEST_F(DelayBasedBweTest, TestTimestampGrouping) {
+  TestTimestampGroupingTestHelper();
+}
+
+TEST_F(DelayBasedBweTest, TestShortTimeoutAndWrap) {
+  // Simulate a client leaving and rejoining the call after 35 seconds. This
+  // will make abs send time wrap, so if streams aren't timed out properly
+  // the next 30 seconds of packets will be out of order.
+  TestWrappingHelper(35);
+}
+
+TEST_F(DelayBasedBweTest, TestLongTimeoutAndWrap) {
+  // Simulate a client leaving and rejoining the call after some multiple of
+  // 64 seconds later. This will cause a zero difference in abs send times due
+  // to the wrap, but a big difference in arrival time, if streams aren't
+  // properly timed out.
+  TestWrappingHelper(10 * 64);
 }
 }  // namespace webrtc