Propagate packet pacing information to SenTimeHistory

webrtc/modules/remote_bitrate_estimator/test/packet_sender.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 257 matching lines @@
   Packets to_transfer;
   to_transfer.splice(to_transfer.begin(), queue_, queue_.begin(), it);
   bwe_->OnPacketsSent(to_transfer);
   batch->merge(to_transfer, DereferencingComparator<Packet>);
 }
 
 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc,
                                         uint16_t sequence_number,
                                         int64_t capture_time_ms,
                                         bool retransmission,
-                                        int probe_cluster_id) {
+                                        const PacedPacketInfo& pacing_info) {
   for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end();
        ++it) {
     MediaPacket* media_packet = static_cast<MediaPacket*>(*it);
     if (media_packet->header().sequenceNumber == sequence_number) {
       int64_t pace_out_time_ms = clock_.TimeInMilliseconds();
 
       // Make sure a packet is never paced out earlier than when it was put into
       // the pacer.
       assert(pace_out_time_ms >= media_packet->send_time_ms());
 
       media_packet->SetAbsSendTimeMs(pace_out_time_ms);
       media_packet->set_send_time_us(1000 * pace_out_time_ms);
       media_packet->set_sender_timestamp_us(1000 * pace_out_time_ms);
       queue_.push_back(media_packet);
       pacer_queue_.erase(it);
       return true;
     }
   }
   return false;
 }
 
-size_t PacedVideoSender::TimeToSendPadding(size_t bytes, int probe_cluster_id) {
+size_t PacedVideoSender::TimeToSendPadding(size_t bytes,
+                                           const PacedPacketInfo& pacing_info) {
   return 0;
 }
 
 void PacedVideoSender::OnNetworkChanged(uint32_t target_bitrate_bps,
                                         uint8_t fraction_lost,
                                         int64_t rtt) {
   VideoSender::OnNetworkChanged(target_bitrate_bps, fraction_lost, rtt);
   pacer_.SetEstimatedBitrate(target_bitrate_bps);
 }
 
@@ skipping 167 matching lines @@
   RecordBitrate();
 }
 
 uint32_t TcpSender::TargetBitrateKbps() {
   return bitrate_kbps_;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc