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

Unified Diff: media/cast/logging/logging_defines.h

Issue 136903003: cast: Wire upp logging to be sent over RTCP between receiver and sender. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: media/cast/logging/logging_defines.h
diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h
index f75c9963a1500beed196c40360d13364668f77c1..ec988f39ee273b2a3a8227a05e3538dba46de256 100644
--- a/media/cast/logging/logging_defines.h
+++ b/media/cast/logging/logging_defines.h
@@ -18,16 +18,18 @@ namespace cast {
static const uint32 kFrameIdUnknown = 0xFFFF;
struct CastLoggingConfig {
- CastLoggingConfig();
+ CastLoggingConfig(bool sender);
~CastLoggingConfig();
+ bool is_sender;
bool enable_data_collection;
bool enable_uma_stats;
bool enable_tracing;
};
// By default, enable raw and stats data collection. Disable tracing and UMA.
-CastLoggingConfig GetDefaultCastLoggingConfig();
+CastLoggingConfig GetDefaultCastSenderLoggingConfig();
+CastLoggingConfig GetDefaultCastReceiverLoggingConfig();
enum CastLoggingEvent {
// Generic events.
@@ -37,7 +39,8 @@ enum CastLoggingEvent {
kJitterMs,
kAckReceived,
mikhal1 2014/01/14 19:57:18 Shouldn't this be divided as well?
pwestin 2014/01/17 23:46:17 In theory yes but we don't log audio acks since we
kRembBitrate,
- kAckSent,
+ kAudioAckSent,
+ kVideoAckSent,
kLastEvent,
// Audio sender.
kAudioFrameReceived,
@@ -59,7 +62,8 @@ enum CastLoggingEvent {
kPacketSentToNetwork,
kPacketRetransmited,
// Receive-side packet events.
- kPacketReceived,
+ kAudioPacketReceived,
+ kVideoPacketReceived,
kDuplicatePacketReceived,
kNumOfLoggingEvents,
@@ -116,11 +120,24 @@ struct FrameLogStats {
int avg_delay_ms;
};
+struct ReceiverRtcpEvent {
+ ReceiverRtcpEvent();
+ ~ReceiverRtcpEvent();
+
+ CastLoggingEvent type;
+ base::TimeTicks timestamp;
+ base::TimeDelta delay_delta; // Render/playout delay.
+ uint16 packet_id;
+};
+
// Store all log types in a map based on the event.
typedef std::map<uint32, FrameEvent> FrameRawMap;
typedef std::map<uint32, PacketEvent> PacketRawMap;
typedef std::map<CastLoggingEvent, GenericEvent> GenericRawMap;
+typedef std::multimap<uint32, ReceiverRtcpEvent> AudioRtcpRawMap;
+typedef std::multimap<uint32, ReceiverRtcpEvent> VideoRtcpRawMap;
+
typedef std::map<CastLoggingEvent, linked_ptr<FrameLogStats > > FrameStatsMap;
typedef std::map<CastLoggingEvent, double> PacketStatsMap;
typedef std::map<CastLoggingEvent, double> GenericStatsMap;

Powered by Google App Engine
This is Rietveld 408576698