| Index: media/cast/logging/logging_defines.h
|
| diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h
|
| index 6388a12629b45bd44e0647268444f2fe2c193439..1a64e23d2f72aba14b5db0c21225a34d4c73e2dc 100644
|
| --- a/media/cast/logging/logging_defines.h
|
| +++ b/media/cast/logging/logging_defines.h
|
| @@ -15,15 +15,29 @@
|
| namespace media {
|
| namespace cast {
|
|
|
| +struct CastLoggingConfig {
|
| + CastLoggingConfig();
|
| + ~CastLoggingConfig();
|
| +
|
| + 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();
|
| +
|
| enum CastLoggingEvent {
|
| // Generic events.
|
| - kRtt,
|
| + kRttMs,
|
| kPacketLoss,
|
| - kJitter,
|
| + kJitterMs,
|
| kAckReceived,
|
| + kRembBitrate,
|
| kAckSent,
|
| kLastEvent,
|
| // Audio sender.
|
| + kAudioFrameReceived,
|
| kAudioFrameCaptured,
|
| kAudioFrameEncoded,
|
| // Audio receiver.
|
| @@ -31,6 +45,7 @@ enum CastLoggingEvent {
|
| kAudioFrameDecoded,
|
| // Video sender.
|
| kVideoFrameCaptured,
|
| + kVideoFrameReceived,
|
| kVideoFrameSentToEncoder,
|
| kVideoFrameEncoded,
|
| // Video receiver.
|
| @@ -42,6 +57,8 @@ enum CastLoggingEvent {
|
| kPacketRetransmited,
|
| // Receive-side packet events.
|
| kPacketReceived,
|
| +
|
| + kNumOfLoggingEvents,
|
| };
|
|
|
| std::string CastLoggingToString(CastLoggingEvent event);
|
| @@ -51,7 +68,7 @@ struct FrameEvent {
|
| ~FrameEvent();
|
|
|
| uint32 frame_id;
|
| - int size; // Encoded size only.
|
| + size_t size; // Encoded size only.
|
| std::vector<base::TimeTicks> timestamp;
|
| std::vector<CastLoggingEvent> type;
|
| base::TimeDelta delay_delta; // Render/playout delay.
|
| @@ -62,7 +79,7 @@ struct BasePacketInfo {
|
| BasePacketInfo();
|
| ~BasePacketInfo();
|
|
|
| - int size;
|
| + size_t size;
|
| std::vector<base::TimeTicks> timestamp;
|
| std::vector<CastLoggingEvent> type;
|
| };
|
|
|