zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes unused late feedback plot from analyzer.

Browse Source 
Due to changes in how the transport feedback is processed, the late
feedback results plot doesn't get any entries anymore.

Bug: webrtc:9883
Change-Id: I9df8e86a35bedddf78407128f0ab0b6b321a6f28
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158668
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29643}
This commit is contained in:
Sebastian Jansson
2019-10-29 12:57:54 +01:00
committed by Commit Bot
parent 9cdc9cc1c4
commit 74f96eccd6
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
logging/rtc_event_log/rtc_event_log_parser.cc
View File

@ -2123,9 +2123,11 @@ const std::vector<MatchedSendArrivalTimes> GetNetworkTrace(
for (auto& packet : for (auto& packet :
parsed_log.GetPacketInfos(PacketDirection::kOutgoingPacket)) { parsed_log.GetPacketInfos(PacketDirection::kOutgoingPacket)) {
if (packet.log_feedback_time.IsFinite()) { if (packet.log_feedback_time.IsFinite()) {
rtp_rtcp_matched.emplace_back( rtp_rtcp_matched.emplace_back(packet.log_feedback_time.ms(),
packet.log_feedback_time.ms(), packet.log_packet_time.ms(), packet.log_packet_time.ms(),
packet.reported_recv_time.ms_or(-1), packet.size); packet.reported_recv_time.ms_or(
MatchedSendArrivalTimes::kNotReceived),
packet.size);
} }
} }
return rtp_rtcp_matched; return rtp_rtcp_matched;

6
logging/rtc_event_log/rtc_event_log_parser.h
View File

@ -795,6 +795,8 @@ class ParsedRtcEventLog {
}; };
struct MatchedSendArrivalTimes { struct MatchedSendArrivalTimes {
static constexpr int64_t kNotReceived = -1;
MatchedSendArrivalTimes(int64_t fb, int64_t tx, int64_t rx, int64_t ps) MatchedSendArrivalTimes(int64_t fb, int64_t tx, int64_t rx, int64_t ps)
: feedback_arrival_time_ms(fb), : feedback_arrival_time_ms(fb),
send_time_ms(tx), send_time_ms(tx),
@ -802,8 +804,8 @@ struct MatchedSendArrivalTimes {
payload_size(ps) {} payload_size(ps) {}
int64_t feedback_arrival_time_ms; int64_t feedback_arrival_time_ms;
int64_t send_time_ms; // PacketFeedback::kNoSendTime for late feedback. int64_t send_time_ms;
int64_t arrival_time_ms; // PacketFeedback::kNotReceived for lost packets. int64_t arrival_time_ms; // kNotReceived for lost packets.
int64_t payload_size; int64_t payload_size;
}; };
const std::vector<MatchedSendArrivalTimes> GetNetworkTrace( const std::vector<MatchedSendArrivalTimes> GetNetworkTrace(

11
rtc_tools/rtc_event_log_visualizer/analyzer.cc
View File

@ -1448,8 +1448,6 @@ void EventLogAnalyzer::CreateReceiveSideBweSimulationGraph(Plot* plot) {
} }
void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(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, TimeSeries time_series("Network delay", LineStyle::kLine,
PointStyle::kHighlight); PointStyle::kHighlight);
int64_t min_send_receive_diff_ms = std::numeric_limits<int64_t>::max(); int64_t min_send_receive_diff_ms = std::numeric_limits<int64_t>::max();
@ -1463,13 +1461,9 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
return a.feedback_arrival_time_ms < b.feedback_arrival_time_ms; return a.feedback_arrival_time_ms < b.feedback_arrival_time_ms;
}); });
for (const auto& packet : matched_rtp_rtcp) { for (const auto& packet : matched_rtp_rtcp) {
if (packet.arrival_time_ms == PacketFeedback::kNotReceived) if (packet.arrival_time_ms == MatchedSendArrivalTimes::kNotReceived)
continue; continue;
float x = config_.GetCallTimeSec(1000 * packet.feedback_arrival_time_ms); 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; int64_t y = packet.arrival_time_ms - packet.send_time_ms;
prev_y = y; prev_y = y;
int64_t rtt_ms = packet.feedback_arrival_time_ms - packet.send_time_ms; 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; min_send_receive_diff_ms - min_rtt_ms / 2;
for (TimeSeriesPoint& point : time_series.points) for (TimeSeriesPoint& point : time_series.points)
point.y -= estimated_clock_offset_ms; 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. // Add the data set to the plot.
plot->AppendTimeSeriesIfNotEmpty(std::move(time_series)); plot->AppendTimeSeriesIfNotEmpty(std::move(time_series));
plot->AppendTimeSeriesIfNotEmpty(std::move(late_feedback_series));
plot->SetXAxis(config_.CallBeginTimeSec(), config_.CallEndTimeSec(), plot->SetXAxis(config_.CallBeginTimeSec(), config_.CallEndTimeSec(),
"Time (s)", kLeftMargin, kRightMargin); "Time (s)", kLeftMargin, kRightMargin);