cast: Wire upp logging to be sent over RTCP between receiver and sender.

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();
+  CastLoggingConfig(bool sender);
   ~CastLoggingConfig();
 
+  bool is_sender;
   bool enable_raw_data_collection;
   bool enable_stats_data_collection;
   bool enable_uma_stats;
   bool enable_tracing;
 };
 
 // By default, enable raw and stats data collection. Disable tracing and UMA.
-CastLoggingConfig GetDefaultCastLoggingConfig();
+CastLoggingConfig GetDefaultCastSenderLoggingConfig();
+CastLoggingConfig GetDefaultCastReceiverLoggingConfig();
 
 enum CastLoggingEvent {
   // Generic events.
   kUnknown,
   kRttMs,
   kPacketLoss,
   kJitterMs,
-  kAckReceived,
+  kVideoAckReceived,
   kRembBitrate,
-  kAckSent,
+  kAudioAckSent,
+  kVideoAckSent,
   // 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,
   kPacketRetransmitted,
   // Receive-side packet events.
-  kPacketReceived,
+  kAudioPacketReceived,
+  kVideoPacketReceived,
   kDuplicatePacketReceived,
 
   kNumOfLoggingEvents,
 };
 
 std::string CastLoggingToString(CastLoggingEvent event);
 
 struct FrameEvent {
   FrameEvent();
   ~FrameEvent();
@@ skipping 36 matching lines @@
   FrameLogStats();
   ~FrameLogStats();
 
   double framerate_fps;
   double bitrate_kbps;
   int max_delay_ms;
   int min_delay_ms;
   int avg_delay_ms;
 };
 
+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;
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_LOGGING_LOGGING_DEFINES_H_