Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Unified Diff: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h

Issue 100823015: Cast: move net->transport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating transport callback Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
diff --git a/media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.h b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
similarity index 74%
rename from media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.h
rename to media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
index 9f9be5fe1634c96a7e420b40c5bb1f8ff0f2f28f..a69044c7df8c2f79f05bc66e4bdf42e967fe63e5 100644
--- a/media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.h
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
@@ -2,22 +2,45 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_CAST_NET_RTP_SENDER_RTP_PACKETIZER_RTP_PACKETIZER_H_
-#define MEDIA_CAST_NET_RTP_SENDER_RTP_PACKETIZER_RTP_PACKETIZER_H_
+#ifndef MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_PACKETIZER_RTP_PACKETIZER_H_
+#define MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_PACKETIZER_RTP_PACKETIZER_H_
#include <cmath>
#include <list>
#include <map>
#include "base/time/time.h"
-#include "media/cast/net/rtp_sender/packet_storage/packet_storage.h"
-#include "media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer_config.h"
+#include "media/cast/transport/rtp_sender/packet_storage/packet_storage.h"
namespace media {
namespace cast {
+namespace transport {
class PacedPacketSender;
+struct RtpPacketizerConfig {
+ RtpPacketizerConfig();
+ ~RtpPacketizerConfig();
+
+ // General.
+ bool audio;
+ int payload_type;
+ uint16 max_payload_length;
+ uint16 sequence_number;
+ uint32 rtp_timestamp;
+ int frequency;
+
+ // SSRC.
+ unsigned int ssrc;
+
+ // Video.
+ VideoCodec video_codec;
+
+ // Audio.
+ uint8 channels;
+ AudioCodec audio_codec;
+};
+
// This object is only called from the main cast thread.
// This class break encoded audio and video frames into packets and add an RTP
// header to each packet.
@@ -67,7 +90,8 @@ class RtpPacketizer {
size_t send_octet_count_;
};
+} // namespace transport
} // namespace cast
} // namespace media
-#endif // MEDIA_CAST_NET_RTP_SENDER_RTP_PACKETIZER_RTP_PACKETIZER_H_
+#endif // MEDIA_CAST_TRANSPORT_RTP_SENDER_RTP_PACKETIZER_RTP_PACKETIZER_H_

Powered by Google App Engine
This is Rietveld 408576698