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

Side by Side Diff: media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc

Issue 178073004: Cast: IPC from browser to renderer to send packet events from transport to cast library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
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/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h" 5 #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h"
6 6
7 #include "base/big_endian.h" 7 #include "base/big_endian.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "media/cast/transport/pacing/paced_sender.h" 9 #include "media/cast/transport/pacing/paced_sender.h"
10 10
(...skipping 13 matching lines...) Expand all
24 max_payload_length(kMaxIpPacketSize - 28), // Default is IP-v4/UDP. 24 max_payload_length(kMaxIpPacketSize - 28), // Default is IP-v4/UDP.
25 sequence_number(0), 25 sequence_number(0),
26 frequency(8000), 26 frequency(8000),
27 ssrc(0), 27 ssrc(0),
28 channels(0) {} 28 channels(0) {}
29 29
30 RtpPacketizerConfig::~RtpPacketizerConfig() {} 30 RtpPacketizerConfig::~RtpPacketizerConfig() {}
31 31
32 RtpPacketizer::RtpPacketizer(PacedSender* const transport, 32 RtpPacketizer::RtpPacketizer(PacedSender* const transport,
33 PacketStorage* packet_storage, 33 PacketStorage* packet_storage,
34 RtpPacketizerConfig rtp_packetizer_config) 34 RtpPacketizerConfig rtp_packetizer_config,
35 base::TickClock* clock,
36 LoggingImpl* logging)
35 : config_(rtp_packetizer_config), 37 : config_(rtp_packetizer_config),
36 transport_(transport), 38 transport_(transport),
37 packet_storage_(packet_storage), 39 packet_storage_(packet_storage),
40 clock_(clock),
41 logging_(logging),
38 sequence_number_(config_.sequence_number), 42 sequence_number_(config_.sequence_number),
39 rtp_timestamp_(0), 43 rtp_timestamp_(0),
40 packet_id_(0), 44 packet_id_(0),
41 send_packets_count_(0), 45 send_packets_count_(0),
42 send_octet_count_(0) { 46 send_octet_count_(0) {
43 DCHECK(transport) << "Invalid argument"; 47 DCHECK(transport) << "Invalid argument";
44 } 48 }
45 49
46 RtpPacketizer::~RtpPacketizer() {} 50 RtpPacketizer::~RtpPacketizer() {}
47 51
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ++packet_id_; 142 ++packet_id_;
139 data_iter += payload_length; 143 data_iter += payload_length;
140 144
141 // Update stats. 145 // Update stats.
142 ++send_packets_count_; 146 ++send_packets_count_;
143 send_octet_count_ += payload_length; 147 send_octet_count_ += payload_length;
144 packets.push_back(packet); 148 packets.push_back(packet);
145 } 149 }
146 DCHECK(packet_id_ == num_packets) << "Invalid state"; 150 DCHECK(packet_id_ == num_packets) << "Invalid state";
147 151
152 logging_->InsertPacketListEvent(
153 clock_->NowTicks(),
154 config_.audio ? kAudioPacketSentToPacer : kVideoPacketSentToPacer,
155 packets);
156
148 // Send to network. 157 // Send to network.
149 transport_->SendPackets(packets); 158 transport_->SendPackets(packets);
150 159
151 // Prepare for next frame. 160 // Prepare for next frame.
152 packet_id_ = 0; 161 packet_id_ = 0;
153 } 162 }
154 163
155 void RtpPacketizer::BuildCommonRTPheader(Packet* packet, 164 void RtpPacketizer::BuildCommonRTPheader(Packet* packet,
156 bool marker_bit, 165 bool marker_bit,
157 uint32 time_stamp) { 166 uint32 time_stamp) {
158 packet->push_back(0x80); 167 packet->push_back(0x80);
159 packet->push_back(static_cast<uint8>(config_.payload_type) | 168 packet->push_back(static_cast<uint8>(config_.payload_type) |
160 (marker_bit ? kRtpMarkerBitMask : 0)); 169 (marker_bit ? kRtpMarkerBitMask : 0));
161 size_t start_size = packet->size(); 170 size_t start_size = packet->size();
162 packet->resize(start_size + 10); 171 packet->resize(start_size + 10);
163 base::BigEndianWriter big_endian_writer( 172 base::BigEndianWriter big_endian_writer(
164 reinterpret_cast<char*>(&((*packet)[start_size])), 10); 173 reinterpret_cast<char*>(&((*packet)[start_size])), 10);
165 big_endian_writer.WriteU16(sequence_number_); 174 big_endian_writer.WriteU16(sequence_number_);
166 big_endian_writer.WriteU32(time_stamp); 175 big_endian_writer.WriteU32(time_stamp);
167 big_endian_writer.WriteU32(config_.ssrc); 176 big_endian_writer.WriteU32(config_.ssrc);
168 ++sequence_number_; 177 ++sequence_number_;
169 } 178 }
170 179
171 } // namespace transport 180 } // namespace transport
172 } // namespace cast 181 } // namespace cast
173 } // namespace media 182 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h ('k') | media/cast/transport/rtp_sender/rtp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698