Cast: Restructure RTCP interface to better fit our usage.

media/cast/rtcp/rtcp_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_RTCP_RTCP_DEFINES_H_
 #define MEDIA_CAST_RTCP_RTCP_DEFINES_H_
 
 #include <list>
 #include <map>
 #include <set>
 
 #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_;
   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_;

[Alpha Left Google, 2013/11/13 23:58:40]

If this is a struct then just |frame_status| and |rtp_timestamp|.

[pwestin, 2013/11/15 00:20:32]

Done.

+  uint32 rtp_timestamp_;
+};
+
+class RtcpSenderLogMessage {

[Alpha Left Google, 2013/11/13 23:58:40]

This class is not really necessary. Just use a typedef:

typedef std::list<RtcpSenderFrameLogMessage> RtpSenderFrameLogList.

[pwestin, 2013/11/15 00:20:32]

Done.

+ public:
+  std::list<RtcpSenderFrameLogMessage> frame_log_messages_;
+};
+
+// Log messages from receiver to sender.
+struct RtcpReceiverEventLogMessage {
+  CastLoggingEvent type_;

[Alpha Left Google, 2013/11/13 23:58:40]

This should be |type| |event_timestamp| |delay_delta| |packet_id|.

[pwestin, 2013/11/15 00:20:32]

Done.

+  base::TimeTicks event_timestamp_;
+  base::TimeDelta delay_delta_;
+  uint16 packet_id_;
+};
+
+class RtcpReceiverFrameLogMessage {
+ public:
+  uint32 rtp_timestamp_;

[Alpha Left Google, 2013/11/13 23:58:40]

|rtp_timestamp| and |event_log_messages|

[pwestin, 2013/11/15 00:20:32]

Done.

+  std::list<RtcpReceiverEventLogMessage> event_log_messages_;
+};
+
+class RtcpReceiverLogMessage {

[Alpha Left Google, 2013/11/13 23:58:40]

This is not necessary. Just do a typedef.

[pwestin, 2013/11/15 00:20:32]

Done.

+ public:
+  std::list<RtcpReceiverFrameLogMessage> frame_log_messages_;
+};
+
 struct RtcpSenderInfo {
   // First three members are used for lipsync.
   // First two members are used for rtt.
   uint32 ntp_seconds;
   uint32 ntp_fraction;
   uint32 rtp_timestamp;
   uint32 send_packet_count;
   size_t send_octet_count;
 };
 
@@ skipping 66 matching lines @@
                        RtcpReceiverReferenceTimeReport rhs) {
   return lhs.remote_ssrc == rhs.remote_ssrc &&
       lhs.ntp_seconds == rhs.ntp_seconds &&
       lhs.ntp_fraction == rhs.ntp_fraction;
 }
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RTCP_DEFINES_H_