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

Side by Side 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 6 years, 12 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/net/rtp_sender/rtp_packetizer/rtp_packetizer.h" 5 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/cast/cast_defines.h" 8 #include "media/cast/transport/pacing/paced_sender.h"
9 #include "media/cast/net/pacing/paced_sender.h"
10 #include "net/base/big_endian.h" 9 #include "net/base/big_endian.h"
11 10
12 namespace media { 11 namespace media {
13 namespace cast { 12 namespace cast {
13 namespace transport {
14 14
15 static const uint16 kCommonRtpHeaderLength = 12; 15 static const uint16 kCommonRtpHeaderLength = 12;
16 static const uint16 kCastRtpHeaderLength = 7; 16 static const uint16 kCastRtpHeaderLength = 7;
17 static const uint8 kCastKeyFrameBitMask = 0x80; 17 static const uint8 kCastKeyFrameBitMask = 0x80;
18 static const uint8 kCastReferenceFrameIdBitMask = 0x40; 18 static const uint8 kCastReferenceFrameIdBitMask = 0x40;
19 static const uint8 kRtpMarkerBitMask = 0x80;
20
21
22 RtpPacketizerConfig::RtpPacketizerConfig()
23 : audio(false),
24 payload_type(-1),
25 max_payload_length(kIpPacketSize - 28), // Default is IP-v4/UDP.
26 sequence_number(0),
27 rtp_timestamp(0),
28 frequency(8000),
29 ssrc(0),
30 channels(0) {}
31
32 RtpPacketizerConfig::~RtpPacketizerConfig() {}
19 33
20 RtpPacketizer::RtpPacketizer(PacedPacketSender* transport, 34 RtpPacketizer::RtpPacketizer(PacedPacketSender* transport,
21 PacketStorage* packet_storage, 35 PacketStorage* packet_storage,
22 RtpPacketizerConfig rtp_packetizer_config) 36 RtpPacketizerConfig rtp_packetizer_config)
23 : config_(rtp_packetizer_config), 37 : config_(rtp_packetizer_config),
24 transport_(transport), 38 transport_(transport),
25 packet_storage_(packet_storage), 39 packet_storage_(packet_storage),
26 sequence_number_(config_.sequence_number), 40 sequence_number_(config_.sequence_number),
27 rtp_timestamp_(config_.rtp_timestamp), 41 rtp_timestamp_(config_.rtp_timestamp),
28 packet_id_(0), 42 packet_id_(0),
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 (marker_bit ? kRtpMarkerBitMask : 0)); 156 (marker_bit ? kRtpMarkerBitMask : 0));
143 size_t start_size = packet->size(); 157 size_t start_size = packet->size();
144 packet->resize(start_size + 10); 158 packet->resize(start_size + 10);
145 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); 159 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10);
146 big_endian_writer.WriteU16(sequence_number_); 160 big_endian_writer.WriteU16(sequence_number_);
147 big_endian_writer.WriteU32(time_stamp); 161 big_endian_writer.WriteU32(time_stamp);
148 big_endian_writer.WriteU32(config_.ssrc); 162 big_endian_writer.WriteU32(config_.ssrc);
149 ++sequence_number_; 163 ++sequence_number_;
150 } 164 }
151 165
166 } // namespace transport
152 } // namespace cast 167 } // namespace cast
153 } // namespace media 168 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698