Index: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc |
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc |
index 1f95f654eb5f00329e42836b49d95ed4ee8d69f6..a8d73b059715d51b6e4761ab900fd2fc746e8b42 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc |
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc |
@@ -52,9 +52,8 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) { |
return; |
// TODO(sprang): Unconstify PacketInfo so we don't need temp copy? |
stefan-webrtc
2015/09/03 11:30:33
Has this been done already? I don't see any consts
sprang_webrtc
2015/09/03 13:24:09
This comment doesn't make sense any more. Removing
|
std::vector<PacketInfo> packet_feedback_vector(fb.packet_feedback_vector()); |
- for (PacketInfo& packet : packet_feedback_vector) { |
- if (!send_time_history_.GetSendTime(packet.sequence_number, |
- &packet.send_time_ms, true)) { |
+ for (PacketInfo& packet_info : packet_feedback_vector) { |
+ if (!send_time_history_.Populate(&packet_info, true)) { |
LOG(LS_WARNING) << "Ack arrived too late."; |
} |
} |
@@ -95,9 +94,10 @@ void FullBweSender::OnPacketsSent(const Packets& packets) { |
for (Packet* packet : packets) { |
if (packet->GetPacketType() == Packet::kMedia) { |
MediaPacket* media_packet = static_cast<MediaPacket*>(packet); |
- send_time_history_.AddAndRemoveOldSendTimes( |
- media_packet->header().sequenceNumber, |
- media_packet->GetAbsSendTimeInMs()); |
+ PacketInfo info(0, media_packet->sender_timestamp_ms(), |
+ media_packet->header().sequenceNumber, |
+ media_packet->payload_size(), packet->was_paced()); |
+ send_time_history_.AddAndRemoveOld(info); |
} |
} |
} |