Only use payload size within the receive/send interval for bitrate probing.

webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc

Index: webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
diff --git a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
index e3bbd5a22793e2d8a73c0a277ae02f9fc036acb9..5acef7815dd91bb6ad017330087d0378e7a2950c 100644
--- a/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
+++ b/webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc
@@ -15,19 +15,21 @@
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/random.h"
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 
 namespace webrtc {
 
 class TestProbeBitrateEstimator : public ::testing::Test {
  public:
-  TestProbeBitrateEstimator() : probe_bitrate_estimator_() {}
+  TestProbeBitrateEstimator() : probe_bitrate_estimator_(), rand_(0x7716123) {}
 
   void AddPacketFeedback(int probe_cluster_id,
+                         int16_t sequence_number,
                          size_t size_bytes,
                          int64_t send_time_ms,
                          int64_t arrival_time_ms) {
-    PacketInfo info(arrival_time_ms, send_time_ms, 0, size_bytes,
+    PacketInfo info(arrival_time_ms, send_time_ms, sequence_number, size_bytes,
                     probe_cluster_id);
     ProbingResult res = probe_bitrate_estimator_.PacketFeedback(info);
     if (res.valid())
@@ -40,89 +42,119 @@ class TestProbeBitrateEstimator : public ::testing::Test {
     EXPECT_EQ(results_[index].second, timestamp);
   }
 
+  uint16_t Rand() { return rand_.Rand(std::numeric_limits<uint16_t>::max()); }

[danilchap, 2016/08/18 19:29:09]

return rand_.Rand<uint16_t>();
if you want to use rand

+
  protected:
   std::vector<std::pair<int, int64_t>> results_;
   ProbeBitrateEstimator probe_bitrate_estimator_;
+  Random rand_;

[danilchap, 2016/08/18 19:29:09]

May be cleaner use some constant kSeqNo = 7716; for initial seq_num:
seq_num valid range is both trivial and irrelevant for this tests.
I can't imagine code under this test that looks ok but able to misbehave with
some sequence numbers and not with others.

 };
 
 TEST_F(TestProbeBitrateEstimator, OneCluster) {
-  AddPacketFeedback(0, 1000, 0, 10);
-  AddPacketFeedback(0, 1000, 10, 20);
-  AddPacketFeedback(0, 1000, 20, 30);
-  AddPacketFeedback(0, 1000, 30, 40);
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num++, 1000, 0, 10);
+  AddPacketFeedback(0, seq_num++, 1000, 10, 20);
+  AddPacketFeedback(0, seq_num++, 1000, 20, 30);
+  AddPacketFeedback(0, seq_num++, 1000, 30, 40);
 
   CheckResult(0, 800000, 10, 40);
 }
 
 TEST_F(TestProbeBitrateEstimator, FastReceive) {
-  AddPacketFeedback(0, 1000, 0, 15);
-  AddPacketFeedback(0, 1000, 10, 30);
-  AddPacketFeedback(0, 1000, 20, 35);
-  AddPacketFeedback(0, 1000, 30, 40);
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num++, 1000, 0, 15);
+  AddPacketFeedback(0, seq_num++, 1000, 10, 30);
+  AddPacketFeedback(0, seq_num++, 1000, 20, 35);
+  AddPacketFeedback(0, seq_num++, 1000, 30, 40);
 
   CheckResult(0, 800000, 10, 40);
 }
 
 TEST_F(TestProbeBitrateEstimator, TooFastReceive) {
-  AddPacketFeedback(0, 1000, 0, 19);
-  AddPacketFeedback(0, 1000, 10, 30);
-  AddPacketFeedback(0, 1000, 20, 40);
-  AddPacketFeedback(0, 1000, 40, 50);
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num++, 1000, 0, 19);
+  AddPacketFeedback(0, seq_num++, 1000, 10, 30);
+  AddPacketFeedback(0, seq_num++, 1000, 20, 40);
+  AddPacketFeedback(0, seq_num++, 1000, 40, 50);
 
   EXPECT_TRUE(results_.empty());
 }
 
 TEST_F(TestProbeBitrateEstimator, SlowReceive) {
-  AddPacketFeedback(0, 1000, 0, 10);
-  AddPacketFeedback(0, 1000, 10, 40);
-  AddPacketFeedback(0, 1000, 20, 70);
-  AddPacketFeedback(0, 1000, 30, 85);
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num++, 1000, 0, 10);
+  AddPacketFeedback(0, seq_num++, 1000, 10, 40);
+  AddPacketFeedback(0, seq_num++, 1000, 20, 70);
+  AddPacketFeedback(0, seq_num++, 1000, 30, 85);
 
   CheckResult(0, 320000, 10, 85);
 }
 
 TEST_F(TestProbeBitrateEstimator, BurstReceive) {
-  AddPacketFeedback(0, 1000, 0, 50);
-  AddPacketFeedback(0, 1000, 10, 50);
-  AddPacketFeedback(0, 1000, 20, 50);
-  AddPacketFeedback(0, 1000, 40, 50);
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num++, 1000, 0, 50);
+  AddPacketFeedback(0, seq_num++, 1000, 10, 50);
+  AddPacketFeedback(0, seq_num++, 1000, 20, 50);
+  AddPacketFeedback(0, seq_num++, 1000, 40, 50);
 
   EXPECT_TRUE(results_.empty());
 }
 
 TEST_F(TestProbeBitrateEstimator, MultipleClusters) {
-  AddPacketFeedback(0, 1000, 0, 10);
-  AddPacketFeedback(0, 1000, 10, 20);
-  AddPacketFeedback(0, 1000, 20, 30);
-  AddPacketFeedback(0, 1000, 40, 60);
-  AddPacketFeedback(0, 1000, 50, 60);
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num++, 1000, 0, 10);
+  AddPacketFeedback(0, seq_num++, 1000, 10, 20);
+  AddPacketFeedback(0, seq_num++, 1000, 20, 30);
+  AddPacketFeedback(0, seq_num++, 1000, 40, 60);
+  AddPacketFeedback(0, seq_num++, 1000, 50, 60);
 
   CheckResult(0, 480000, 10, 60);
   CheckResult(1, 640000, 10, 60);
 
