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

Side by Side Diff: media/cast/net/rtcp/rtcp_sender.cc

Issue 387933005: Cast: Refactor RTCP handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: smaller diff Created 6 years, 5 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/rtcp/rtcp_sender.h" 5 #include "media/cast/net/rtcp/rtcp_sender.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/big_endian.h" 12 #include "base/big_endian.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "media/cast/cast_environment.h"
15 #include "media/cast/net/cast_transport_defines.h" 14 #include "media/cast/net/cast_transport_defines.h"
16 #include "media/cast/net/pacing/paced_sender.h" 15 #include "media/cast/net/pacing/paced_sender.h"
17 #include "media/cast/net/rtcp/rtcp_defines.h" 16 #include "media/cast/net/rtcp/rtcp_defines.h"
18 #include "media/cast/net/rtcp/rtcp_utility.h" 17 #include "media/cast/net/rtcp/rtcp_utility.h"
19 18
20 namespace media { 19 namespace media {
21 namespace cast { 20 namespace cast {
22 namespace { 21 namespace {
23 22
24 // Max delta is 4095 milliseconds because we need to be able to encode it in 23 // Max delta is 4095 milliseconds because we need to be able to encode it in
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 private: 138 private:
140 std::ostringstream stream_; 139 std::ostringstream stream_;
141 int frame_count_; 140 int frame_count_;
142 int packet_count_; 141 int packet_count_;
143 int last_frame_id_; 142 int last_frame_id_;
144 int last_packet_id_; 143 int last_packet_id_;
145 bool contiguous_sequence_; 144 bool contiguous_sequence_;
146 }; 145 };
147 } // namespace 146 } // namespace
148 147
149 // TODO(mikhal): This is only used by the receiver. Consider renaming. 148 RtcpSender::RtcpSender(PacedPacketSender* outgoing_transport,
150 RtcpSender::RtcpSender(scoped_refptr<CastEnvironment> cast_environment,
151 PacedPacketSender* outgoing_transport,
152 uint32 sending_ssrc, 149 uint32 sending_ssrc,
153 const std::string& c_name) 150 const std::string& c_name)
154 : ssrc_(sending_ssrc), 151 : ssrc_(sending_ssrc),
155 c_name_(c_name), 152 c_name_(c_name),
156 transport_(outgoing_transport), 153 transport_(outgoing_transport) {
157 cast_environment_(cast_environment) {
158 DCHECK_LT(c_name_.length(), kRtcpCnameSize) << "Invalid config"; 154 DCHECK_LT(c_name_.length(), kRtcpCnameSize) << "Invalid config";
159 } 155 }
160 156
161 RtcpSender::~RtcpSender() {} 157 RtcpSender::~RtcpSender() {}
162 158
163 void RtcpSender::SendRtcpFromRtpReceiver( 159 void RtcpSender::SendRtcpFromRtpReceiver(
164 uint32 packet_type_flags, 160 uint32 packet_type_flags,
165 const RtcpReportBlock* report_block, 161 const RtcpReportBlock* report_block,
166 const RtcpReceiverReferenceTimeReport* rrtr, 162 const RtcpReceiverReferenceTimeReport* rrtr,
167 const RtcpCastMessage* cast_message, 163 const RtcpCastMessage* cast_message,
168 const ReceiverRtcpEventSubscriber::RtcpEventMultiMap* rtcp_events, 164 const ReceiverRtcpEventSubscriber::RtcpEventMultiMap* rtcp_events,
169 base::TimeDelta target_delay) { 165 base::TimeDelta target_delay) {
170 if (packet_type_flags & kRtcpSr || 166 if (packet_type_flags & kRtcpSr ||
171 packet_type_flags & kRtcpDlrr || 167 packet_type_flags & kRtcpDlrr ||
172 packet_type_flags & kRtcpSenderLog) { 168 packet_type_flags & kRtcpSenderLog) {
173 NOTREACHED() << "Invalid argument"; 169 NOTREACHED() << "Invalid argument";
174 } 170 }
175 if (packet_type_flags & kRtcpPli || 171 if (packet_type_flags & kRtcpPli ||
176 packet_type_flags & kRtcpRpsi || 172 packet_type_flags & kRtcpRpsi ||
177 packet_type_flags & kRtcpRemb || 173 packet_type_flags & kRtcpRemb ||
178 packet_type_flags & kRtcpNack) { 174 packet_type_flags & kRtcpNack) {
179 // Implement these for webrtc interop. 175 // Implement these for webrtc interop.
180 NOTIMPLEMENTED(); 176 NOTIMPLEMENTED();
181 } 177 }
182 PacketRef packet(new base::RefCountedData<Packet>); 178 PacketRef packet(new base::RefCountedData<Packet>);
183 packet->data.reserve(kMaxIpPacketSize); 179 packet->data.reserve(kMaxIpPacketSize);
184
185 if (packet_type_flags & kRtcpRr) { 180 if (packet_type_flags & kRtcpRr) {
186 BuildRR(report_block, &packet->data); 181 BuildRR(report_block, &packet->data);
187 if (!c_name_.empty()) { 182 if (!c_name_.empty()) {
188 BuildSdec(&packet->data); 183 BuildSdec(&packet->data);
189 } 184 }
190 } 185 }
191 if (packet_type_flags & kRtcpBye) { 186 if (packet_type_flags & kRtcpBye) {
192 BuildBye(&packet->data); 187 BuildBye(&packet->data);
193 } 188 }
194 if (packet_type_flags & kRtcpRrtr) { 189 if (packet_type_flags & kRtcpRrtr) {
195 DCHECK(rrtr) << "Invalid argument"; 190 DCHECK(rrtr) << "Invalid argument";
196 BuildRrtr(rrtr, &packet->data); 191 BuildRrtr(rrtr, &packet->data);
197 } 192 }
198 if (packet_type_flags & kRtcpCast) { 193 if (packet_type_flags & kRtcpCast) {
199 DCHECK(cast_message) << "Invalid argument"; 194 DCHECK(cast_message) << "Invalid argument";
200 BuildCast(cast_message, target_delay, &packet->data); 195 BuildCast(cast_message, target_delay, &packet->data);
201 } 196 }
202 if (packet_type_flags & kRtcpReceiverLog) { 197 if (packet_type_flags & kRtcpReceiverLog) {
203 DCHECK(rtcp_events) << "Invalid argument"; 198 DCHECK(rtcp_events) << "Invalid argument";
204 BuildReceiverLog(*rtcp_events, &packet->data); 199 BuildReceiverLog(*rtcp_events, &packet->data);
205 } 200 }
206 201
207 if (packet->data.empty()) 202 if (packet->data.empty())
208 return; // Sanity don't send empty packets. 203 return; // Sanity don't send empty packets.
209 204
210 transport_->SendRtcpPacket(ssrc_, packet); 205 transport_->SendRtcpPacket(ssrc_, packet);
211 } 206 }
212 207
208 void RtcpSender::SendRtcpFromRtpSender(
209 uint32 packet_type_flags,
210 const RtcpSenderInfo& sender_info,
211 const RtcpDlrrReportBlock& dlrr) {
212 if (packet_type_flags & kRtcpRr ||
213 packet_type_flags & kRtcpPli ||
214 packet_type_flags & kRtcpRrtr ||
215 packet_type_flags & kRtcpCast ||
216 packet_type_flags & kRtcpReceiverLog ||
217 packet_type_flags & kRtcpRpsi ||
218 packet_type_flags & kRtcpRemb ||
219 packet_type_flags & kRtcpNack) {
220 NOTREACHED() << "Invalid argument";
221 }
222 PacketRef packet(new base::RefCountedData<Packet>);
223 packet->data.reserve(kMaxIpPacketSize);
224 if (packet_type_flags & kRtcpSr) {
225 BuildSR(sender_info, &packet->data);
226 BuildSdec(&packet->data);
227 }
228 if (packet_type_flags & kRtcpBye) {
229 BuildBye(&packet->data);
230 }
231 if (packet_type_flags & kRtcpDlrr) {
232 BuildDlrrRb(dlrr, &packet->data);
233 }
234 if (packet->data.empty())
235 return; // Sanity - don't send empty packets.
miu 2014/07/16 19:58:02 I wonder if there should be a NOTREACHED() here?
Alpha Left Google 2014/07/17 01:01:46 Done.
236
237 transport_->SendRtcpPacket(ssrc_, packet);
238 }
239
213 void RtcpSender::BuildRR(const RtcpReportBlock* report_block, 240 void RtcpSender::BuildRR(const RtcpReportBlock* report_block,
214 Packet* packet) const { 241 Packet* packet) const {
215 size_t start_size = packet->size(); 242 size_t start_size = packet->size();
216 DCHECK_LT(start_size + 32, kMaxIpPacketSize) << "Not enough buffer space"; 243 DCHECK_LT(start_size + 32, kMaxIpPacketSize) << "Not enough buffer space";
217 if (start_size + 32 > kMaxIpPacketSize) 244 if (start_size + 32 > kMaxIpPacketSize)
218 return; 245 return;
219 246
220 uint16 number_of_rows = (report_block) ? 7 : 1; 247 uint16 number_of_rows = (report_block) ? 7 : 1;
221 packet->resize(start_size + 8); 248 packet->resize(start_size + 8);
222 249
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 354
328 /* 355 /*
329 0 1 2 3 356 0 1 2 3
330 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 357 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
331 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 358 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
332 | PB |0| Payload Type| Native Rpsi bit string | 359 | PB |0| Payload Type| Native Rpsi bit string |
333 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 360 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
334 | defined per codec ... | Padding (0) | 361 | defined per codec ... | Padding (0) |
335 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 362 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
336 */ 363 */
337 void RtcpSender::BuildRpsi(const RtcpRpsiMessage* rpsi, Packet* packet) const { 364 void RtcpSender::BuildRpsi(const RtcpRpsiMessage* rpsi,
365 Packet* packet) const {
338 size_t start_size = packet->size(); 366 size_t start_size = packet->size();
339 DCHECK_LT(start_size + 24, kMaxIpPacketSize) << "Not enough buffer space"; 367 DCHECK_LT(start_size + 24, kMaxIpPacketSize) << "Not enough buffer space";
340 if (start_size + 24 > kMaxIpPacketSize) 368 if (start_size + 24 > kMaxIpPacketSize)
341 return; 369 return;
342 370
343 packet->resize(start_size + 24); 371 packet->resize(start_size + 24);
344 372
345 base::BigEndianWriter big_endian_writer( 373 base::BigEndianWriter big_endian_writer(
346 reinterpret_cast<char*>(&((*packet)[start_size])), 24); 374 reinterpret_cast<char*>(&((*packet)[start_size])), 24);
347 uint8 FMT = 3; // Reference Picture Selection Indication. 375 uint8 FMT = 3; // Reference Picture Selection Indication.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 } 409 }
382 // Add last byte of picture ID. 410 // Add last byte of picture ID.
383 big_endian_writer.WriteU8(static_cast<uint8>(rpsi->picture_id & 0x7f)); 411 big_endian_writer.WriteU8(static_cast<uint8>(rpsi->picture_id & 0x7f));
384 412
385 // Add padding. 413 // Add padding.
386 for (int j = 0; j < padding_bytes; ++j) { 414 for (int j = 0; j < padding_bytes; ++j) {
387 big_endian_writer.WriteU8(0); 415 big_endian_writer.WriteU8(0);
388 } 416 }
389 } 417 }
390 418
391 void RtcpSender::BuildRemb(const RtcpRembMessage* remb, Packet* packet) const { 419 void RtcpSender::BuildRemb(const RtcpRembMessage* remb,
420 Packet* packet) const {
392 size_t start_size = packet->size(); 421 size_t start_size = packet->size();
393 size_t remb_size = 20 + 4 * remb->remb_ssrcs.size(); 422 size_t remb_size = 20 + 4 * remb->remb_ssrcs.size();
394 DCHECK_LT(start_size + remb_size, kMaxIpPacketSize) 423 DCHECK_LT(start_size + remb_size, kMaxIpPacketSize)
395 << "Not enough buffer space"; 424 << "Not enough buffer space";
396 if (start_size + remb_size > kMaxIpPacketSize) 425 if (start_size + remb_size > kMaxIpPacketSize)
397 return; 426 return;
398 427
399 packet->resize(start_size + remb_size); 428 packet->resize(start_size + remb_size);
400 429
401 base::BigEndianWriter big_endian_writer( 430 base::BigEndianWriter big_endian_writer(
(...skipping 20 matching lines...) Expand all
422 (bitrate_exponent << 2) + ((bitrate_mantissa >> 16) & 0x03))); 451 (bitrate_exponent << 2) + ((bitrate_mantissa >> 16) & 0x03)));
423 big_endian_writer.WriteU8(static_cast<uint8>(bitrate_mantissa >> 8)); 452 big_endian_writer.WriteU8(static_cast<uint8>(bitrate_mantissa >> 8));
424 big_endian_writer.WriteU8(static_cast<uint8>(bitrate_mantissa)); 453 big_endian_writer.WriteU8(static_cast<uint8>(bitrate_mantissa));
425 454
426 std::list<uint32>::const_iterator it = remb->remb_ssrcs.begin(); 455 std::list<uint32>::const_iterator it = remb->remb_ssrcs.begin();
427 for (; it != remb->remb_ssrcs.end(); ++it) { 456 for (; it != remb->remb_ssrcs.end(); ++it) {
428 big_endian_writer.WriteU32(*it); 457 big_endian_writer.WriteU32(*it);
429 } 458 }
430 } 459 }
431 460
432 void RtcpSender::BuildNack(const RtcpNackMessage* nack, Packet* packet) const { 461 void RtcpSender::BuildNack(const RtcpNackMessage* nack,
462 Packet* packet) const {
433 size_t start_size = packet->size(); 463 size_t start_size = packet->size();
434 DCHECK_LT(start_size + 16, kMaxIpPacketSize) << "Not enough buffer space"; 464 DCHECK_LT(start_size + 16, kMaxIpPacketSize) << "Not enough buffer space";
435 if (start_size + 16 > kMaxIpPacketSize) 465 if (start_size + 16 > kMaxIpPacketSize)
436 return; 466 return;
437 467
438 packet->resize(start_size + 16); 468 packet->resize(start_size + 16);
439 469
440 base::BigEndianWriter big_endian_writer( 470 base::BigEndianWriter big_endian_writer(
441 reinterpret_cast<char*>(&((*packet)[start_size])), 16); 471 reinterpret_cast<char*>(&((*packet)[start_size])), 16);
442 472
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 } 644 }
615 VLOG_IF(1, !nack_string_builder.Empty()) 645 VLOG_IF(1, !nack_string_builder.Empty())
616 << "SSRC: " << cast->media_ssrc_ 646 << "SSRC: " << cast->media_ssrc_
617 << ", ACK: " << cast->ack_frame_id_ 647 << ", ACK: " << cast->ack_frame_id_
618 << ", NACK: " << nack_string_builder.GetString(); 648 << ", NACK: " << nack_string_builder.GetString();
619 DCHECK_LE(number_of_loss_fields, kRtcpMaxCastLossFields); 649 DCHECK_LE(number_of_loss_fields, kRtcpMaxCastLossFields);
620 (*packet)[cast_size_pos] = static_cast<uint8>(4 + number_of_loss_fields); 650 (*packet)[cast_size_pos] = static_cast<uint8>(4 + number_of_loss_fields);
621 (*packet)[cast_loss_field_pos] = static_cast<uint8>(number_of_loss_fields); 651 (*packet)[cast_loss_field_pos] = static_cast<uint8>(number_of_loss_fields);
622 } 652 }
623 653
654 void RtcpSender::BuildSR(const RtcpSenderInfo& sender_info,
655 Packet* packet) const {
656 // Sender report.
657 size_t start_size = packet->size();
658 if (start_size + 52 > kMaxIpPacketSize) {
659 DLOG(FATAL) << "Not enough buffer space";
660 return;
661 }
662
663 uint16 number_of_rows = 6;
664 packet->resize(start_size + 28);
665
666 base::BigEndianWriter big_endian_writer(
667 reinterpret_cast<char*>(&((*packet)[start_size])), 28);
668 big_endian_writer.WriteU8(0x80);
669 big_endian_writer.WriteU8(kPacketTypeSenderReport);
670 big_endian_writer.WriteU16(number_of_rows);
671 big_endian_writer.WriteU32(ssrc_);
672 big_endian_writer.WriteU32(sender_info.ntp_seconds);
673 big_endian_writer.WriteU32(sender_info.ntp_fraction);
674 big_endian_writer.WriteU32(sender_info.rtp_timestamp);
675 big_endian_writer.WriteU32(sender_info.send_packet_count);
676 big_endian_writer.WriteU32(static_cast<uint32>(sender_info.send_octet_count));
677 return;
678 }
679
680 /*
681 0 1 2 3
682 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
683 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
684 |V=2|P|reserved | PT=XR=207 | length |
685 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
686 | SSRC |
687 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
688 | BT=5 | reserved | block length |
689 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
690 | SSRC1 (SSRC of first receiver) | sub-
691 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ block
692 | last RR (LRR) | 1
693 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
694 | delay since last RR (DLRR) |
695 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
696 */
697 void RtcpSender::BuildDlrrRb(const RtcpDlrrReportBlock& dlrr,
698 Packet* packet) const {
699 size_t start_size = packet->size();
700 if (start_size + 24 > kMaxIpPacketSize) {
701 DLOG(FATAL) << "Not enough buffer space";
702 return;
703 }
704
705 packet->resize(start_size + 24);
706
707 base::BigEndianWriter big_endian_writer(
708 reinterpret_cast<char*>(&((*packet)[start_size])), 24);
709 big_endian_writer.WriteU8(0x80);
710 big_endian_writer.WriteU8(kPacketTypeXr);
711 big_endian_writer.WriteU16(5); // Length.
712 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC.
713 big_endian_writer.WriteU8(5); // Add block type.
714 big_endian_writer.WriteU8(0); // Add reserved.
715 big_endian_writer.WriteU16(3); // Block length.
716 big_endian_writer.WriteU32(ssrc_); // Add the media (received RTP) SSRC.
717 big_endian_writer.WriteU32(dlrr.last_rr);
718 big_endian_writer.WriteU32(dlrr.delay_since_last_rr);
719 return;
720 }
721
624 void RtcpSender::BuildReceiverLog( 722 void RtcpSender::BuildReceiverLog(
625 const ReceiverRtcpEventSubscriber::RtcpEventMultiMap& rtcp_events, 723 const ReceiverRtcpEventSubscriber::RtcpEventMultiMap& rtcp_events,
626 Packet* packet) { 724 Packet* packet) {
627 const size_t packet_start_size = packet->size(); 725 const size_t packet_start_size = packet->size();
628 size_t number_of_frames = 0; 726 size_t number_of_frames = 0;
629 size_t total_number_of_messages_to_send = 0; 727 size_t total_number_of_messages_to_send = 0;
630 size_t rtcp_log_size = 0; 728 size_t rtcp_log_size = 0;
631 RtcpReceiverLogMessage receiver_log_message; 729 RtcpReceiverLogMessage receiver_log_message;
632 730
633 if (!BuildRtcpReceiverLogMessage(rtcp_events, 731 if (!BuildRtcpReceiverLogMessage(rtcp_events,
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 << "Not enough buffer space."; 916 << "Not enough buffer space.";
819 917
820 VLOG(3) << "number of frames: " << *number_of_frames; 918 VLOG(3) << "number of frames: " << *number_of_frames;
821 VLOG(3) << "total messages to send: " << *total_number_of_messages_to_send; 919 VLOG(3) << "total messages to send: " << *total_number_of_messages_to_send;
822 VLOG(3) << "rtcp log size: " << *rtcp_log_size; 920 VLOG(3) << "rtcp log size: " << *rtcp_log_size;
823 return *number_of_frames > 0; 921 return *number_of_frames > 0;
824 } 922 }
825 923
826 } // namespace cast 924 } // namespace cast
827 } // namespace media 925 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698