OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 virtual ~RtcpBandwidthObserver() {} | 244 virtual ~RtcpBandwidthObserver() {} |
245 }; | 245 }; |
246 | 246 |
247 struct PacketFeedback { | 247 struct PacketFeedback { |
248 PacketFeedback(int64_t arrival_time_ms, uint16_t sequence_number) | 248 PacketFeedback(int64_t arrival_time_ms, uint16_t sequence_number) |
249 : PacketFeedback(-1, | 249 : PacketFeedback(-1, |
250 arrival_time_ms, | 250 arrival_time_ms, |
251 -1, | 251 -1, |
252 sequence_number, | 252 sequence_number, |
253 0, | 253 0, |
| 254 0, |
| 255 0, |
254 PacedPacketInfo()) {} | 256 PacedPacketInfo()) {} |
255 | 257 |
256 PacketFeedback(int64_t arrival_time_ms, | 258 PacketFeedback(int64_t arrival_time_ms, |
257 int64_t send_time_ms, | 259 int64_t send_time_ms, |
258 uint16_t sequence_number, | 260 uint16_t sequence_number, |
259 size_t payload_size, | 261 size_t payload_size, |
260 const PacedPacketInfo& pacing_info) | 262 const PacedPacketInfo& pacing_info) |
261 : PacketFeedback(-1, | 263 : PacketFeedback(-1, |
262 arrival_time_ms, | 264 arrival_time_ms, |
263 send_time_ms, | 265 send_time_ms, |
264 sequence_number, | 266 sequence_number, |
265 payload_size, | 267 payload_size, |
| 268 0, |
| 269 0, |
266 pacing_info) {} | 270 pacing_info) {} |
267 | 271 |
268 PacketFeedback(int64_t creation_time_ms, | 272 PacketFeedback(int64_t creation_time_ms, |
269 int64_t arrival_time_ms, | 273 int64_t arrival_time_ms, |
270 int64_t send_time_ms, | 274 int64_t send_time_ms, |
271 uint16_t sequence_number, | 275 uint16_t sequence_number, |
272 size_t payload_size, | 276 size_t payload_size, |
| 277 uint16_t local_net_id, |
| 278 uint16_t remote_net_id, |
273 const PacedPacketInfo& pacing_info) | 279 const PacedPacketInfo& pacing_info) |
274 : creation_time_ms(creation_time_ms), | 280 : creation_time_ms(creation_time_ms), |
275 arrival_time_ms(arrival_time_ms), | 281 arrival_time_ms(arrival_time_ms), |
276 send_time_ms(send_time_ms), | 282 send_time_ms(send_time_ms), |
277 sequence_number(sequence_number), | 283 sequence_number(sequence_number), |
278 payload_size(payload_size), | 284 payload_size(payload_size), |
| 285 local_net_id(local_net_id), |
| 286 remote_net_id(remote_net_id), |
279 pacing_info(pacing_info) {} | 287 pacing_info(pacing_info) {} |
280 | 288 |
281 static constexpr int kNotAProbe = -1; | 289 static constexpr int kNotAProbe = -1; |
282 static constexpr int64_t kNotReceived = -1; | 290 static constexpr int64_t kNotReceived = -1; |
283 | 291 |
284 // NOTE! The variable |creation_time_ms| is not used when testing equality. | 292 // NOTE! The variable |creation_time_ms| is not used when testing equality. |
285 // This is due to |creation_time_ms| only being used by SendTimeHistory | 293 // This is due to |creation_time_ms| only being used by SendTimeHistory |
286 // for book-keeping, and is of no interest outside that class. | 294 // for book-keeping, and is of no interest outside that class. |
287 // TODO(philipel): Remove |creation_time_ms| from PacketFeedback when cleaning | 295 // TODO(philipel): Remove |creation_time_ms| from PacketFeedback when cleaning |
288 // up SendTimeHistory. | 296 // up SendTimeHistory. |
(...skipping 11 matching lines...) Expand all Loading... |
300 // is used. | 308 // is used. |
301 int64_t arrival_time_ms; | 309 int64_t arrival_time_ms; |
302 // Time corresponding to when the packet was sent, timestamped with the | 310 // Time corresponding to when the packet was sent, timestamped with the |
303 // sender's clock. | 311 // sender's clock. |
304 int64_t send_time_ms; | 312 int64_t send_time_ms; |
305 // Packet identifier, incremented with 1 for every packet generated by the | 313 // Packet identifier, incremented with 1 for every packet generated by the |
306 // sender. | 314 // sender. |
307 uint16_t sequence_number; | 315 uint16_t sequence_number; |
308 // Size of the packet excluding RTP headers. | 316 // Size of the packet excluding RTP headers. |
309 size_t payload_size; | 317 size_t payload_size; |
| 318 // The network route ids that this packet is associated with. |
| 319 uint16_t local_net_id; |
| 320 uint16_t remote_net_id; |
310 // Pacing information about this packet. | 321 // Pacing information about this packet. |
311 PacedPacketInfo pacing_info; | 322 PacedPacketInfo pacing_info; |
312 }; | 323 }; |
313 | 324 |
314 class TransportFeedbackObserver { | 325 class TransportFeedbackObserver { |
315 public: | 326 public: |
316 TransportFeedbackObserver() {} | 327 TransportFeedbackObserver() {} |
317 virtual ~TransportFeedbackObserver() {} | 328 virtual ~TransportFeedbackObserver() {} |
318 | 329 |
319 // Note: Transport-wide sequence number as sequence number. | 330 // Note: Transport-wide sequence number as sequence number. |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 class TransportSequenceNumberAllocator { | 418 class TransportSequenceNumberAllocator { |
408 public: | 419 public: |
409 TransportSequenceNumberAllocator() {} | 420 TransportSequenceNumberAllocator() {} |
410 virtual ~TransportSequenceNumberAllocator() {} | 421 virtual ~TransportSequenceNumberAllocator() {} |
411 | 422 |
412 virtual uint16_t AllocateSequenceNumber() = 0; | 423 virtual uint16_t AllocateSequenceNumber() = 0; |
413 }; | 424 }; |
414 | 425 |
415 } // namespace webrtc | 426 } // namespace webrtc |
416 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ | 427 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ |
OLD | NEW |