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 da3b206e10b8abe3805f626db010a0ae46b109c2..0b92c10e1086decd181b8b4ac63e621401fce8ad 100644 |
--- a/webrtc/tools/event_log_visualizer/analyzer.h |
+++ b/webrtc/tools/event_log_visualizer/analyzer.h |
@@ -13,12 +13,8 @@ |
#include <vector> |
#include <map> |
-#include <memory> |
-#include <utility> |
#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 { |
@@ -45,41 +41,30 @@ |
void CreateStreamBitrateGraph(PacketDirection desired_direction, Plot* plot); |
- void CreateBweGraph(Plot* plot); |
- |
private: |
class StreamId { |
public: |
- StreamId(uint32_t ssrc, webrtc::PacketDirection direction) |
- : ssrc_(ssrc), direction_(direction) {} |
+ StreamId(uint32_t ssrc, |
+ webrtc::PacketDirection direction, |
+ webrtc::MediaType media_type) |
+ : ssrc_(ssrc), direction_(direction), media_type_(media_type) {} |
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, size_t total_length) |
- : timestamp(timestamp), header(header), total_length(total_length) {} |
+ LoggedRtpPacket(uint64_t timestamp, RTPHeader header) |
+ : timestamp(timestamp), header(header) {} |
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 { |
@@ -100,8 +85,6 @@ |
// 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_; |