Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc

Issue 1288033008: Update SendTimeHistory to store complete PacketInfo, not just send time (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..37b604dfe90ae0dabdd5dd246d1e02f79650f850 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc
@@ -50,11 +50,9 @@ void FullBweSender::GiveFeedback(const FeedbackPacket& feedback) {
static_cast<const SendSideBweFeedback&>(feedback);
if (fb.packet_feedback_vector().empty())
return;
- // TODO(sprang): Unconstify PacketInfo so we don't need temp copy?
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_.GetInfo(&packet_info, true)) {
LOG(LS_WARNING) << "Ack arrived too late.";
}
}
@@ -95,9 +93,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->paced());
+ send_time_history_.AddAndRemoveOld(info);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698