Propagate probing cluster id to SendTimeHistory.

webrtc/modules/remote_bitrate_estimator/send_time_history_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 17 matching lines @@
   ~SendTimeHistoryTest() {}
 
   virtual void SetUp() {}
 
   virtual void TearDown() {}
 
   void AddPacketWithSendTime(uint16_t sequence_number,
                              size_t length,
                              bool was_paced,
                              int64_t send_time_ms) {
-    history_.AddAndRemoveOld(sequence_number, length, was_paced);
+    history_.AddAndRemoveOld(sequence_number, length, was_paced,
+                             PacketInfo::kNotAProbe);

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

better propagate and test probe_cluster_id field too.

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

Integrated testing of cluster id into existing tests.

     history_.OnSentPacket(sequence_number, send_time_ms);
   }
 
   webrtc::SimulatedClock clock_;
   SendTimeHistory history_;
 };
 
 // Help class extended so we can do EXPECT_EQ and collections.
 class PacketInfo : public webrtc::PacketInfo {
  public:
-  PacketInfo() : webrtc::PacketInfo(-1, 0, 0, 0, 0, false) {}
+  PacketInfo()
+      : webrtc::PacketInfo(-1,
+                           0,
+                           0,
+                           0,
+                           0,
+                           false,
+                           webrtc::PacketInfo::kNotAProbe) {}
   PacketInfo(int64_t arrival_time_ms, uint16_t sequence_number)
       : PacketInfo(arrival_time_ms, 0, sequence_number, 0, false) {}
   PacketInfo(int64_t arrival_time_ms,
              int64_t send_time_ms,
              uint16_t sequence_number,
              size_t payload_size,
              bool was_paced)
       : webrtc::PacketInfo(-1,
                            arrival_time_ms,
                            send_time_ms,
                            sequence_number,
                            payload_size,
-                           was_paced) {}
+                           was_paced,
+                           webrtc::PacketInfo::kNotAProbe) {}
   bool operator==(const PacketInfo& other) const {
     return arrival_time_ms == other.arrival_time_ms &&
            send_time_ms == other.send_time_ms &&
            sequence_number == other.sequence_number &&
-           payload_size == other.payload_size && was_paced == other.was_paced;
+           payload_size == other.payload_size && was_paced == other.was_paced &&
+           probe_cluster_id == other.probe_cluster_id;
   }
 };
 
 TEST_F(SendTimeHistoryTest, AddRemoveOne) {
   const uint16_t kSeqNo = 10;
   const PacketInfo kSentPacket(0, 1, kSeqNo, 1, true);
   AddPacketWithSendTime(kSeqNo, 1, true, 1);
 
   PacketInfo received_packet(0, 0, kSeqNo, 0, false);
   EXPECT_TRUE(history_.GetInfo(&received_packet, false));
@@ skipping 36 matching lines @@
     sent_packets.push_back(PacketInfo(0, static_cast<int64_t>(i),
                                       static_cast<uint16_t>(i), kPacketSize,
                                       kPaced));
     received_packets.push_back(
         PacketInfo(static_cast<int64_t>(i) + kTransmissionTime, 0,
                    static_cast<uint16_t>(i), kPacketSize, false));
   }
   for (size_t i = 0; i < num_items; ++i) {
     history_.AddAndRemoveOld(sent_packets[i].sequence_number,
                              sent_packets[i].payload_size,
-                             sent_packets[i].was_paced);
+                             sent_packets[i].was_paced, PacketInfo::kNotAProbe);

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

sent_packets[i].probe_cluster_id

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

Done.

   }
   for (size_t i = 0; i < num_items; ++i)
     history_.OnSentPacket(sent_packets[i].sequence_number,
                           sent_packets[i].send_time_ms);
   std::random_shuffle(received_packets.begin(), received_packets.end());
   for (size_t i = 0; i < num_items; ++i) {
     PacketInfo packet = received_packets[i];
     EXPECT_TRUE(history_.GetInfo(&packet, false));
     PacketInfo sent_packet = sent_packets[packet.sequence_number];
     sent_packet.arrival_time_ms = packet.arrival_time_ms;
@@ skipping 90 matching lines @@
   EXPECT_TRUE(history_.GetInfo(&info2, true));
   EXPECT_EQ(packets[1], info2);
 
   PacketInfo info3(0, 0, packets[2].sequence_number, 0, false);
   EXPECT_TRUE(history_.GetInfo(&info3, true));
   EXPECT_EQ(packets[2], info3);
 }
 
 }  // namespace test
 }  // namespace webrtc