Index: webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc |
index 11922d298ee1d79c1650fea9fdd87606516727fe..f2e073aa53de284adec9e7f4ef9f751e1e3b2e76 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc |
@@ -29,7 +29,7 @@ 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), |
@@ -49,15 +49,17 @@ void TransportFeedbackAdapter::SetBitrateEstimator( |
} |
} |
-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( |
@@ -97,8 +99,8 @@ void TransportFeedbackAdapter::OnTransportFeedback( |
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; |