Cast: Provide more meaningful stats.

media/cast/logging/logging_defines.h

Index: media/cast/logging/logging_defines.h
diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h
index 2b7d2d31da9285fc00e5cc842b04caf5a7bf3a70..6cd629ca272a6148f9bf19c4d12e79d6ee708e73 100644
--- a/media/cast/logging/logging_defines.h
+++ b/media/cast/logging/logging_defines.h
@@ -26,8 +26,7 @@ enum CastLoggingEvent {
   kJitterMs,
   kVideoAckReceived,
   kRembBitrate,
-  // TODO(imcheng): k{Audio,Video}AckSent may need to be FrameEvents
-  // (crbug.com/339590)
+  // Sender-side frame events.
   kAudioAckSent,
   kVideoAckSent,
   // Audio sender.
@@ -57,7 +56,10 @@ enum CastLoggingEvent {
   kVideoPacketReceived,
   kDuplicateAudioPacketReceived,
   kDuplicateVideoPacketReceived,
-  kNumOfLoggingEvents = kDuplicateVideoPacketReceived
+  // Sender-side generic event.
+  kAudioRtcpPacketReceived,
+  kVideoRtcpPacketReceived,
+  kNumOfLoggingEvents = kVideoRtcpPacketReceived
 };
 
 const char* CastLoggingToString(CastLoggingEvent event);
@@ -123,47 +125,6 @@ struct GenericEvent {
   base::TimeTicks timestamp;
 };
 
-// Generic statistics given the raw data. More specific data (e.g. frame rate
-// and bit rate) can be computed given the basic metrics.
-// Some of the metrics will only be set when applicable, e.g. delay and size.
-struct FrameLogStats {
-  FrameLogStats();
-  ~FrameLogStats();
-  base::TimeTicks first_event_time;
-  base::TimeTicks last_event_time;
-  int event_counter;
-  size_t sum_size;
-  base::TimeDelta min_delay;
-  base::TimeDelta max_delay;
-  base::TimeDelta sum_delay;
-};
-
-struct PacketLogStats {
-  PacketLogStats();
-  ~PacketLogStats();
-  base::TimeTicks first_event_time;
-  base::TimeTicks last_event_time;
-  int event_counter;
-  size_t sum_size;
-};
-
-struct GenericLogStats {
-  GenericLogStats();
-  ~GenericLogStats();
-  base::TimeTicks first_event_time;
-  base::TimeTicks last_event_time;
-  int event_counter;
-  int sum;
-  uint64 sum_squared;
-  int min;
-  int max;
-};
-
-
-typedef std::map<CastLoggingEvent, FrameLogStats> FrameStatsMap;
-typedef std::map<CastLoggingEvent, PacketLogStats> PacketStatsMap;
-typedef std::map<CastLoggingEvent, GenericLogStats> GenericStatsMap;
-
 }  // namespace cast
 }  // namespace media