diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index 565922b84e..4d43794932 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -2123,9 +2123,11 @@ const std::vector GetNetworkTrace( for (auto& packet : parsed_log.GetPacketInfos(PacketDirection::kOutgoingPacket)) { if (packet.log_feedback_time.IsFinite()) { - rtp_rtcp_matched.emplace_back( - packet.log_feedback_time.ms(), packet.log_packet_time.ms(), - packet.reported_recv_time.ms_or(-1), packet.size); + rtp_rtcp_matched.emplace_back(packet.log_feedback_time.ms(), + packet.log_packet_time.ms(), + packet.reported_recv_time.ms_or( + MatchedSendArrivalTimes::kNotReceived), + packet.size); } } return rtp_rtcp_matched; diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h index 5d605b8965..2723cafa37 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.h +++ b/logging/rtc_event_log/rtc_event_log_parser.h @@ -795,6 +795,8 @@ class ParsedRtcEventLog { }; struct MatchedSendArrivalTimes { + static constexpr int64_t kNotReceived = -1; + MatchedSendArrivalTimes(int64_t fb, int64_t tx, int64_t rx, int64_t ps) : feedback_arrival_time_ms(fb), send_time_ms(tx), @@ -802,8 +804,8 @@ struct MatchedSendArrivalTimes { payload_size(ps) {} int64_t feedback_arrival_time_ms; - int64_t send_time_ms; // PacketFeedback::kNoSendTime for late feedback. - int64_t arrival_time_ms; // PacketFeedback::kNotReceived for lost packets. + int64_t send_time_ms; + int64_t arrival_time_ms; // kNotReceived for lost packets. int64_t payload_size; }; const std::vector GetNetworkTrace( diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc index 0b5f795944..106e8daa9f 100644 --- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc +++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc @@ -1448,8 +1448,6 @@ void EventLogAnalyzer::CreateReceiveSideBweSimulationGraph(Plot* plot) { } void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) { - TimeSeries late_feedback_series("Late feedback results.", LineStyle::kNone, - PointStyle::kHighlight); TimeSeries time_series("Network delay", LineStyle::kLine, PointStyle::kHighlight); int64_t min_send_receive_diff_ms = std::numeric_limits::max(); @@ -1463,13 +1461,9 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) { return a.feedback_arrival_time_ms < b.feedback_arrival_time_ms; }); for (const auto& packet : matched_rtp_rtcp) { - if (packet.arrival_time_ms == PacketFeedback::kNotReceived) + if (packet.arrival_time_ms == MatchedSendArrivalTimes::kNotReceived) continue; float x = config_.GetCallTimeSec(1000 * packet.feedback_arrival_time_ms); - if (packet.send_time_ms == PacketFeedback::kNoSendTime) { - late_feedback_series.points.emplace_back(x, prev_y); - continue; - } int64_t y = packet.arrival_time_ms - packet.send_time_ms; prev_y = y; int64_t rtt_ms = packet.feedback_arrival_time_ms - packet.send_time_ms; @@ -1485,12 +1479,9 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) { min_send_receive_diff_ms - min_rtt_ms / 2; for (TimeSeriesPoint& point : time_series.points) point.y -= estimated_clock_offset_ms; - for (TimeSeriesPoint& point : late_feedback_series.points) - point.y -= estimated_clock_offset_ms; // Add the data set to the plot. plot->AppendTimeSeriesIfNotEmpty(std::move(time_series)); - plot->AppendTimeSeriesIfNotEmpty(std::move(late_feedback_series)); plot->SetXAxis(config_.CallBeginTimeSec(), config_.CallEndTimeSec(), "Time (s)", kLeftMargin, kRightMargin);