Propagate probing cluster id to SendTimeHistory.

webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc

Index: webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
index 4f7d83c9eb31ec93815e65f4ec14d2ecc84f703d..d48ef0ebb29db5aee4e59300f29a147ab867aa5c 100644
--- a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
@@ -99,8 +99,8 @@ class TransportFeedbackAdapterTest : public ::testing::Test {
   // Utility method, to reset arrival_time_ms before adding send time.
   void OnSentPacket(PacketInfo info) {
     info.arrival_time_ms = 0;
-    adapter_->AddPacket(info.sequence_number, info.payload_size,
-                        info.was_paced);
+    adapter_->AddPacket(info.sequence_number, info.payload_size, info.was_paced,
+                        PacketInfo::kNotAProbe);

[danilchap, 2016/05/31 13:06:50]

probably info.probe_cluster_id here.

[philipel, 2016/05/31 14:34:58]

Done.

     adapter_->OnSentPacket(info.sequence_number, info.send_time_ms);
   }
 
@@ -114,11 +114,16 @@ class TransportFeedbackAdapterTest : public ::testing::Test {
 
 TEST_F(TransportFeedbackAdapterTest, AdaptsFeedbackAndPopulatesSendTimes) {
   std::vector<PacketInfo> packets;
-  packets.push_back(PacketInfo(100, 200, 0, 1500, true));
-  packets.push_back(PacketInfo(110, 210, 1, 1500, true));
-  packets.push_back(PacketInfo(120, 220, 2, 1500, true));
-  packets.push_back(PacketInfo(130, 230, 3, 1500, true));
-  packets.push_back(PacketInfo(140, 240, 4, 1500, true));
+  packets.push_back(
+      PacketInfo(100, 200, 0, 1500, true, PacketInfo::kNotAProbe));

[danilchap, 2016/05/31 13:06:50]

May be helpful to check probe_cluster_id here too, e.g. use '0' for 1st three
packets, '1' for last two.

[philipel, 2016/05/31 14:34:58]

Done.

+  packets.push_back(
+      PacketInfo(110, 210, 1, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(120, 220, 2, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(130, 230, 3, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(140, 240, 4, 1500, true, PacketInfo::kNotAProbe));
 
   for (const PacketInfo& packet : packets)
     OnSentPacket(packet);
@@ -145,11 +150,16 @@ TEST_F(TransportFeedbackAdapterTest, AdaptsFeedbackAndPopulatesSendTimes) {
 
 TEST_F(TransportFeedbackAdapterTest, HandlesDroppedPackets) {
   std::vector<PacketInfo> packets;
-  packets.push_back(PacketInfo(100, 200, 0, 1500, true));
-  packets.push_back(PacketInfo(110, 210, 1, 1500, true));
-  packets.push_back(PacketInfo(120, 220, 2, 1500, true));
-  packets.push_back(PacketInfo(130, 230, 3, 1500, true));
-  packets.push_back(PacketInfo(140, 240, 4, 1500, true));
+  packets.push_back(
+      PacketInfo(100, 200, 0, 1500, true, PacketInfo::kNotAProbe));

[danilchap, 2016/05/31 13:06:50]

ditto

[philipel, 2016/05/31 14:34:58]

Done.

+  packets.push_back(
+      PacketInfo(110, 210, 1, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(120, 220, 2, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(130, 230, 3, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(140, 240, 4, 1500, true, PacketInfo::kNotAProbe));
 
   const uint16_t kSendSideDropBefore = 1;
   const uint16_t kReceiveSideDropAfter = 3;
@@ -190,9 +200,12 @@ TEST_F(TransportFeedbackAdapterTest, SendTimeWrapsBothWays) {
                                static_cast<int64_t>(1 << 8) *
                                static_cast<int64_t>((1 << 23) - 1) / 1000;
   std::vector<PacketInfo> packets;
-  packets.push_back(PacketInfo(kHighArrivalTimeMs - 64, 200, 0, 1500, true));
-  packets.push_back(PacketInfo(kHighArrivalTimeMs + 64, 210, 1, 1500, true));
-  packets.push_back(PacketInfo(kHighArrivalTimeMs, 220, 2, 1500, true));
+  packets.push_back(PacketInfo(kHighArrivalTimeMs - 64, 200, 0, 1500, true,
+                               PacketInfo::kNotAProbe));

[danilchap, 2016/05/31 13:06:50]

ditto

[philipel, 2016/05/31 14:34:58]

Test with kNotAProbe here.

+  packets.push_back(PacketInfo(kHighArrivalTimeMs + 64, 210, 1, 1500, true,
+                               PacketInfo::kNotAProbe));
+  packets.push_back(PacketInfo(kHighArrivalTimeMs, 220, 2, 1500, true,
+                               PacketInfo::kNotAProbe));
 
   for (const PacketInfo& packet : packets)
     OnSentPacket(packet);
@@ -225,9 +238,12 @@ TEST_F(TransportFeedbackAdapterTest, SendTimeWrapsBothWays) {
 
 TEST_F(TransportFeedbackAdapterTest, HandlesReordering) {
   std::vector<PacketInfo> packets;
-  packets.push_back(PacketInfo(120, 200, 0, 1500, true));
-  packets.push_back(PacketInfo(110, 210, 1, 1500, true));
-  packets.push_back(PacketInfo(100, 220, 2, 1500, true));
+  packets.push_back(
+      PacketInfo(120, 200, 0, 1500, true, PacketInfo::kNotAProbe));

[danilchap, 2016/05/31 13:06:50]

ditto

[philipel, 2016/05/31 14:34:59]

Done.

+  packets.push_back(
+      PacketInfo(110, 210, 1, 1500, true, PacketInfo::kNotAProbe));
+  packets.push_back(
+      PacketInfo(100, 220, 2, 1500, true, PacketInfo::kNotAProbe));
   std::vector<PacketInfo> expected_packets;
   expected_packets.push_back(packets[2]);
   expected_packets.push_back(packets[1]);
@@ -267,7 +283,7 @@ TEST_F(TransportFeedbackAdapterTest, TimestampDeltas) {
       rtcp::TransportFeedback::kDeltaScaleFactor *
       std::numeric_limits<int16_t>::min();
 
-  PacketInfo info(100, 200, 0, 1500, true);
+  PacketInfo info(100, 200, 0, 1500, true, PacketInfo::kNotAProbe);
   sent_packets.push_back(info);
 
   info.send_time_ms += kSmallDeltaUs / 1000;