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

Side by Side Diff: webrtc/tools/event_log_visualizer/analyzer.cc

Issue 2832773002: Use multimap to handle packets logged at the same time in the event log analyzer. (Closed)
Patch Set: Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); 1006 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
1007 plot->SetSuggestedYAxis(0, 1, "Bitrate (kbps)", kBottomMargin, kTopMargin); 1007 plot->SetSuggestedYAxis(0, 1, "Bitrate (kbps)", kBottomMargin, kTopMargin);
1008 if (desired_direction == webrtc::PacketDirection::kIncomingPacket) { 1008 if (desired_direction == webrtc::PacketDirection::kIncomingPacket) {
1009 plot->SetTitle("Incoming bitrate per stream"); 1009 plot->SetTitle("Incoming bitrate per stream");
1010 } else if (desired_direction == webrtc::PacketDirection::kOutgoingPacket) { 1010 } else if (desired_direction == webrtc::PacketDirection::kOutgoingPacket) {
1011 plot->SetTitle("Outgoing bitrate per stream"); 1011 plot->SetTitle("Outgoing bitrate per stream");
1012 } 1012 }
1013 } 1013 }
1014 1014
1015 void EventLogAnalyzer::CreateBweSimulationGraph(Plot* plot) { 1015 void EventLogAnalyzer::CreateBweSimulationGraph(Plot* plot) {
1016 std::map<uint64_t, const LoggedRtpPacket*> outgoing_rtp; 1016 std::multimap<uint64_t, const LoggedRtpPacket*> outgoing_rtp;
1017 std::map<uint64_t, const LoggedRtcpPacket*> incoming_rtcp; 1017 std::multimap<uint64_t, const LoggedRtcpPacket*> incoming_rtcp;
1018 1018
1019 for (const auto& kv : rtp_packets_) { 1019 for (const auto& kv : rtp_packets_) {
1020 if (kv.first.GetDirection() == PacketDirection::kOutgoingPacket) { 1020 if (kv.first.GetDirection() == PacketDirection::kOutgoingPacket) {
1021 for (const LoggedRtpPacket& rtp_packet : kv.second) 1021 for (const LoggedRtpPacket& rtp_packet : kv.second)
1022 outgoing_rtp.insert(std::make_pair(rtp_packet.timestamp, &rtp_packet)); 1022 outgoing_rtp.insert(std::make_pair(rtp_packet.timestamp, &rtp_packet));
1023 } 1023 }
1024 } 1024 }
1025 1025
1026 for (const auto& kv : rtcp_packets_) { 1026 for (const auto& kv : rtcp_packets_) {
1027 if (kv.first.GetDirection() == PacketDirection::kIncomingPacket) { 1027 if (kv.first.GetDirection() == PacketDirection::kIncomingPacket) {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 // Add the data set to the plot. 1128 // Add the data set to the plot.
1129 plot->series_list_.push_back(std::move(time_series)); 1129 plot->series_list_.push_back(std::move(time_series));
1130 plot->series_list_.push_back(std::move(acked_time_series)); 1130 plot->series_list_.push_back(std::move(acked_time_series));
1131 1131
1132 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); 1132 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
1133 plot->SetSuggestedYAxis(0, 10, "Bitrate (kbps)", kBottomMargin, kTopMargin); 1133 plot->SetSuggestedYAxis(0, 10, "Bitrate (kbps)", kBottomMargin, kTopMargin);
1134 plot->SetTitle("Simulated BWE behavior"); 1134 plot->SetTitle("Simulated BWE behavior");
1135 } 1135 }
1136 1136
1137 void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) { 1137 void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
1138 std::map<uint64_t, const LoggedRtpPacket*> outgoing_rtp; 1138 std::multimap<uint64_t, const LoggedRtpPacket*> outgoing_rtp;
1139 std::map<uint64_t, const LoggedRtcpPacket*> incoming_rtcp; 1139 std::multimap<uint64_t, const LoggedRtcpPacket*> incoming_rtcp;
1140 1140
1141 for (const auto& kv : rtp_packets_) { 1141 for (const auto& kv : rtp_packets_) {
1142 if (kv.first.GetDirection() == PacketDirection::kOutgoingPacket) { 1142 if (kv.first.GetDirection() == PacketDirection::kOutgoingPacket) {
1143 for (const LoggedRtpPacket& rtp_packet : kv.second) 1143 for (const LoggedRtpPacket& rtp_packet : kv.second)
1144 outgoing_rtp.insert(std::make_pair(rtp_packet.timestamp, &rtp_packet)); 1144 outgoing_rtp.insert(std::make_pair(rtp_packet.timestamp, &rtp_packet));
1145 } 1145 }
1146 } 1146 }
1147 1147
1148 for (const auto& kv : rtcp_packets_) { 1148 for (const auto& kv : rtcp_packets_) {
1149 if (kv.first.GetDirection() == PacketDirection::kIncomingPacket) { 1149 if (kv.first.GetDirection() == PacketDirection::kIncomingPacket) {
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1386 return rtc::Optional<float>(); 1386 return rtc::Optional<float>();
1387 }, 1387 },
1388 audio_network_adaptation_events_, begin_time_, time_series); 1388 audio_network_adaptation_events_, begin_time_, time_series);
1389 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin); 1389 plot->SetXAxis(0, call_duration_s_, "Time (s)", kLeftMargin, kRightMargin);
1390 plot->SetSuggestedYAxis(0, 1, "Number of channels (1 (mono)/2 (stereo))", 1390 plot->SetSuggestedYAxis(0, 1, "Number of channels (1 (mono)/2 (stereo))",
1391 kBottomMargin, kTopMargin); 1391 kBottomMargin, kTopMargin);
1392 plot->SetTitle("Reported audio encoder number of channels"); 1392 plot->SetTitle("Reported audio encoder number of channels");
1393 } 1393 }
1394 } // namespace plotting 1394 } // namespace plotting
1395 } // namespace webrtc 1395 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698