1 files changed, 40 insertions, 2 deletions

diff --git a/chromium/media/cast/rtcp/rtcp_defines.h b/chromium/media/cast/rtcp/rtcp_defines.h
index f0635f8ca8f..0277bd1feaf 100644
--- a/chromium/media/cast/rtcp/rtcp_defines.h
+++ b/chromium/media/cast/rtcp/rtcp_defines.h
@@ -11,20 +11,58 @@
 
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
+#include "media/cast/logging/logging_defines.h"
 
 namespace media {
 namespace cast {
 
+// Handle the per frame ACK and NACK messages.
 class RtcpCastMessage {
  public:
   explicit RtcpCastMessage(uint32 media_ssrc);
   ~RtcpCastMessage();
 
   uint32 media_ssrc_;
-  uint8 ack_frame_id_;
+  uint32 ack_frame_id_;
   MissingFramesAndPacketsMap missing_frames_and_packets_;
 };
 
+// Log messages form sender to receiver.
+enum RtcpSenderFrameStatus {
+  kRtcpSenderFrameStatusUnknown = 0,
+  kRtcpSenderFrameStatusDroppedByEncoder = 1,
+  kRtcpSenderFrameStatusDroppedByFlowControl = 2,
+  kRtcpSenderFrameStatusSentToNetwork = 3,
+};
+
+struct RtcpSenderFrameLogMessage {
+  RtcpSenderFrameStatus frame_status;
+  uint32 rtp_timestamp;
+};
+
+typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage;
+
+// Log messages from receiver to sender.
+struct RtcpReceiverEventLogMessage {
+  CastLoggingEvent type;
+  base::TimeTicks event_timestamp;
+  base::TimeDelta delay_delta;
+  uint16 packet_id;
+};
+
+typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages;
+
+class RtcpReceiverFrameLogMessage {
+ public:
+  explicit RtcpReceiverFrameLogMessage(uint32 rtp_timestamp);
+  ~RtcpReceiverFrameLogMessage();
+
+  uint32 rtp_timestamp_;
+  RtcpReceiverEventLogMessages event_log_messages_;
+};
+
+typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage;
+
 struct RtcpSenderInfo {
   // First three members are used for lipsync.
   // First two members are used for rtt.
@@ -32,7 +70,7 @@ struct RtcpSenderInfo {
   uint32 ntp_fraction;
   uint32 rtp_timestamp;
   uint32 send_packet_count;
-  uint32 send_octet_count;
+  size_t send_octet_count;
 };
 
 struct RtcpReportBlock {