Cast: Refactor RTCP handling

media/cast/net/rtcp/rtcp_defines.h

 // Copyright 2014 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 <map>
 #include <set>
 
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/logging/logging_defines.h"
 #include "media/cast/net/cast_transport_defines.h"
 
 namespace media {
 namespace cast {
 
 static const size_t kRtcpCastLogHeaderSize = 12;
 static const size_t kRtcpReceiverFrameLogSize = 8;
 static const size_t kRtcpReceiverEventLogSize = 4;
 
 // Handle the per frame ACK and NACK messages.
-class RtcpCastMessage {
- public:
-  explicit RtcpCastMessage(uint32 media_ssrc);
+struct RtcpCastMessage {
+  explicit RtcpCastMessage(uint32 ssrc);
+  RtcpCastMessage();
   ~RtcpCastMessage();
 
-  void Copy(const RtcpCastMessage& cast_message);
-
-  uint32 media_ssrc_;
-  uint32 ack_frame_id_;
-  uint16 target_delay_ms_;
-  MissingFramesAndPacketsMap missing_frames_and_packets_;
-
-  DISALLOW_COPY_AND_ASSIGN(RtcpCastMessage);
+  uint32 media_ssrc;
+  uint32 ack_frame_id;
+  uint16 target_delay_ms;
+  MissingFramesAndPacketsMap missing_frames_and_packets;
 };
 
 // Log messages from receiver to sender.
 struct RtcpReceiverEventLogMessage {
   RtcpReceiverEventLogMessage();
   ~RtcpReceiverEventLogMessage();
 
   CastLoggingEvent type;
   base::TimeTicks event_timestamp;
   base::TimeDelta delay_delta;
@@ skipping 73 matching lines @@
   // Time of event logged.
   base::TimeTicks timestamp;
 
   // Render/playout delay. Only set for FRAME_PLAYOUT events.
   base::TimeDelta delay_delta;
 
   // Only set for packet events.
   uint16 packet_id;
 };
 
+struct RtcpRttReport {
+  RtcpRttReport();
+  ~RtcpRttReport();
+
+  base::TimeDelta rtt;
+  base::TimeDelta avg_rtt;
+  base::TimeDelta min_rtt;
+  base::TimeDelta max_rtt;
+};
+
+typedef base::Callback<void(const RtcpCastMessage&)> RtcpCastMessageCallback;
+typedef base::Callback<void(base::TimeDelta,
+                            base::TimeDelta,
+                            base::TimeDelta,
+                            base::TimeDelta)> RtcpRttCallback;
+typedef
+base::Callback<void(const RtcpReceiverLogMessage&)> RtcpLogMessageCallback;
+
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RTCP_DEFINES_H_