cast: Split Rtcp into two for sender and receiver

media/cast/net/rtcp/receiver_rtcp_session.h

Index: media/cast/net/rtcp/receiver_rtcp_session.h
diff --git a/media/cast/net/rtcp/rtcp.h b/media/cast/net/rtcp/receiver_rtcp_session.h
similarity index 40%
copy from media/cast/net/rtcp/rtcp.h
copy to media/cast/net/rtcp/receiver_rtcp_session.h
index 96f5147e5123b3f0d8042ed585cddc8b404a2c7b..bd228e3d7ba54ff81e6e515312bc047334d42cbb 100644
--- a/media/cast/net/rtcp/rtcp.h
+++ b/media/cast/net/rtcp/receiver_rtcp_session.h
@@ -1,93 +1,56 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 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.
 
-// This class maintains a bi-directional RTCP connection with a remote
-// peer.
+#ifndef MEDIA_CAST_NET_RTCP_RECEIVER_RTCP_SESSION_H_
+#define MEDIA_CAST_NET_RTCP_RECEIVER_RTCP_SESSION_H_
 
-#ifndef MEDIA_CAST_RTCP_RTCP_H_
-#define MEDIA_CAST_RTCP_RTCP_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-#include <map>
-#include <queue>
-#include <string>
-
-#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "base/time/tick_clock.h"
-#include "base/time/time.h"
 #include "media/cast/common/clock_drift_smoother.h"
-#include "media/cast/net/cast_transport_defines.h"
-#include "media/cast/net/cast_transport_sender.h"
+#include "media/cast/net/pacing/paced_sender.h"
 #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h"
-#include "media/cast/net/rtcp/rtcp_builder.h"
+#include "media/cast/net/rtcp/receiver_rtcp_session.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
+#include "media/cast/net/rtcp/rtcp_session.h"
 #include "media/cast/net/rtcp/rtcp_utility.h"
 
 namespace media {
 namespace cast {
 
-class LocalRtcpReceiverFeedback;
-class PacedPacketSender;
-class RtcpReceiver;
-class RtcpBuilder;
+// This class represents a RTCP session on a RTP receiver. It provides an
+// interface to send RTCP reports (last report, RRTR, cast feedback, logs).
+//
+// The RTCP session on a receiver handles incoming RTCP SR packets and maintains
+// the offset of local clock from the remote clock and lip sync info (RTP
+// & NTP timestamps).
+class ReceiverRtcpSession : public RtcpSession {
+ public:
+  ReceiverRtcpSession(base::TickClock* clock,            // Not owned.
+                      PacedPacketSender* packet_sender,  // Not owned.
+                      uint32_t local_ssrc,
+                      uint32_t remote_ssrc);
 
-typedef std::pair<uint32_t, base::TimeTicks> RtcpSendTimePair;
-typedef std::map<uint32_t, base::TimeTicks> RtcpSendTimeMap;
-typedef std::queue<RtcpSendTimePair> RtcpSendTimeQueue;
+  ~ReceiverRtcpSession() override;
 
-// TODO(hclam): This should be renamed to RtcpSession.
-class Rtcp {
- public:
-  Rtcp(const RtcpCastMessageCallback& cast_callback,
-       const RtcpRttCallback& rtt_callback,
-       const RtcpLogMessageCallback& log_callback,
-       base::TickClock* clock,            // Not owned.
-       PacedPacketSender* packet_sender,  // Not owned.
-       uint32_t local_ssrc,
-       uint32_t remote_ssrc);
-
-  virtual ~Rtcp();
-
-  // Send a RTCP sender report.
-  // |current_time| is the current time reported by a tick clock.
-  // |current_time_as_rtp_timestamp| is the corresponding RTP timestamp.
-  // |send_packet_count| is the number of packets sent.
-  // |send_octet_count| is the number of octets sent.
-  void SendRtcpFromRtpSender(base::TimeTicks current_time,
-                             RtpTimeTicks current_time_as_rtp_timestamp,
-                             uint32_t send_packet_count,
-                             size_t send_octet_count);
-
-  // This function is meant to be used in conjunction with
-  // SendRtcpFromRtpReceiver.
-  // |now| is converted to NTP and saved internally for
-  // future round-trip/lip-sync calculations.
-  // This is done in a separate method so that SendRtcpFromRtpReceiver can
-  // be done on a separate (temporary) RTCP object.
-  RtcpTimeData ConvertToNTPAndSave(base::TimeTicks now);
+  uint32_t local_ssrc() const { return local_ssrc_; }
+  uint32_t remote_ssrc() const { return remote_ssrc_; }
 
   // |cast_message|, |rtcp_events| and |rtp_receiver_statistics| are optional;
   // if |cast_message| is provided the RTCP receiver report will append a Cast
   // message containing Acks and Nacks; |target_delay| is sent together with
   // |cast_message|. If |rtcp_events| is provided the RTCP receiver report will
   // append the log messages.
-  void SendRtcpFromRtpReceiver(
+  void SendRtcpReport(
       RtcpTimeData time_data,
       const RtcpCastMessage* cast_message,
       base::TimeDelta target_delay,
       const ReceiverRtcpEventSubscriber::RtcpEvents* rtcp_events,
       const RtpReceiverStatistics* rtp_receiver_statistics) const;
 
-  // Submit a received packet to this object. The packet will be parsed
-  // and used to maintain a RTCP session.
-  // Returns false if this is not a RTCP packet or it is not directed to
+  // Handle incoming RTCP packet.
+  // Returns false if it is not a RTCP packet or it is not directed to
   // this session, e.g. SSRC doesn't match.
-  bool IncomingRtcpPacket(const uint8_t* data, size_t length);
+  bool IncomingRtcpPacket(const uint8_t* data, size_t length) override;
 
   // If available, returns true and sets the output arguments to the latest
   // lip-sync timestamps gleaned from the sender reports.  While the sender
@@ -97,56 +60,20 @@ class Rtcp {
   bool GetLatestLipSyncTimes(RtpTimeTicks* rtp_timestamp,
                              base::TimeTicks* reference_time) const;
 
-  void OnReceivedReceiverLog(const RtcpReceiverLogMessage& receiver_log);
-
-  // If greater than zero, this is the last measured network round trip time.
-  base::TimeDelta current_round_trip_time() const {
-    return current_round_trip_time_;
-  }
-
-  static bool IsRtcpPacket(const uint8_t* packet, size_t length);
-  static uint32_t GetSsrcOfSender(const uint8_t* rtcp_buffer, size_t length);
-
-  uint32_t GetLocalSsrc() const { return local_ssrc_; }
-  uint32_t GetRemoteSsrc() const { return remote_ssrc_; }
-
- protected:
+ private:
+  // Received NTP timestamps from RTCP SR packets.
   void OnReceivedNtp(uint32_t ntp_seconds, uint32_t ntp_fraction);
+
+  // Received RTP and NTP timestamps from RTCP SR packets.
   void OnReceivedLipSyncInfo(RtpTimeTicks rtp_timestamp,
                              uint32_t ntp_seconds,
                              uint32_t ntp_fraction);
 
- private:
-  void OnReceivedDelaySinceLastReport(uint32_t last_report,
-                                      uint32_t delay_since_last_report);
-
-  void OnReceivedCastFeedback(const RtcpCastMessage& cast_message);
-
-  void SaveLastSentNtpTime(const base::TimeTicks& now,
-                           uint32_t last_ntp_seconds,
-                           uint32_t last_ntp_fraction);
-
-  // Remove duplicate events in |receiver_log|.
-  // Returns true if any events remain.
-  bool DedupeReceiverLog(RtcpReceiverLogMessage* receiver_log);
-
-  const RtcpCastMessageCallback cast_callback_;
-  const RtcpRttCallback rtt_callback_;
-  const RtcpLogMessageCallback log_callback_;
-  base::TickClock* const clock_;  // Not owned by this class.
-  RtcpBuilder rtcp_builder_;
+  base::TickClock* const clock_;      // Not owned.
   PacedPacketSender* packet_sender_;  // Not owned.
   const uint32_t local_ssrc_;
   const uint32_t remote_ssrc_;
 
-  // The RTCP packet parser is re-used when parsing each RTCP packet.  It
-  // remembers state about prior RTP timestamps and other sequence values to
-  // re-construct "expanded" values.
-  RtcpParser parser_;
-
-  RtcpSendTimeMap last_reports_sent_map_;
-  RtcpSendTimeQueue last_reports_sent_queue_;
-
   // The truncated (i.e., 64-->32-bit) NTP timestamp provided in the last report
   // from the remote peer, along with the local time at which the report was
   // received.  These values are used for ping-pong'ing NTP timestamps between
@@ -156,7 +83,7 @@ class Rtcp {
 
   // Maintains a smoothed offset between the local clock and the remote clock.
   // Calling this member's Current() method is only valid if
-  // |time_last_report_received_| is not "null."
+  // |time_last_report_received_| has a valid value.
   ClockDriftSmoother local_clock_ahead_by_;
 
   // Latest "lip sync" info from the sender.  The sender provides the RTP
@@ -167,25 +94,15 @@ class Rtcp {
   RtpTimeTicks lip_sync_rtp_timestamp_;
   uint64_t lip_sync_ntp_timestamp_;
 
-  // The last measured network round trip time.  This is updated with each
-  // sender report --> receiver report round trip.  If this is zero, then the
-  // round trip time has not been measured yet.
-  base::TimeDelta current_round_trip_time_;
-
-  base::TimeTicks largest_seen_timestamp_;
-
-  // For extending received ACK frame IDs from 8-bit to 32-bit.
-  FrameIdWrapHelper ack_frame_id_wrap_helper_;
-
-  // Maintains a history of receiver events.
-  typedef std::pair<uint64_t, uint64_t> ReceiverEventKey;
-  base::hash_set<ReceiverEventKey> receiver_event_key_set_;
-  std::queue<ReceiverEventKey> receiver_event_key_queue_;
+  // The RTCP packet parser is re-used when parsing each RTCP packet.  It
+  // remembers state about prior RTP timestamps and other sequence values to
+  // re-construct "expanded" values.
+  RtcpParser parser_;
 
-  DISALLOW_COPY_AND_ASSIGN(Rtcp);
+  DISALLOW_COPY_AND_ASSIGN(ReceiverRtcpSession);
 };
 
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_RTCP_RTCP_H_
+#endif  // MEDIA_CAST_NET_RTCP_RECEIVER_RTCP_SESSION_H_