Cast: Provide more meaningful stats.

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/time/time.h"
 
 namespace media {
 namespace cast {
 
 static const uint32 kFrameIdUnknown = 0xFFFFFFFF;
 
 typedef uint32 RtpTimestamp;
 
 enum CastLoggingEvent {
   // Generic events.
   kUnknown,
   kRttMs,
   kPacketLoss,
   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.
   kAudioFrameReceived,
   kAudioFrameCaptured,
   kAudioFrameEncoded,
   // Audio receiver.
   kAudioFrameDecoded,
   kAudioPlayoutDelay,
   // Video sender.
   kVideoFrameCaptured,
   kVideoFrameReceived,
   kVideoFrameSentToEncoder,
   kVideoFrameEncoded,
   // Video receiver.
   kVideoFrameDecoded,
   kVideoRenderDelay,
   // Send-side packet events.
   kAudioPacketSentToPacer,
   kVideoPacketSentToPacer,
   kAudioPacketSentToNetwork,
   kVideoPacketSentToNetwork,
   kAudioPacketRetransmitted,
   kVideoPacketRetransmitted,
   // Receive-side packet events.
   kAudioPacketReceived,
   kVideoPacketReceived,
   kDuplicateAudioPacketReceived,
   kDuplicateVideoPacketReceived,
-  kNumOfLoggingEvents = kDuplicateVideoPacketReceived
+  // Sender-side generic event.
+  kAudioRtcpPacketReceived,
+  kVideoRtcpPacketReceived,
+  kNumOfLoggingEvents = kVideoRtcpPacketReceived
 };
 
 const char* CastLoggingToString(CastLoggingEvent event);
 
 // CastLoggingEvent are classified into one of three following types.
 enum EventMediaType { AUDIO_EVENT, VIDEO_EVENT, OTHER_EVENT };
 
 EventMediaType GetEventMediaType(CastLoggingEvent event);
 
 struct FrameEvent {
@@ skipping 45 matching lines @@
   //  kVideoAckReceived - Frame ID
   //  kRembBitrate - Receiver Estimated Maximum Bitrate
   //  kAudioAckSent - Frame ID
   //  kVideoAckSent - Frame ID
   int value;
 
   // Time of event logged.
   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
 
 #endif  // MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_