Index: media/cast/net/rtp/rtp_sender.h |
diff --git a/media/cast/transport/rtp_sender/rtp_sender.h b/media/cast/net/rtp/rtp_sender.h |
similarity index 80% |
rename from media/cast/transport/rtp_sender/rtp_sender.h |
rename to media/cast/net/rtp/rtp_sender.h |
index 8fe840f9c43c033c5e76e5ca5f369a8be86ef9ed..cdc073209f3a6f62f4ca249f443b21a97bb4a95c 100644 |
--- a/media/cast/transport/rtp_sender/rtp_sender.h |
+++ b/media/cast/net/rtp/rtp_sender.h |
@@ -4,29 +4,27 @@ |
// This file contains the interface to the cast RTP sender. |
-#ifndef MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_SENDER_H_ |
-#define MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_SENDER_H_ |
+#ifndef MEDIA_CAST_NET_RTP_RTP_SENDER_H_ |
+#define MEDIA_CAST_NET_RTP_RTP_SENDER_H_ |
#include <map> |
#include <set> |
#include "base/memory/scoped_ptr.h" |
+#include "base/memory/weak_ptr.h" |
#include "base/time/tick_clock.h" |
#include "base/time/time.h" |
-#include "base/memory/weak_ptr.h" |
#include "media/cast/cast_config.h" |
#include "media/cast/cast_environment.h" |
-#include "media/cast/transport/cast_transport_defines.h" |
-#include "media/cast/transport/cast_transport_sender.h" |
-#include "media/cast/transport/pacing/paced_sender.h" |
-#include "media/cast/transport/rtp_sender/packet_storage/packet_storage.h" |
-#include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.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/rtp/packet_storage.h" |
+#include "media/cast/net/rtp/rtp_packetizer.h" |
namespace media { |
namespace cast { |
-namespace transport { |
- |
// 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 |
@@ -74,8 +72,7 @@ class RtpSender { |
DISALLOW_COPY_AND_ASSIGN(RtpSender); |
}; |
-} // namespace transport |
} // namespace cast |
} // namespace media |
-#endif // MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_SENDER_H_ |
+#endif // MEDIA_CAST_NET_RTP_SENDER_RTP_SENDER_H_ |