Cast: move net->transport

media/cast/transport/rtp_sender/rtp_sender.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.
 
 // This file contains the interface to the cast RTP sender.
 
-#ifndef MEDIA_CAST_NET_RTP_SENDER_RTP_SENDER_H_
-#define MEDIA_CAST_NET_RTP_SENDER_RTP_SENDER_H_
+#ifndef MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_SENDER_H_
+#define MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_SENDER_H_
 
 #include <map>
 #include <set>
 
 #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_environment.h"
-#include "media/cast/net/rtp_sender/packet_storage/packet_storage.h"
-#include "media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.h"
-#include "media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer_config.h"
+#include "media/cast/transport/rtp_sender/packet_storage/packet_storage.h"
+#include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
 
 namespace media {
 namespace cast {
+namespace transport {
 
 class PacedPacketSender;
-struct RtcpSenderInfo;
 
 // This object is only called from the main cast thread.
 // This class handles splitting encoded audio and video frames into packets and
 // add an RTP header to each packet. The sent packets are stored until they are
 // acknowledged by the remote peer or timed out.
 class RtpSender {
  public:
   RtpSender(scoped_refptr<CastEnvironment> cast_environment,
             const AudioSenderConfig* audio_config,
             const VideoSenderConfig* video_config,
             PacedPacketSender* transport);
 
   ~RtpSender();
 
   // The video_frame objects ownership is handled by the main cast thread.
   void IncomingEncodedVideoFrame(const EncodedVideoFrame* video_frame,
                                  const base::TimeTicks& capture_time);
 
   // The audio_frame objects ownership is handled by the main cast thread.
   void IncomingEncodedAudioFrame(const EncodedAudioFrame* audio_frame,
                                  const base::TimeTicks& recorded_time);
 
   void ResendPackets(const MissingFramesAndPacketsMap& missing_packets);
 
-  void RtpStatistics(const base::TimeTicks& now, RtcpSenderInfo* sender_info);
+  void RtpStatistics(const base::TimeTicks& now,
+                     media::cast::RtcpSenderInfo* sender_info);
 
  private:
   void UpdateSequenceNumber(std::vector<uint8>* packet);
 
   scoped_refptr<CastEnvironment> cast_environment_;
   RtpPacketizerConfig config_;
   scoped_ptr<RtpPacketizer> packetizer_;
   scoped_ptr<PacketStorage> storage_;
   PacedPacketSender* transport_;
 };
 
+}  // namespace transport
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_NET_RTP_SENDER_RTP_SENDER_H_
+#endif  // MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_SENDER_H_