Revert of Add BWE plot to event log analyzer. (patchset #6 id:100001 of https://codereview.webrtc.org/2188033004/ )
Reason for revert: Breaks downstream targets. Original issue's description: > Add BWE plot to event log analyzer. > > The plot is constructed by actually running the congestion controller with > the logged rtp headers and rtcp feedback messages to reproduce the same behavior > as in the real call. > > R=phoglund@webrtc.org, terelius@webrtc.org > > Committed: https://crrev.com/2beea2a8c920000ef19eea20cce397507fc3d5e7 > Cr-Commit-Position: refs/heads/master@{#13558} TBR=phoglund@webrtc.org,stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.webrtc.org/2190013002 Cr-Commit-Position: refs/heads/master@{#13559}
This commit is contained in:
@ -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 @@ class EventLogAnalyzer {
|
||||
|
||||
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 @@ 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_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user