Propagate packet pacing information to SenTimeHistory

webrtc/modules/congestion_controller/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 239 matching lines @@
   ComparePacketVectors(expected_packets,
                        adapter_->GetTransportFeedbackVector());
 }
 
 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,
-                               PacketInfo::kNotAProbe));
+                               PacedPacketInfo::kNotAProbe));
   packets.push_back(PacketInfo(kHighArrivalTimeMs + 64, 210, 1, 1500,
-                               PacketInfo::kNotAProbe));
-  packets.push_back(
-      PacketInfo(kHighArrivalTimeMs, 220, 2, 1500, PacketInfo::kNotAProbe));
+                               PacedPacketInfo::kNotAProbe));
+  packets.push_back(PacketInfo(kHighArrivalTimeMs, 220, 2, 1500,
+                               PacedPacketInfo::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->SetBase(packets[i].sequence_number,
                       packets[i].arrival_time_ms * 1000);
 
@@ skipping 46 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::kNotAProbe);
+  PacketInfo info(100, 200, 0, 1500, true, PacedPacketInfo::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 68 matching lines @@
 
 TEST_F(TransportFeedbackAdapterTest, UpdatesDelayBasedEstimate) {
   uint16_t seq_num = 0;
   size_t kPayloadSize = 1000;
   // The test must run and insert packets/feedback long enough that the
   // BWE computes a valid estimate.
   const int64_t kRunTimeMs = 6000;
   int64_t start_time_ms = clock_.TimeInMilliseconds();
   while (clock_.TimeInMilliseconds() - start_time_ms < kRunTimeMs) {
     PacketInfo packet(clock_.TimeInMilliseconds(), clock_.TimeInMilliseconds(),
-                      seq_num, kPayloadSize, PacketInfo::kNotAProbe);
+                      seq_num, kPayloadSize, PacedPacketInfo::kNotAProbe);
     OnSentPacket(packet);
     // Create expected feedback and send into adapter.
     std::unique_ptr<rtcp::TransportFeedback> feedback(
         new rtcp::TransportFeedback());
     feedback->SetBase(packet.sequence_number, packet.arrival_time_ms * 1000);
     EXPECT_TRUE(feedback->AddReceivedPacket(packet.sequence_number,
                                             packet.arrival_time_ms * 1000));
     rtc::Buffer raw_packet = feedback->Build();
     feedback = rtcp::TransportFeedback::ParseFrom(raw_packet.data(),
                                                   raw_packet.size());
     EXPECT_TRUE(feedback.get() != nullptr);
     adapter_->OnTransportFeedback(*feedback.get());
     clock_.AdvanceTimeMilliseconds(50);
     ++seq_num;
   }
   EXPECT_GT(target_bitrate_bps_, 0u);
 }
 
 }  // namespace test
 }  // namespace webrtc