-  AddPacketFeedback(1, 1000, 60, 70);
-  AddPacketFeedback(1, 1000, 65, 77);
-  AddPacketFeedback(1, 1000, 70, 84);
-  AddPacketFeedback(1, 1000, 75, 90);
+  AddPacketFeedback(1, seq_num++, 1000, 60, 70);
+  AddPacketFeedback(1, seq_num++, 1000, 65, 77);
+  AddPacketFeedback(1, seq_num++, 1000, 70, 84);
+  AddPacketFeedback(1, seq_num++, 1000, 75, 90);
 
   CheckResult(2, 1200000, 10, 90);
 }
 
 TEST_F(TestProbeBitrateEstimator, OldProbe) {
-  AddPacketFeedback(0, 1000, 0, 10);
-  AddPacketFeedback(0, 1000, 10, 20);
-  AddPacketFeedback(0, 1000, 20, 30);
+  uint16_t seq_num = Rand();
 
-  AddPacketFeedback(1, 1000, 60, 70);
-  AddPacketFeedback(1, 1000, 65, 77);
-  AddPacketFeedback(1, 1000, 70, 84);
-  AddPacketFeedback(1, 1000, 75, 90);
+  AddPacketFeedback(0, seq_num, 1000, 0, 10);
+  AddPacketFeedback(0, seq_num + 1, 1000, 10, 20);
+  AddPacketFeedback(0, seq_num + 2, 1000, 20, 30);
+
+  AddPacketFeedback(1, seq_num + 4, 1000, 60, 70);
+  AddPacketFeedback(1, seq_num + 5, 1000, 65, 77);
+  AddPacketFeedback(1, seq_num + 6, 1000, 70, 84);
+  AddPacketFeedback(1, seq_num + 7, 1000, 75, 90);
 
   CheckResult(0, 1200000, 10, 90);
 
-  AddPacketFeedback(0, 1000, 40, 60);
+  AddPacketFeedback(0, seq_num + 3, 1000, 40, 60);
 
   EXPECT_EQ(1ul, results_.size());
 }
 
+TEST_F(TestProbeBitrateEstimator, SameProbe) {
+  uint16_t seq_num = Rand();
+
+  AddPacketFeedback(0, seq_num + 1, 1000, 0, 10);
+  AddPacketFeedback(0, seq_num + 2, 1000, 10, 40);
+  AddPacketFeedback(0, seq_num + 2, 1000, 10, 40);
+  AddPacketFeedback(0, seq_num + 3, 1000, 20, 70);
+  AddPacketFeedback(0, seq_num + 3, 1000, 20, 70);
+  AddPacketFeedback(0, seq_num + 4, 1000, 30, 85);
+
+  CheckResult(0, 320000, 10, 85);
+}
+
 }  // namespace webrtc