Index: media/cast/rtcp/rtcp_sender.cc |
diff --git a/media/cast/rtcp/rtcp_sender.cc b/media/cast/rtcp/rtcp_sender.cc |
index 41d5d5cc59aa2a0f025fa496184b6ab792ff75d6..9efbb56ba77ab2fad10bfb7a4bf4154eb93457a9 100644 |
--- a/media/cast/rtcp/rtcp_sender.cc |
+++ b/media/cast/rtcp/rtcp_sender.cc |
@@ -195,7 +195,7 @@ void RtcpSender::BuildRR(const transport::RtcpReportBlock* report_block, |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8); |
big_endian_writer.WriteU8(0x80 + (report_block ? 1 : 0)); |
- big_endian_writer.WriteU8(kPacketTypeReceiverReport); |
+ big_endian_writer.WriteU8(transport::kPacketTypeReceiverReport); |
big_endian_writer.WriteU16(number_of_rows); |
big_endian_writer.WriteU32(ssrc_); |
@@ -244,7 +244,7 @@ void RtcpSender::BuildSdec(std::vector<uint8>* packet) const { |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); |
// We always need to add one SDES CNAME. |
big_endian_writer.WriteU8(0x80 + 1); |
- big_endian_writer.WriteU8(kPacketTypeSdes); |
+ big_endian_writer.WriteU8(transport::kPacketTypeSdes); |
// Handle SDES length later on. |
uint32 sdes_length_position = static_cast<uint32>(start_size) + 3; |
@@ -286,7 +286,7 @@ void RtcpSender::BuildPli(uint32 remote_ssrc, |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 12); |
uint8 FMT = 1; // Picture loss indicator. |
big_endian_writer.WriteU8(0x80 + FMT); |
- big_endian_writer.WriteU8(kPacketTypePayloadSpecific); |
+ big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); |
big_endian_writer.WriteU16(2); // Used fixed length of 2. |
big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. |
big_endian_writer.WriteU32(remote_ssrc); // Add the remote SSRC. |
@@ -312,7 +312,7 @@ void RtcpSender::BuildRpsi(const RtcpRpsiMessage* rpsi, |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 24); |
uint8 FMT = 3; // Reference Picture Selection Indication. |
big_endian_writer.WriteU8(0x80 + FMT); |
- big_endian_writer.WriteU8(kPacketTypePayloadSpecific); |
+ big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); |
// Calculate length. |
uint32 bits_required = 7; |
@@ -369,7 +369,7 @@ void RtcpSender::BuildRemb(const RtcpRembMessage* remb, |
// Add application layer feedback. |
uint8 FMT = 15; |
big_endian_writer.WriteU8(0x80 + FMT); |
- big_endian_writer.WriteU8(kPacketTypePayloadSpecific); |
+ big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); |
big_endian_writer.WriteU8(0); |
big_endian_writer.WriteU8(static_cast<uint8>(remb->remb_ssrcs.size() + 4)); |
big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. |
@@ -410,7 +410,7 @@ void RtcpSender::BuildNack(const RtcpNackMessage* nack, |
uint8 FMT = 1; |
big_endian_writer.WriteU8(0x80 + FMT); |
- big_endian_writer.WriteU8(kPacketTypeGenericRtpFeedback); |
+ big_endian_writer.WriteU8(transport::kPacketTypeGenericRtpFeedback); |
big_endian_writer.WriteU8(0); |
size_t nack_size_pos = start_size + 3; |
big_endian_writer.WriteU8(3); |
@@ -462,7 +462,7 @@ void RtcpSender::BuildBye(std::vector<uint8>* packet) const { |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8); |
big_endian_writer.WriteU8(0x80 + 1); |
- big_endian_writer.WriteU8(kPacketTypeBye); |
+ big_endian_writer.WriteU8(transport::kPacketTypeBye); |
big_endian_writer.WriteU16(1); // Length. |
big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. |
} |
@@ -478,7 +478,7 @@ void RtcpSender::BuildRrtr(const RtcpReceiverReferenceTimeReport* rrtr, |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 20); |
big_endian_writer.WriteU8(0x80); |
- big_endian_writer.WriteU8(kPacketTypeXr); |
+ big_endian_writer.WriteU8(transport::kPacketTypeXr); |
big_endian_writer.WriteU16(4); // Length. |
big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. |
big_endian_writer.WriteU8(4); // Add block type. |
@@ -501,7 +501,7 @@ void RtcpSender::BuildCast(const RtcpCastMessage* cast, |
net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 20); |
uint8 FMT = 15; // Application layer feedback. |
big_endian_writer.WriteU8(0x80 + FMT); |
- big_endian_writer.WriteU8(kPacketTypePayloadSpecific); |
+ big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); |
big_endian_writer.WriteU8(0); |
size_t cast_size_pos = start_size + 3; // Save length position. |
big_endian_writer.WriteU8(4); |
@@ -588,7 +588,7 @@ void RtcpSender::BuildReceiverLog(RtcpReceiverLogMessage* receiver_log_message, |
net::BigEndianWriter big_endian_writer(&((*packet)[packet_start_size]), |
rtcp_log_size); |
big_endian_writer.WriteU8(0x80 + kReceiverLogSubtype); |
- big_endian_writer.WriteU8(kPacketTypeApplicationDefined); |
+ big_endian_writer.WriteU8(transport::kPacketTypeApplicationDefined); |
big_endian_writer.WriteU16(static_cast<uint16>(2 + 2 * number_of_frames + |
total_number_of_messages_to_send)); |
big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. |