Set send times in send time history via OnSentPacket.

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.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.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h"
 
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
 const int kFeedbackIntervalMs = 50;
 
 FullBweSender::FullBweSender(int kbps, BitrateObserver* observer, Clock* clock)
     : bitrate_controller_(
           BitrateController::CreateBitrateController(clock, observer)),
       rbe_(new RemoteBitrateEstimatorAbsSendTime(this, clock)),
       feedback_observer_(bitrate_controller_->CreateRtcpBandwidthObserver()),
       clock_(clock),
-      send_time_history_(10000),
+      send_time_history_(clock_, 10000),
       has_received_ack_(false),
       last_acked_seq_num_(0) {
   assert(kbps >= kMinBitrateKbps);
   assert(kbps <= kMaxBitrateKbps);
   bitrate_controller_->SetStartBitrate(1000 * kbps);
   bitrate_controller_->SetMinMaxBitrate(1000 * kMinBitrateKbps,
                                         1000 * kMaxBitrateKbps);
   rbe_->SetMinBitrate(1000 * kMinBitrateKbps);
 }
 
@@ skipping 45 matching lines @@
   } else {
     last_acked_seq_num_ = packet_feedback_vector.back().sequence_number;
     has_received_ack_ = true;
   }
 }
 
 void FullBweSender::OnPacketsSent(const Packets& packets) {
   for (Packet* packet : packets) {
     if (packet->GetPacketType() == Packet::kMedia) {
       MediaPacket* media_packet = static_cast<MediaPacket*>(packet);
-      PacketInfo info(0, media_packet->sender_timestamp_ms(),
-                      media_packet->header().sequenceNumber,
-                      media_packet->payload_size(), packet->paced());
-      send_time_history_.AddAndRemoveOld(info);
+      send_time_history_.AddAndRemoveOld(media_packet->header().sequenceNumber,
+                                         media_packet->payload_size(),
+                                         packet->paced());
+      send_time_history_.OnSentPacket(media_packet->header().sequenceNumber,
+                                      media_packet->sender_timestamp_ms());
     }
   }
 }
 
 void FullBweSender::OnReceiveBitrateChanged(
     const std::vector<unsigned int>& ssrcs,
     unsigned int bitrate) {
   feedback_observer_->OnReceivedEstimatedBitrate(bitrate);
 }
 
 int64_t FullBweSender::TimeUntilNextProcess() {
   return bitrate_controller_->TimeUntilNextProcess();
 }
 
 int FullBweSender::Process() {
   rbe_->Process();
   return bitrate_controller_->Process();
 }
 
 SendSideBweReceiver::SendSideBweReceiver(int flow_id)
     : BweReceiver(flow_id), last_feedback_ms_(0) {
 }
 
 SendSideBweReceiver::~SendSideBweReceiver() {
 }
 
 void SendSideBweReceiver::ReceivePacket(int64_t arrival_time_ms,
                                         const MediaPacket& media_packet) {
   packet_feedback_vector_.push_back(PacketInfo(
-      arrival_time_ms, media_packet.sender_timestamp_ms(),
+      -1, arrival_time_ms, media_packet.sender_timestamp_ms(),
       media_packet.header().sequenceNumber, media_packet.payload_size(), true));
 
   // Log received packet information.
   BweReceiver::ReceivePacket(arrival_time_ms, media_packet);
 }
 
 FeedbackPacket* SendSideBweReceiver::GetFeedback(int64_t now_ms) {
   if (now_ms - last_feedback_ms_ < kFeedbackIntervalMs)
     return NULL;
   last_feedback_ms_ = now_ms;
   int64_t corrected_send_time_ms =
       packet_feedback_vector_.back().send_time_ms + now_ms -
       packet_feedback_vector_.back().arrival_time_ms;
   FeedbackPacket* fb = new SendSideBweFeedback(
       flow_id_, now_ms * 1000, corrected_send_time_ms, packet_feedback_vector_);
   packet_feedback_vector_.clear();
   return fb;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc