Cast: move net->transport

media/cast/rtcp/rtcp.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_H_
 #define MEDIA_CAST_RTCP_RTCP_H_
 
 #include <list>
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/rtcp/rtcp_defines.h"
+#include "media/cast/transport/cast_transport_defines.h"
+#include "media/cast/transport/pacing/paced_sender.h"
+#include "media/cast/transport/rtcp/rtcp_builder.h"
 
 namespace media {
 namespace cast {
 
 class LocalRtcpReceiverFeedback;
 class LocalRtcpRttFeedback;
-class RtcpBuilder;
 class PacedPacketSender;
 class RtcpReceiver;
 class RtcpSender;
 
 typedef std::pair<uint32, base::TimeTicks> RtcpSendTimePair;
 typedef std::map<uint32, base::TimeTicks> RtcpSendTimeMap;
 typedef std::queue<RtcpSendTimePair> RtcpSendTimeQueue;
 
 class RtcpSenderFeedback {
  public:
   virtual void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback) = 0;
 
   virtual ~RtcpSenderFeedback() {}
 };
 
 class RtpSenderStatistics {
  public:
   virtual void GetStatistics(const base::TimeTicks& now,
-                             RtcpSenderInfo* sender_info) = 0;
+                             transport::RtcpSenderInfo* sender_info) = 0;
 
   virtual ~RtpSenderStatistics() {}
 };
 
 class RtpReceiverStatistics {
  public:
   virtual void GetStatistics(uint8* fraction_lost,
                              uint32* cumulative_lost,  // 24 bits valid.
                              uint32* extended_high_sequence_number,
                              uint32* jitter) = 0;
 
   virtual ~RtpReceiverStatistics() {}
 };
 
 class Rtcp {
  public:
   Rtcp(scoped_refptr<CastEnvironment> cast_environment,
        RtcpSenderFeedback* sender_feedback,
-       PacedPacketSender* paced_packet_sender,
+       transport::PacedPacketSender* paced_packet_sender,
        RtpSenderStatistics* rtp_sender_statistics,
        RtpReceiverStatistics* rtp_receiver_statistics,
        RtcpMode rtcp_mode,
        const base::TimeDelta& rtcp_interval,
        uint32 local_ssrc,
        uint32 remote_ssrc,
        const std::string& c_name);
 
   virtual ~Rtcp();
 
   static bool IsRtcpPacket(const uint8* rtcp_buffer, size_t length);
 
   static uint32 GetSsrcOfSender(const uint8* rtcp_buffer, size_t length);
 
   base::TimeTicks TimeToSendNextRtcpReport();
   // |sender_log_message| is optional; without it no log messages will be
   // attached to the RTCP report; instead a normal RTCP send report will be
   // sent.
   // Additionally if all messages in |sender_log_message| does
   // not fit in the packet the |sender_log_message| will contain the remaining
   // unsent messages.
-  void SendRtcpFromRtpSender(RtcpSenderLogMessage* sender_log_message);
+  void SendRtcpFromRtpSender(
+      transport::RtcpSenderLogMessage* sender_log_message);
 
   // |cast_message| and |receiver_log| is optional; if |cast_message| is
   // provided the RTCP receiver report will append a Cast message containing
   // Acks and Nacks; if |receiver_log| is provided the RTCP receiver report will
   // append the log messages. If no argument is set a normal RTCP receiver
   // report will be sent. Additionally if all messages in |receiver_log| does
   // not fit in the packet the |receiver_log| will contain the remaining unsent
   // messages.
   void SendRtcpFromRtpReceiver(const RtcpCastMessage* cast_message,
                                RtcpReceiverLogMessage* receiver_log);
@@ skipping 44 matching lines @@
   const uint32 local_ssrc_;
   const uint32 remote_ssrc_;
 
   // Not owned by this class.
   RtpSenderStatistics* const rtp_sender_statistics_;
   RtpReceiverStatistics* const rtp_receiver_statistics_;
 
   scoped_ptr<LocalRtcpRttFeedback> rtt_feedback_;
   scoped_ptr<LocalRtcpReceiverFeedback> receiver_feedback_;
   scoped_ptr<RtcpSender> rtcp_sender_;
-  scoped_ptr<RtcpBuilder> rtcp_builder_;
+  scoped_ptr<transport::RtcpBuilder> rtcp_builder_;
   scoped_ptr<RtcpReceiver> rtcp_receiver_;
 
   base::TimeTicks next_time_to_send_rtcp_;
   RtcpSendTimeMap last_reports_sent_map_;
   RtcpSendTimeQueue last_reports_sent_queue_;
   base::TimeTicks time_last_report_received_;
   uint32 last_report_received_;
 
   uint32 last_received_rtp_timestamp_;
   uint32 last_received_ntp_seconds_;
   uint32 last_received_ntp_fraction_;
 
   base::TimeDelta rtt_;
   base::TimeDelta min_rtt_;
   base::TimeDelta max_rtt_;
   int number_of_rtt_in_avg_;
   float avg_rtt_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(Rtcp);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_RTCP_RTCP_H_