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

Side by Side Diff: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

Issue 2755553003: Ignore packets sent on old network route when receiving feedback. (Closed)
Patch Set: Comments addressed. Created 3 years, 9 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 | « webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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,
273 uint16_t sequence_number,
274 size_t payload_size,
275 uint16_t local_net_id,
276 uint16_t remote_net_id,
277 const PacedPacketInfo& pacing_info)
278 : PacketFeedback(creation_time_ms,
279 -1,
280 -1,
281 sequence_number,
282 payload_size,
283 local_net_id,
284 remote_net_id,
285 pacing_info) {}
286
287 PacketFeedback(int64_t creation_time_ms,
269 int64_t arrival_time_ms, 288 int64_t arrival_time_ms,
270 int64_t send_time_ms, 289 int64_t send_time_ms,
271 uint16_t sequence_number, 290 uint16_t sequence_number,
272 size_t payload_size, 291 size_t payload_size,
292 uint16_t local_net_id,
293 uint16_t remote_net_id,
273 const PacedPacketInfo& pacing_info) 294 const PacedPacketInfo& pacing_info)
274 : creation_time_ms(creation_time_ms), 295 : creation_time_ms(creation_time_ms),
275 arrival_time_ms(arrival_time_ms), 296 arrival_time_ms(arrival_time_ms),
276 send_time_ms(send_time_ms), 297 send_time_ms(send_time_ms),
277 sequence_number(sequence_number), 298 sequence_number(sequence_number),
278 payload_size(payload_size), 299 payload_size(payload_size),
300 local_net_id(local_net_id),
301 remote_net_id(remote_net_id),
279 pacing_info(pacing_info) {} 302 pacing_info(pacing_info) {}
280 303
281 static constexpr int kNotAProbe = -1; 304 static constexpr int kNotAProbe = -1;
282 static constexpr int64_t kNotReceived = -1; 305 static constexpr int64_t kNotReceived = -1;
283 306
284 // NOTE! The variable |creation_time_ms| is not used when testing equality. 307 // 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 308 // This is due to |creation_time_ms| only being used by SendTimeHistory
286 // for book-keeping, and is of no interest outside that class. 309 // for book-keeping, and is of no interest outside that class.
287 // TODO(philipel): Remove |creation_time_ms| from PacketFeedback when cleaning 310 // TODO(philipel): Remove |creation_time_ms| from PacketFeedback when cleaning
288 // up SendTimeHistory. 311 // up SendTimeHistory.
(...skipping 11 matching lines...) Expand all
300 // is used. 323 // is used.
301 int64_t arrival_time_ms; 324 int64_t arrival_time_ms;
302 // Time corresponding to when the packet was sent, timestamped with the 325 // Time corresponding to when the packet was sent, timestamped with the
303 // sender's clock. 326 // sender's clock.
304 int64_t send_time_ms; 327 int64_t send_time_ms;
305 // Packet identifier, incremented with 1 for every packet generated by the 328 // Packet identifier, incremented with 1 for every packet generated by the
306 // sender. 329 // sender.
307 uint16_t sequence_number; 330 uint16_t sequence_number;
308 // Size of the packet excluding RTP headers. 331 // Size of the packet excluding RTP headers.
309 size_t payload_size; 332 size_t payload_size;
333 // The network route ids that this packet is associated with.
334 uint16_t local_net_id;
335 uint16_t remote_net_id;
310 // Pacing information about this packet. 336 // Pacing information about this packet.
311 PacedPacketInfo pacing_info; 337 PacedPacketInfo pacing_info;
312 }; 338 };
313 339
314 class TransportFeedbackObserver { 340 class TransportFeedbackObserver {
315 public: 341 public:
316 TransportFeedbackObserver() {} 342 TransportFeedbackObserver() {}
317 virtual ~TransportFeedbackObserver() {} 343 virtual ~TransportFeedbackObserver() {}
318 344
319 // Note: Transport-wide sequence number as sequence number. 345 // Note: Transport-wide sequence number as sequence number.
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 class TransportSequenceNumberAllocator { 433 class TransportSequenceNumberAllocator {
408 public: 434 public:
409 TransportSequenceNumberAllocator() {} 435 TransportSequenceNumberAllocator() {}
410 virtual ~TransportSequenceNumberAllocator() {} 436 virtual ~TransportSequenceNumberAllocator() {}
411 437
412 virtual uint16_t AllocateSequenceNumber() = 0; 438 virtual uint16_t AllocateSequenceNumber() = 0;
413 }; 439 };
414 440
415 } // namespace webrtc 441 } // namespace webrtc
416 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_ 442 #endif // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_RTCP_DEFINES_H_
OLDNEW
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698