Cast: Refactor RTCP handling

media/cast/net/rtcp/rtcp_receiver.h

Index: media/cast/net/rtcp/rtcp_receiver.h
diff --git a/media/cast/net/rtcp/rtcp_receiver.h b/media/cast/net/rtcp/rtcp_receiver.h
index c5d60dbc153b053cfb314c234f04797079766f3b..4c6a33c16190460b0bc8a3d568afafbd2f2e50c8 100644
--- a/media/cast/net/rtcp/rtcp_receiver.h
+++ b/media/cast/net/rtcp/rtcp_receiver.h
@@ -16,7 +16,8 @@
 namespace media {
 namespace cast {
 
-class RtcpReceiverFeedback {
+// Interface for receiving RTCP messages.
+class RtcpMessageHandler {
  public:
   virtual void OnReceivedSenderReport(
       const RtcpSenderInfo& remote_sender_info) = 0;
@@ -24,33 +25,29 @@ class RtcpReceiverFeedback {
   virtual void OnReceiverReferenceTimeReport(
       const RtcpReceiverReferenceTimeReport& remote_time_report) = 0;
 
-  virtual void OnReceivedSendReportRequest() = 0;
-
   virtual void OnReceivedReceiverLog(
       const RtcpReceiverLogMessage& receiver_log) = 0;
 
-  virtual ~RtcpReceiverFeedback() {}
-};
-
-class RtcpRttFeedback {
- public:
   virtual void OnReceivedDelaySinceLastReport(
-      uint32 receivers_ssrc,
       uint32 last_report,
       uint32 delay_since_last_report) = 0;
 
-  virtual ~RtcpRttFeedback() {}
+  virtual void OnReceivedCastFeedback(
+      const RtcpCastMessage& cast_message) = 0;
+
+  virtual ~RtcpMessageHandler() {}
 };
 
 class RtcpReceiver {
  public:
-  explicit RtcpReceiver(scoped_refptr<CastEnvironment> cast_environment,
-                        RtcpSenderFeedback* sender_feedback,
-                        RtcpReceiverFeedback* receiver_feedback,
-                        RtcpRttFeedback* rtt_feedback,
+  explicit RtcpReceiver(RtcpMessageHandler* handler,

[miu, 2014/07/16 00:09:32]

Don't need explicit keyword here.

[Alpha Left Google, 2014/07/17 01:01:45]

Done.

                         uint32 local_ssrc);
   virtual ~RtcpReceiver();
 
+  static bool IsRtcpPacket(const uint8* rtcp_buffer, size_t length);
+
+  static uint32 GetSsrcOfSender(const uint8* rtcp_buffer, size_t length);
+
   void SetRemoteSSRC(uint32 ssrc);
 
   // Set the history size to record Cast receiver events. Event history is
@@ -111,10 +108,7 @@ class RtcpReceiver {
   uint32 remote_ssrc_;
 
   // Not owned by this class.
-  RtcpSenderFeedback* const sender_feedback_;
-  RtcpReceiverFeedback* const receiver_feedback_;
-  RtcpRttFeedback* const rtt_feedback_;
-  scoped_refptr<CastEnvironment> cast_environment_;
+  RtcpMessageHandler* const handler_;
 
   FrameIdWrapHelper ack_frame_id_wrap_helper_;