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

Unified Diff: media/cast/net/rtcp/rtcp_builder.cc

Issue 427733002: Cast: Remove unused RTCP messages (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/net/rtcp/rtcp_builder.h ('k') | media/cast/net/rtcp/rtcp_builder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/rtcp/rtcp_builder.cc
diff --git a/media/cast/net/rtcp/rtcp_builder.cc b/media/cast/net/rtcp/rtcp_builder.cc
index a5673a33f23cf12b157f8691c55ba6e392bdb710..f2626d3582d71d8bbf6d1a07af9c5d6d0cc970ae 100644
--- a/media/cast/net/rtcp/rtcp_builder.cc
+++ b/media/cast/net/rtcp/rtcp_builder.cc
@@ -27,29 +27,21 @@ void RtcpBuilder::SendRtcpFromRtpSender(
uint32 packet_type_flags,
const RtcpSenderInfo& sender_info,
const RtcpDlrrReportBlock& dlrr,
- uint32 sending_ssrc,
- const std::string& c_name) {
+ uint32 sending_ssrc) {
if (packet_type_flags & kRtcpRr ||
- packet_type_flags & kRtcpPli ||
packet_type_flags & kRtcpRrtr ||
packet_type_flags & kRtcpCast ||
packet_type_flags & kRtcpReceiverLog ||
- packet_type_flags & kRtcpRpsi ||
- packet_type_flags & kRtcpRemb ||
packet_type_flags & kRtcpNack) {
NOTREACHED() << "Invalid argument";
}
ssrc_ = sending_ssrc;
- c_name_ = c_name;
PacketRef packet(new base::RefCountedData<Packet>);
packet->data.reserve(kMaxIpPacketSize);
if (packet_type_flags & kRtcpSr) {
if (!BuildSR(sender_info, &packet->data)) return;
if (!BuildSdec(&packet->data)) return;
}
- if (packet_type_flags & kRtcpBye) {
- if (!BuildBye(&packet->data)) return;
- }
if (packet_type_flags & kRtcpDlrr) {
if (!BuildDlrrRb(dlrr, &packet->data)) return;
}
@@ -85,70 +77,6 @@ bool RtcpBuilder::BuildSR(const RtcpSenderInfo& sender_info,
return true;
}
-bool RtcpBuilder::BuildSdec(Packet* packet) const {
- size_t start_size = packet->size();
- if (start_size + 12 + c_name_.length() > kMaxIpPacketSize) {
- DLOG(FATAL) << "Not enough buffer space";
- return false;
- }
-
- // SDES Source Description.
- packet->resize(start_size + 10);
-
- base::BigEndianWriter big_endian_writer(
- reinterpret_cast<char*>(&((*packet)[start_size])), 10);
- // We always need to add one SDES CNAME.
- big_endian_writer.WriteU8(0x80 + 1);
- big_endian_writer.WriteU8(kPacketTypeSdes);
-
- // Handle SDES length later on.
- uint32 sdes_length_position = static_cast<uint32>(start_size) + 3;
- big_endian_writer.WriteU16(0);
- big_endian_writer.WriteU32(ssrc_); // Add our own SSRC.
- big_endian_writer.WriteU8(1); // CNAME = 1
- big_endian_writer.WriteU8(static_cast<uint8>(c_name_.length()));
-
- size_t sdes_length = 10 + c_name_.length();
- packet->insert(packet->end(), c_name_.c_str(),
- c_name_.c_str() + c_name_.length());
-
- size_t padding = 0;
-
- // We must have a zero field even if we have an even multiple of 4 bytes.
- if ((packet->size() % 4) == 0) {
- padding++;
- packet->push_back(0);
- }
- while ((packet->size() % 4) != 0) {
- padding++;
- packet->push_back(0);
- }
- sdes_length += padding;
-
- // In 32-bit words minus one and we don't count the header.
- uint8 buffer_length = static_cast<uint8>((sdes_length / 4) - 1);
- (*packet)[sdes_length_position] = buffer_length;
- return true;
-}
-
-bool RtcpBuilder::BuildBye(Packet* packet) const {
- size_t start_size = packet->size();
- if (start_size + 8 > kMaxIpPacketSize) {
- DLOG(FATAL) << "Not enough buffer space";
- return false;
- }
-
- packet->resize(start_size + 8);
-
- base::BigEndianWriter big_endian_writer(
- reinterpret_cast<char*>(&((*packet)[start_size])), 8);
- big_endian_writer.WriteU8(0x80 + 1);
- big_endian_writer.WriteU8(kPacketTypeBye);
- big_endian_writer.WriteU16(1); // Length.
- big_endian_writer.WriteU32(ssrc_); // Add our own SSRC.
- return true;
-}
-
/*
0 1 2 3
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
« no previous file with comments | « media/cast/net/rtcp/rtcp_builder.h ('k') | media/cast/net/rtcp/rtcp_builder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698