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

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

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.cc
diff --git a/media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
similarity index 90%
rename from media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.cc
rename to media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
index 8a50f8a8aad702d24dc12e0fa9090cffbcaa92f5..aafe93f696afd889ef20b101bf7bed3241d58b15 100644
--- a/media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.cc
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
@@ -2,20 +2,34 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.h"
+#include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
#include "base/logging.h"
-#include "media/cast/cast_defines.h"
-#include "media/cast/net/pacing/paced_sender.h"
+#include "media/cast/transport/pacing/paced_sender.h"
#include "net/base/big_endian.h"
namespace media {
namespace cast {
+namespace transport {
static const uint16 kCommonRtpHeaderLength = 12;
static const uint16 kCastRtpHeaderLength = 7;
static const uint8 kCastKeyFrameBitMask = 0x80;
static const uint8 kCastReferenceFrameIdBitMask = 0x40;
+static const uint8 kRtpMarkerBitMask = 0x80;
+
+
+RtpPacketizerConfig::RtpPacketizerConfig()
+ : audio(false),
+ payload_type(-1),
+ max_payload_length(kIpPacketSize - 28), // Default is IP-v4/UDP.
+ sequence_number(0),
+ rtp_timestamp(0),
+ frequency(8000),
+ ssrc(0),
+ channels(0) {}
+
+RtpPacketizerConfig::~RtpPacketizerConfig() {}
RtpPacketizer::RtpPacketizer(PacedPacketSender* transport,
PacketStorage* packet_storage,
@@ -149,5 +163,6 @@ void RtpPacketizer::BuildCommonRTPheader(
++sequence_number_;
}
+} // namespace transport
} // namespace cast
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698