Propagate probing cluster id to SendTimeHistory.

webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 75 matching lines @@
     // equal. However, the difference must be the same for all x.
     int64_t arrival_time_delta =
         truth[0].arrival_time_ms - input[0].arrival_time_ms;
     for (size_t i = 0; i < len; ++i) {
       EXPECT_EQ(truth[i].arrival_time_ms,
                 input[i].arrival_time_ms + arrival_time_delta);
       EXPECT_EQ(truth[i].send_time_ms, input[i].send_time_ms);
       EXPECT_EQ(truth[i].sequence_number, input[i].sequence_number);
       EXPECT_EQ(truth[i].payload_size, input[i].payload_size);
       EXPECT_EQ(truth[i].was_paced, input[i].was_paced);
     }

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

check probe_cluster_id too.

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

Done.

   }
 
   // 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);
   }
 
   SimulatedClock clock_;
   MockRemoteBitrateEstimator* bitrate_estimator_;
   MockBitrateControllerAdapter bitrate_controller_;
   std::unique_ptr<TransportFeedbackAdapter> adapter_;
 
   uint32_t receiver_estimated_bitrate_;
 };
 
 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);
 
   rtcp::TransportFeedback feedback;
   feedback.WithBase(packets[0].sequence_number,
                     packets[0].arrival_time_ms * 1000);
 
   for (const PacketInfo& packet : packets) {
     EXPECT_TRUE(feedback.WithReceivedPacket(packet.sequence_number,
                                             packet.arrival_time_ms * 1000));
   }
 
   feedback.Build();
 
   EXPECT_CALL(*bitrate_estimator_, IncomingPacketFeedbackVector(_))
       .Times(1)
       .WillOnce(Invoke(
           [packets, this](const std::vector<PacketInfo>& feedback_vector) {
             ComparePacketVectors(packets, feedback_vector);
           }));
   adapter_->OnTransportFeedback(feedback);
 }
 
 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;
 
   for (const PacketInfo& packet : packets) {
     if (packet.sequence_number >= kSendSideDropBefore)
       OnSentPacket(packet);
   }
 
   rtcp::TransportFeedback feedback;
@@ skipping 20 matching lines @@
         ComparePacketVectors(expected_packets, feedback_vector);
       }));
   adapter_->OnTransportFeedback(feedback);
 }
 
 TEST_F(TransportFeedbackAdapterTest, SendTimeWrapsBothWays) {
   int64_t kHighArrivalTimeMs = rtcp::TransportFeedback::kDeltaScaleFactor *
                                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);
 
   for (size_t i = 0; i < packets.size(); ++i) {
     std::unique_ptr<rtcp::TransportFeedback> feedback(
         new rtcp::TransportFeedback());
     feedback->WithBase(packets[i].sequence_number,
                        packets[i].arrival_time_ms * 1000);
 
@@ skipping 12 matching lines @@
         .WillOnce(Invoke([expected_packets, this](
             const std::vector<PacketInfo>& feedback_vector) {
           ComparePacketVectors(expected_packets, feedback_vector);
         }));
     adapter_->OnTransportFeedback(*feedback.get());
   }
 }
 
 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]);
   expected_packets.push_back(packets[0]);
 
   for (const PacketInfo& packet : packets)
     OnSentPacket(packet);
 
   rtcp::TransportFeedback feedback;
   feedback.WithBase(packets[0].sequence_number,
@@ skipping 19 matching lines @@
   std::vector<PacketInfo> sent_packets;
   const int64_t kSmallDeltaUs =
       rtcp::TransportFeedback::kDeltaScaleFactor * ((1 << 8) - 1);
   const int64_t kLargePositiveDeltaUs =
       rtcp::TransportFeedback::kDeltaScaleFactor *
       std::numeric_limits<int16_t>::max();
   const int64_t kLargeNegativeDeltaUs =
       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;
   info.arrival_time_ms += kSmallDeltaUs / 1000;
   ++info.sequence_number;
   sent_packets.push_back(info);
 
   info.send_time_ms += kLargePositiveDeltaUs / 1000;
   info.arrival_time_ms += kLargePositiveDeltaUs / 1000;
   ++info.sequence_number;
@@ skipping 70 matching lines @@
           }));
   adapter_->OnTransportFeedback(*feedback.get());
 
   expected_packets.push_back(info);
 
   ComparePacketVectors(expected_packets, received_feedback);
 }
 
 }  // namespace test
 }  // namespace webrtc