Set send times in send time history via OnSentPacket.

webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.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 11 matching lines @@
 const int64_t kNoTimestamp = -1;
 const int64_t kSendTimeHistoryWindowMs = 10000;
 const int64_t kBaseTimestampScaleFactor =
     rtcp::TransportFeedback::kDeltaScaleFactor * (1 << 8);
 const int64_t kBaseTimestampRangeSizeUs = kBaseTimestampScaleFactor * (1 << 24);
 
 TransportFeedbackAdapter::TransportFeedbackAdapter(
     RtcpBandwidthObserver* bandwidth_observer,
     Clock* clock,
     ProcessThread* process_thread)
-    : send_time_history_(kSendTimeHistoryWindowMs),
+    : send_time_history_(clock, kSendTimeHistoryWindowMs),
       rtcp_bandwidth_observer_(bandwidth_observer),
       process_thread_(process_thread),
       clock_(clock),
       current_offset_ms_(kNoTimestamp),
       last_timestamp_us_(kNoTimestamp) {}
 
 TransportFeedbackAdapter::~TransportFeedbackAdapter() {
   if (bitrate_estimator_.get())
     process_thread_->DeRegisterModule(bitrate_estimator_.get());
 }
 
 void TransportFeedbackAdapter::SetBitrateEstimator(
     RemoteBitrateEstimator* rbe) {
   if (bitrate_estimator_.get() != rbe) {
     bitrate_estimator_.reset(rbe);
     process_thread_->RegisterModule(rbe);
   }
 }
 
-void TransportFeedbackAdapter::OnSentPacket(const PacketInfo& info) {
+void TransportFeedbackAdapter::AddPacket(uint16_t sequence_number,
+                                         size_t length,
+                                         bool was_paced) {
   rtc::CritScope cs(&lock_);
-  send_time_history_.AddAndRemoveOld(info);
+  send_time_history_.AddAndRemoveOld(sequence_number, length, was_paced);
 }
 
-void TransportFeedbackAdapter::UpdateSendTime(uint16_t sequence_number,
-                                              int64_t send_time_ms) {
+void TransportFeedbackAdapter::OnSentPacket(uint16_t sequence_number,
+                                            int64_t send_time_ms) {
   rtc::CritScope cs(&lock_);
-  send_time_history_.UpdateSendTime(sequence_number, send_time_ms);
+  send_time_history_.OnSentPacket(sequence_number, send_time_ms);
 }
 
 void TransportFeedbackAdapter::OnTransportFeedback(
     const rtcp::TransportFeedback& feedback) {
   int64_t timestamp_us = feedback.GetBaseTimeUs();
   // Add timestamp deltas to a local time base selected on first packet arrival.
   // This won't be the true time base, but makes it easier to manually inspect
   // time stamps.
   if (last_timestamp_us_ == kNoTimestamp) {
     current_offset_ms_ = clock_->TimeInMilliseconds();
@@ skipping 19 matching lines @@
 
   {
     rtc::CritScope cs(&lock_);
     size_t failed_lookups = 0;
     int64_t offset_us = 0;
     for (auto symbol : feedback.GetStatusVector()) {
       if (symbol != rtcp::TransportFeedback::StatusSymbol::kNotReceived) {
         RTC_DCHECK(delta_it != delta_vec.end());
         offset_us += *(delta_it++);
         int64_t timestamp_ms = current_offset_ms_ + (offset_us / 1000);
-        PacketInfo info = {timestamp_ms, 0, sequence_number, 0, false};
-        if (send_time_history_.GetInfo(&info, true)) {
+        PacketInfo info(timestamp_ms, sequence_number);
+        if (send_time_history_.GetInfo(&info, true) && info.send_time_ms >= 0) {
           packet_feedback_vector.push_back(info);
         } else {
           ++failed_lookups;
         }
       }
       ++sequence_number;
     }
     RTC_DCHECK(delta_it == delta_vec.end());
     if (failed_lookups > 0) {
       LOG(LS_WARNING) << "Failed to lookup send time for " << failed_lookups
@@ skipping 12 matching lines @@
   rtcp_bandwidth_observer_->OnReceivedEstimatedBitrate(bitrate);
 }
 
 void TransportFeedbackAdapter::OnRttUpdate(int64_t avg_rtt_ms,
                                            int64_t max_rtt_ms) {
   RTC_DCHECK(bitrate_estimator_.get() != nullptr);
   bitrate_estimator_->OnRttUpdate(avg_rtt_ms, max_rtt_ms);
 }
 
 }  // namespace webrtc