Incorporating logging into Cast

media/cast/logging/logging_defines.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_
 #define MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/time/time.h"
 
 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.
   kAudioPlayoutDelay,
   kAudioFrameDecoded,
   // Video sender.
   kVideoFrameCaptured,
+  kVideoFrameReceived,
   kVideoFrameSentToEncoder,
   kVideoFrameEncoded,
   // Video receiver.
   kVideoFrameDecoded,
   kVideoRenderDelay,
   // Send-side packet events.
   kPacketSentToPacer,
   kPacketSentToNetwork,
   kPacketRetransmited,
   // Receive-side packet events.
   kPacketReceived,
+
+  kNumOfLoggingEvents,
 };
 
 std::string CastLoggingToString(CastLoggingEvent event);
 
 struct FrameEvent {
   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.
 };
 
 // Internal map sorted by packet id.
 struct BasePacketInfo {
   BasePacketInfo();
   ~BasePacketInfo();
 
-  int size;
+  size_t size;
   std::vector<base::TimeTicks> timestamp;
   std::vector<CastLoggingEvent> type;
 };
 
 typedef std::map<uint16, BasePacketInfo> BasePacketMap;
 
 struct PacketEvent {
   PacketEvent();
   ~PacketEvent();
   uint32 frame_id;
@@ skipping 25 matching lines @@
 typedef std::map<CastLoggingEvent, GenericEvent> GenericRawMap;
 
 typedef std::map<CastLoggingEvent, linked_ptr<FrameLogStats > > FrameStatsMap;
 typedef std::map<CastLoggingEvent, double> PacketStatsMap;
 typedef std::map<CastLoggingEvent, double> GenericStatsMap;
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_