From 3770b99e6460d5779f0652f84c2977445d81e614 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Thu, 24 Jan 2019 09:38:36 +0100 Subject: [PATCH] Allow repeated feedback packets in log parser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:10170 Change-Id: I68cf729aa92b1266868f6ebcb211d9d4af031176 Reviewed-on: https://webrtc-review.googlesource.com/c/119300 Reviewed-by: Björn Terelius Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#26392} --- logging/rtc_event_log/rtc_event_log_parser.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index e7e31a4906..32dd92d820 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -1934,7 +1934,11 @@ std::vector ParsedRtcEventLog::GetPacketInfos( LoggedPacketInfo* sent = &packets[indices[fb.sent_packet.sequence_number]]; sent->reported_recv_time = fb.receive_time; - RTC_CHECK(sent->log_feedback_time.IsPlusInfinity()); + // Is we have received feedback with a valid receive time for this packet + // before, we keep the previous values. + if (sent->log_feedback_time.IsFinite() && + sent->reported_recv_time.IsFinite()) + continue; sent->log_feedback_time = msg->feedback_time; if (direction == PacketDirection::kOutgoingPacket) { sent->feedback_hold_duration = last_recv_time - fb.receive_time;