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

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

Issue 25544003: Fix code style and gyp files in cast to build cast_unittest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed gyp files Created 7 years, 2 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
« no previous file with comments | « media/cast/rtcp/rtcp_receiver_unittest.cc ('k') | media/cast/rtcp/rtcp_sender_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/rtcp/rtcp_sender.h" 5 #include "media/cast/rtcp/rtcp_sender.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "media/cast/pacing/paced_sender.h" 12 #include "media/cast/pacing/paced_sender.h"
13 #include "media/cast/rtcp/rtcp_utility.h" 13 #include "media/cast/rtcp/rtcp_utility.h"
14 #include "net/base/big_endian.h" 14 #include "net/base/big_endian.h"
15 15
16 namespace media { 16 namespace media {
17 namespace cast { 17 namespace cast {
18 18
19 static const int kRtcpMaxNackFields = 253; 19 static const int kRtcpMaxNackFields = 253;
20 static const int kRtcpMaxCastLossFields = 100; 20 static const int kRtcpMaxCastLossFields = 100;
21 21
22 RtcpSender::RtcpSender(PacedPacketSender* outgoing_transport, 22 RtcpSender::RtcpSender(PacedPacketSender* outgoing_transport,
23 uint32 sending_ssrc, 23 uint32 sending_ssrc,
24 const std::string& c_name) 24 const std::string& c_name)
25 : ssrc_(sending_ssrc), 25 : ssrc_(sending_ssrc),
26 c_name_(c_name), 26 c_name_(c_name),
27 transport_(outgoing_transport) { 27 transport_(outgoing_transport) {
28 DCHECK_LT(c_name_.length(), kRtcpCnameSize) << "Invalid config"; 28 DCHECK_LT(static_cast<int>(c_name_.length()),
29 kRtcpCnameSize) << "Invalid config";
29 } 30 }
30 31
31 RtcpSender::~RtcpSender() {} 32 RtcpSender::~RtcpSender() {}
32 33
33 void RtcpSender::SendRtcp(uint32 packet_type_flags, 34 void RtcpSender::SendRtcp(uint32 packet_type_flags,
34 const RtcpSenderInfo* sender_info, 35 const RtcpSenderInfo* sender_info,
35 const RtcpReportBlock* report_block, 36 const RtcpReportBlock* report_block,
36 uint32 pli_remote_ssrc, 37 uint32 pli_remote_ssrc,
37 const RtcpDlrrReportBlock* dlrr, 38 const RtcpDlrrReportBlock* dlrr,
38 const RtcpReceiverReferenceTimeReport* rrtr, 39 const RtcpReceiverReferenceTimeReport* rrtr,
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 (*packet)[cast_size_pos] = static_cast<uint8>(4 + number_of_loss_fields); 536 (*packet)[cast_size_pos] = static_cast<uint8>(4 + number_of_loss_fields);
536 (*packet)[cast_loss_field_pos] = static_cast<uint8>(number_of_loss_fields); 537 (*packet)[cast_loss_field_pos] = static_cast<uint8>(number_of_loss_fields);
537 538
538 // Frames with missing packets. 539 // Frames with missing packets.
539 TRACE_COUNTER_ID1("cast_rtcp", "RtcpSender::CastNACK", ssrc_, 540 TRACE_COUNTER_ID1("cast_rtcp", "RtcpSender::CastNACK", ssrc_,
540 cast->missing_frames_and_packets_.size()); 541 cast->missing_frames_and_packets_.size());
541 } 542 }
542 543
543 } // namespace cast 544 } // namespace cast
544 } // namespace media 545 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/rtcp/rtcp_receiver_unittest.cc ('k') | media/cast/rtcp/rtcp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698