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

Side by Side Diff: media/cast/transport/rtcp/rtcp_builder.cc

Issue 138753004: Cast: IPC glue between cast library transport and encoders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reject rtcp packets that are too large Created 6 years, 10 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
« no previous file with comments | « media/cast/transport/rtcp/rtcp_builder.h ('k') | media/cast/transport/rtp_sender/rtp_sender.h » ('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/transport/rtcp/rtcp_builder.h" 5 #include "media/cast/transport/rtcp/rtcp_builder.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 packet_type_flags & kRtcpRpsi || 48 packet_type_flags & kRtcpRpsi ||
49 packet_type_flags & kRtcpRemb || 49 packet_type_flags & kRtcpRemb ||
50 packet_type_flags & kRtcpNack) { 50 packet_type_flags & kRtcpNack) {
51 NOTREACHED() << "Invalid argument"; 51 NOTREACHED() << "Invalid argument";
52 } 52 }
53 ssrc_ = sending_ssrc; 53 ssrc_ = sending_ssrc;
54 c_name_ = c_name; 54 c_name_ = c_name;
55 Packet packet; 55 Packet packet;
56 packet.reserve(kMaxIpPacketSize); 56 packet.reserve(kMaxIpPacketSize);
57 if (packet_type_flags & kRtcpSr) { 57 if (packet_type_flags & kRtcpSr) {
58 BuildSR(sender_info, &packet); 58 if (!BuildSR(sender_info, &packet)) return;
59 BuildSdec(&packet); 59 if (!BuildSdec(&packet)) return;
60 } 60 }
61 if (packet_type_flags & kRtcpBye) { 61 if (packet_type_flags & kRtcpBye) {
62 BuildBye(&packet); 62 if (!BuildBye(&packet)) return;
63 } 63 }
64 if (packet_type_flags & kRtcpDlrr) { 64 if (packet_type_flags & kRtcpDlrr) {
65 BuildDlrrRb(dlrr, &packet); 65 if (!BuildDlrrRb(dlrr, &packet)) return;
66 } 66 }
67 if (packet_type_flags & kRtcpSenderLog) { 67 if (packet_type_flags & kRtcpSenderLog) {
68 BuildSenderLog(sender_log, &packet); 68 if (!BuildSenderLog(sender_log, &packet)) return;
69 } 69 }
70 if (packet.empty()) 70 if (packet.empty())
71 return; // Sanity - don't send empty packets. 71 return; // Sanity - don't send empty packets.
72 72
73 transport_->SendRtcpPacket(packet); 73 transport_->SendRtcpPacket(packet);
74 } 74 }
75 75
76 void RtcpBuilder::BuildSR(const RtcpSenderInfo& sender_info, 76 bool RtcpBuilder::BuildSR(const RtcpSenderInfo& sender_info,
77 Packet* packet) const { 77 Packet* packet) const {
78 // Sender report. 78 // Sender report.
79 size_t start_size = packet->size(); 79 size_t start_size = packet->size();
80 DCHECK_LT(start_size + 52, kMaxIpPacketSize) << "Not enough buffer space"; 80 DCHECK_LT(start_size + 52, kMaxIpPacketSize) << "Not enough buffer space";
81 if (start_size + 52 > kMaxIpPacketSize) return; 81 if (start_size + 52 > kMaxIpPacketSize) return false;
82 82
83 uint16 number_of_rows = 6; 83 uint16 number_of_rows = 6;
84 packet->resize(start_size + 28); 84 packet->resize(start_size + 28);
85 85
86 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 28); 86 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 28);
87 big_endian_writer.WriteU8(0x80); 87 big_endian_writer.WriteU8(0x80);
88 big_endian_writer.WriteU8(kPacketTypeSenderReport); 88 big_endian_writer.WriteU8(kPacketTypeSenderReport);
89 big_endian_writer.WriteU16(number_of_rows); 89 big_endian_writer.WriteU16(number_of_rows);
90 big_endian_writer.WriteU32(ssrc_); 90 big_endian_writer.WriteU32(ssrc_);
91 big_endian_writer.WriteU32(sender_info.ntp_seconds); 91 big_endian_writer.WriteU32(sender_info.ntp_seconds);
92 big_endian_writer.WriteU32(sender_info.ntp_fraction); 92 big_endian_writer.WriteU32(sender_info.ntp_fraction);
93 big_endian_writer.WriteU32(sender_info.rtp_timestamp); 93 big_endian_writer.WriteU32(sender_info.rtp_timestamp);
94 big_endian_writer.WriteU32(sender_info.send_packet_count); 94 big_endian_writer.WriteU32(sender_info.send_packet_count);
95 big_endian_writer.WriteU32(static_cast<uint32>(sender_info.send_octet_count)); 95 big_endian_writer.WriteU32(static_cast<uint32>(sender_info.send_octet_count));
96 return true;
96 } 97 }
97 98
98 void RtcpBuilder::BuildSdec(Packet* packet) const { 99 bool RtcpBuilder::BuildSdec(Packet* packet) const {
99 size_t start_size = packet->size(); 100 size_t start_size = packet->size();
100 DCHECK_LT(start_size + 12 + c_name_.length(), kMaxIpPacketSize) 101 DCHECK_LT(start_size + 12 + c_name_.length(), kMaxIpPacketSize)
101 << "Not enough buffer space"; 102 << "Not enough buffer space";
102 if (start_size + 12 > kMaxIpPacketSize) return; 103 if (start_size + 12 + c_name_.length() > kMaxIpPacketSize) return false;
palmer 2014/02/14 23:53:01 To avoid duplicating the check logic, why not do:
hubbe 2014/02/15 00:00:18 Good idea (except DCHECK() doesn't work, but DLOG(
103 104
104 // SDES Source Description. 105 // SDES Source Description.
105 packet->resize(start_size + 10); 106 packet->resize(start_size + 10);
106 107
107 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); 108 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10);
108 // We always need to add one SDES CNAME. 109 // We always need to add one SDES CNAME.
109 big_endian_writer.WriteU8(0x80 + 1); 110 big_endian_writer.WriteU8(0x80 + 1);
110 big_endian_writer.WriteU8(kPacketTypeSdes); 111 big_endian_writer.WriteU8(kPacketTypeSdes);
111 112
112 // Handle SDES length later on. 113 // Handle SDES length later on.
(...skipping 16 matching lines...) Expand all
129 } 130 }
130 while ((packet->size() % 4) != 0) { 131 while ((packet->size() % 4) != 0) {
131 padding++; 132 padding++;
132 packet->push_back(0); 133 packet->push_back(0);
133 } 134 }
134 sdes_length += padding; 135 sdes_length += padding;
135 136
136 // In 32-bit words minus one and we don't count the header. 137 // In 32-bit words minus one and we don't count the header.
137 uint8 buffer_length = static_cast<uint8>((sdes_length / 4) - 1); 138 uint8 buffer_length = static_cast<uint8>((sdes_length / 4) - 1);
138 (*packet)[sdes_length_position] = buffer_length; 139 (*packet)[sdes_length_position] = buffer_length;
140 return true;
139 } 141 }
140 142
141 void RtcpBuilder::BuildBye(Packet* packet) const { 143 bool RtcpBuilder::BuildBye(Packet* packet) const {
142 size_t start_size = packet->size(); 144 size_t start_size = packet->size();
143 DCHECK_LT(start_size + 8, kMaxIpPacketSize) << "Not enough buffer space"; 145 DCHECK_LT(start_size + 8, kMaxIpPacketSize) << "Not enough buffer space";
144 if (start_size + 8 > kMaxIpPacketSize) return; 146 if (start_size + 8 > kMaxIpPacketSize) return false;
145 147
146 packet->resize(start_size + 8); 148 packet->resize(start_size + 8);
147 149
148 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8); 150 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8);
149 big_endian_writer.WriteU8(0x80 + 1); 151 big_endian_writer.WriteU8(0x80 + 1);
150 big_endian_writer.WriteU8(kPacketTypeBye); 152 big_endian_writer.WriteU8(kPacketTypeBye);
151 big_endian_writer.WriteU16(1); // Length. 153 big_endian_writer.WriteU16(1); // Length.
152 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. 154 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC.
155 return true;
153 } 156 }
154 157
155 /* 158 /*
156 0 1 2 3 159 0 1 2 3
157 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 160 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
158 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 161 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
159 |V=2|P|reserved | PT=XR=207 | length | 162 |V=2|P|reserved | PT=XR=207 | length |
160 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 163 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
161 | SSRC | 164 | SSRC |
162 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 165 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
163 | BT=5 | reserved | block length | 166 | BT=5 | reserved | block length |
164 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 167 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
165 | SSRC_1 (SSRC of first receiver) | sub- 168 | SSRC_1 (SSRC of first receiver) | sub-
166 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ block 169 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ block
167 | last RR (LRR) | 1 170 | last RR (LRR) | 1
168 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 171 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
169 | delay since last RR (DLRR) | 172 | delay since last RR (DLRR) |
170 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 173 +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
171 */ 174 */
172 void RtcpBuilder::BuildDlrrRb(const RtcpDlrrReportBlock& dlrr, 175 bool RtcpBuilder::BuildDlrrRb(const RtcpDlrrReportBlock& dlrr,
173 Packet* packet) const { 176 Packet* packet) const {
174 size_t start_size = packet->size(); 177 size_t start_size = packet->size();
175 DCHECK_LT(start_size + 24, kMaxIpPacketSize) << "Not enough buffer space"; 178 DCHECK_LT(start_size + 24, kMaxIpPacketSize) << "Not enough buffer space";
176 if (start_size + 24 > kMaxIpPacketSize) return; 179 if (start_size + 24 > kMaxIpPacketSize) return true;
177 180
178 packet->resize(start_size + 24); 181 packet->resize(start_size + 24);
179 182
180 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 24); 183 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 24);
181 big_endian_writer.WriteU8(0x80); 184 big_endian_writer.WriteU8(0x80);
182 big_endian_writer.WriteU8(kPacketTypeXr); 185 big_endian_writer.WriteU8(kPacketTypeXr);
183 big_endian_writer.WriteU16(5); // Length. 186 big_endian_writer.WriteU16(5); // Length.
184 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. 187 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC.
185 big_endian_writer.WriteU8(5); // Add block type. 188 big_endian_writer.WriteU8(5); // Add block type.
186 big_endian_writer.WriteU8(0); // Add reserved. 189 big_endian_writer.WriteU8(0); // Add reserved.
187 big_endian_writer.WriteU16(3); // Block length. 190 big_endian_writer.WriteU16(3); // Block length.
188 big_endian_writer.WriteU32(ssrc_); // Add the media (received RTP) SSRC. 191 big_endian_writer.WriteU32(ssrc_); // Add the media (received RTP) SSRC.
189 big_endian_writer.WriteU32(dlrr.last_rr); 192 big_endian_writer.WriteU32(dlrr.last_rr);
190 big_endian_writer.WriteU32(dlrr.delay_since_last_rr); 193 big_endian_writer.WriteU32(dlrr.delay_since_last_rr);
194 return false;
191 } 195 }
192 196
193 void RtcpBuilder::BuildSenderLog(const RtcpSenderLogMessage& sender_log_message, 197 bool RtcpBuilder::BuildSenderLog(const RtcpSenderLogMessage& sender_log_message,
194 Packet* packet) const { 198 Packet* packet) const {
195 DCHECK(packet); 199 DCHECK(packet);
196 size_t start_size = packet->size(); 200 size_t start_size = packet->size();
197 size_t remaining_space = kMaxIpPacketSize - start_size; 201 size_t remaining_space = kMaxIpPacketSize - start_size;
198 DCHECK_GE(remaining_space, kRtcpCastLogHeaderSize + kRtcpSenderFrameLogSize) 202 DCHECK_GE(remaining_space, kRtcpCastLogHeaderSize + kRtcpSenderFrameLogSize)
199 << "Not enough buffer space"; 203 << "Not enough buffer space";
200 if (remaining_space < kRtcpCastLogHeaderSize + kRtcpSenderFrameLogSize) 204 if (remaining_space < kRtcpCastLogHeaderSize + kRtcpSenderFrameLogSize)
201 return; 205 return false;
202 206
203 size_t space_for_x_messages = 207 size_t space_for_x_messages =
204 (remaining_space - kRtcpCastLogHeaderSize) / kRtcpSenderFrameLogSize; 208 (remaining_space - kRtcpCastLogHeaderSize) / kRtcpSenderFrameLogSize;
205 size_t number_of_messages = std::min(space_for_x_messages, 209 size_t number_of_messages = std::min(space_for_x_messages,
206 sender_log_message.size()); 210 sender_log_message.size());
207 211
208 size_t log_size = kRtcpCastLogHeaderSize + 212 size_t log_size = kRtcpCastLogHeaderSize +
209 number_of_messages * kRtcpSenderFrameLogSize; 213 number_of_messages * kRtcpSenderFrameLogSize;
210 packet->resize(start_size + log_size); 214 packet->resize(start_size + log_size);
211 215
212 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), log_size); 216 net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), log_size);
213 big_endian_writer.WriteU8(0x80 + kSenderLogSubtype); 217 big_endian_writer.WriteU8(0x80 + kSenderLogSubtype);
214 big_endian_writer.WriteU8(kPacketTypeApplicationDefined); 218 big_endian_writer.WriteU8(kPacketTypeApplicationDefined);
215 big_endian_writer.WriteU16(static_cast<uint16>(2 + number_of_messages)); 219 big_endian_writer.WriteU16(static_cast<uint16>(2 + number_of_messages));
216 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC. 220 big_endian_writer.WriteU32(ssrc_); // Add our own SSRC.
217 big_endian_writer.WriteU32(kCast); 221 big_endian_writer.WriteU32(kCast);
218 222
219 std::list<RtcpSenderFrameLogMessage>::const_iterator it = 223 std::vector<RtcpSenderFrameLogMessage>::const_iterator it =
220 sender_log_message.begin(); 224 sender_log_message.begin();
221 for (; number_of_messages > 0; --number_of_messages) { 225 for (; number_of_messages > 0; --number_of_messages) {
222 DCHECK(!sender_log_message.empty()); 226 DCHECK(!sender_log_message.empty());
223 const RtcpSenderFrameLogMessage& message = *it; 227 const RtcpSenderFrameLogMessage& message = *it;
224 big_endian_writer.WriteU8(static_cast<uint8>(message.frame_status)); 228 big_endian_writer.WriteU8(static_cast<uint8>(message.frame_status));
225 // We send the 24 east significant bits of the RTP timestamp. 229 // We send the 24 east significant bits of the RTP timestamp.
226 big_endian_writer.WriteU8(static_cast<uint8>(message.rtp_timestamp >> 16)); 230 big_endian_writer.WriteU8(static_cast<uint8>(message.rtp_timestamp >> 16));
227 big_endian_writer.WriteU8(static_cast<uint8>(message.rtp_timestamp >> 8)); 231 big_endian_writer.WriteU8(static_cast<uint8>(message.rtp_timestamp >> 8));
228 big_endian_writer.WriteU8(static_cast<uint8>(message.rtp_timestamp)); 232 big_endian_writer.WriteU8(static_cast<uint8>(message.rtp_timestamp));
229 ++it; 233 ++it;
230 } 234 }
235 return true;
231 } 236 }
232 237
233 } // namespace transport 238 } // namespace transport
234 } // namespace cast 239 } // namespace cast
235 } // namespace media 240 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/transport/rtcp/rtcp_builder.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