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

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: clean up 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 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/cast_defines.h"
9 #include "media/cast/net/pacing/paced_sender.h" 9 #include "media/cast/transport/pacing/paced_sender.h"
10 #include "net/base/big_endian.h" 10 #include "net/base/big_endian.h"
11 11
12 namespace media { 12 namespace media {
13 namespace cast { 13 namespace cast {
14 namespace transport {
14 15
15 static const uint16 kCommonRtpHeaderLength = 12; 16 static const uint16 kCommonRtpHeaderLength = 12;
16 static const uint16 kCastRtpHeaderLength = 7; 17 static const uint16 kCastRtpHeaderLength = 7;
17 static const uint8 kCastKeyFrameBitMask = 0x80; 18 static const uint8 kCastKeyFrameBitMask = 0x80;
18 static const uint8 kCastReferenceFrameIdBitMask = 0x40; 19 static const uint8 kCastReferenceFrameIdBitMask = 0x40;
20 static const uint8 kRtpMarkerBitMask = 0x80;
21
22
23 RtpPacketizerConfig::RtpPacketizerConfig()
24 : audio(false),
25 payload_type(-1),
26 max_payload_length(kIpPacketSize - 28), // Default is IP-v4/UDP.
27 sequence_number(0),
28 rtp_timestamp(0),
29 frequency(8000),
30 ssrc(0),
31 channels(0) {}
32
33 RtpPacketizerConfig::~RtpPacketizerConfig() {}
19 34
20 RtpPacketizer::RtpPacketizer(PacedPacketSender* transport, 35 RtpPacketizer::RtpPacketizer(PacedPacketSender* transport,
21 PacketStorage* packet_storage, 36 PacketStorage* packet_storage,
22 RtpPacketizerConfig rtp_packetizer_config) 37 RtpPacketizerConfig rtp_packetizer_config)
23 : config_(rtp_packetizer_config), 38 : config_(rtp_packetizer_config),
24 transport_(transport), 39 transport_(transport),
25 packet_storage_(packet_storage), 40 packet_storage_(packet_storage),
26 sequence_number_(config_.sequence_number), 41 sequence_number_(config_.sequence_number),
27 rtp_timestamp_(config_.rtp_timestamp), 42 rtp_timestamp_(config_.rtp_timestamp),
28 packet_id_(0), 43 packet_id_(0),
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 (marker_bit ? kRtpMarkerBitMask : 0)); 157 (marker_bit ? kRtpMarkerBitMask : 0));
143 size_t start_size = packet->size(); 158 size_t start_size = packet->size();
144 packet->resize(start_size + 10); 159 packet->resize(start_size + 10);
145 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); 160 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10);
146 big_endian_writer.WriteU16(sequence_number_); 161 big_endian_writer.WriteU16(sequence_number_);
147 big_endian_writer.WriteU32(time_stamp); 162 big_endian_writer.WriteU32(time_stamp);
148 big_endian_writer.WriteU32(config_.ssrc); 163 big_endian_writer.WriteU32(config_.ssrc);
149 ++sequence_number_; 164 ++sequence_number_;
150 } 165 }
151 166
167 } // namespace transport
152 } // namespace cast 168 } // namespace cast
153 } // namespace media 169 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698