Cast:Updating logging 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/memory/linked_ptr.h"
 #include "base/time/time.h"
 
 namespace media {
 namespace cast {
 
 static const uint32 kFrameIdUnknown = 0xFFFF;
 
 struct CastLoggingConfig {
   CastLoggingConfig(bool sender);
   ~CastLoggingConfig();
@@ skipping 46 matching lines @@
   kNumOfLoggingEvents,
 };
 
 std::string CastLoggingToString(CastLoggingEvent event);
 
 struct FrameEvent {
   FrameEvent();
   ~FrameEvent();
 
   uint32 frame_id;
-  size_t size;  // Encoded size only.
+  // Size is set only for kAudioFrameEncoded and kVideoFrameEncoded.
+  size_t size;
   std::vector<base::TimeTicks> timestamp;
   std::vector<CastLoggingEvent> type;
+  // Delay is only set for kAudioPlayoutDelay and kVideoRenderDelay.
   base::TimeDelta delay_delta;  // Render/playout delay.
 };
 
 // Internal map sorted by packet id.
 struct BasePacketInfo {
   BasePacketInfo();
   ~BasePacketInfo();
 
   size_t size;
   std::vector<base::TimeTicks> timestamp;
@@ skipping 10 matching lines @@
   BasePacketMap packet_map;
 };
 
 struct GenericEvent {
   GenericEvent();
   ~GenericEvent();
   std::vector<int> value;
   std::vector<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;
+};
 
-  double framerate_fps;
-  double bitrate_kbps;
-  int max_delay_ms;
-  int min_delay_ms;
-  int avg_delay_ms;
+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;
+  int64 sum_squared;

[imcheng, 2014/01/23 21:17:18]

nit: uint64?

[mikhal1, 2014/01/23 23:02:17]

Done.

+  int min;
+  int max;
 };
 
 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;
+typedef std::map<CastLoggingEvent, FrameLogStats > FrameStatsMap;

[imcheng, 2014/01/23 21:17:18]

nit: extra space before closing angle bracket here and below

[mikhal1, 2014/01/23 23:02:17]

Done.

+typedef std::map<CastLoggingEvent, PacketLogStats > PacketStatsMap;
+typedef std::map<CastLoggingEvent, GenericLogStats > GenericStatsMap;
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_