| Index: webrtc/tools/event_log_visualizer/analyzer.h
|
| diff --git a/webrtc/tools/event_log_visualizer/analyzer.h b/webrtc/tools/event_log_visualizer/analyzer.h
|
| index 0b92c10e1086decd181b8b4ac63e621401fce8ad..ef9b3217668621da7fb7628f54f88b31b3dc44b1 100644
|
| --- a/webrtc/tools/event_log_visualizer/analyzer.h
|
| +++ b/webrtc/tools/event_log_visualizer/analyzer.h
|
| @@ -15,6 +15,8 @@
|
| #include <map>
|
|
|
| #include "webrtc/call/rtc_event_log_parser.h"
|
| +#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
| +#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
|
| #include "webrtc/tools/event_log_visualizer/plot_base.h"
|
|
|
| namespace webrtc {
|
| @@ -41,30 +43,41 @@ class EventLogAnalyzer {
|
|
|
| void CreateStreamBitrateGraph(PacketDirection desired_direction, Plot* plot);
|
|
|
| + void CreateBweGraph(Plot* plot);
|
| +
|
| private:
|
| class StreamId {
|
| public:
|
| - StreamId(uint32_t ssrc,
|
| - webrtc::PacketDirection direction,
|
| - webrtc::MediaType media_type)
|
| - : ssrc_(ssrc), direction_(direction), media_type_(media_type) {}
|
| + StreamId(uint32_t ssrc, webrtc::PacketDirection direction)
|
| + : ssrc_(ssrc), direction_(direction) {}
|
| bool operator<(const StreamId& other) const;
|
| bool operator==(const StreamId& other) const;
|
| uint32_t GetSsrc() const { return ssrc_; }
|
| webrtc::PacketDirection GetDirection() const { return direction_; }
|
| - webrtc::MediaType GetMediaType() const { return media_type_; }
|
|
|
| private:
|
| uint32_t ssrc_;
|
| webrtc::PacketDirection direction_;
|
| - webrtc::MediaType media_type_;
|
| };
|
|
|
| struct LoggedRtpPacket {
|
| - LoggedRtpPacket(uint64_t timestamp, RTPHeader header)
|
| - : timestamp(timestamp), header(header) {}
|
| + LoggedRtpPacket(uint64_t timestamp, RTPHeader header, size_t total_length)
|
| + : timestamp(timestamp), header(header), total_length(total_length) {}
|
| uint64_t timestamp;
|
| RTPHeader header;
|
| + size_t total_length;
|
| + };
|
| +
|
| + struct LoggedRtcpPacket {
|
| + LoggedRtcpPacket(uint64_t timestamp,
|
| + RTCPPacketType rtcp_type,
|
| + std::unique_ptr<rtcp::RtcpPacket> rtcp_packet)
|
| + : timestamp(timestamp),
|
| + type(rtcp_type),
|
| + packet(std::move(rtcp_packet)) {}
|
| + uint64_t timestamp;
|
| + RTCPPacketType type;
|
| + std::unique_ptr<rtcp::RtcpPacket> packet;
|
| };
|
|
|
| struct BwePacketLossEvent {
|
| @@ -85,6 +98,8 @@ class EventLogAnalyzer {
|
| // if the stream has been configured.
|
| std::map<StreamId, std::vector<LoggedRtpPacket>> rtp_packets_;
|
|
|
| + std::map<StreamId, std::vector<LoggedRtcpPacket>> rtcp_packets_;
|
| +
|
| // A list of all updates from the send-side loss-based bandwidth estimator.
|
| std::vector<BwePacketLossEvent> bwe_loss_updates_;
|
|
|
|
|