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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.h

Issue 2005313003: Propagate probing cluster id to SendTimeHistory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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
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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 size_t rtp_packet_length, 204 size_t rtp_packet_length,
205 const RTPHeader& rtp_header, 205 const RTPHeader& rtp_header,
206 bool is_voiced, 206 bool is_voiced,
207 uint8_t dBov) const; 207 uint8_t dBov) const;
208 208
209 bool UpdateVideoRotation(uint8_t* rtp_packet, 209 bool UpdateVideoRotation(uint8_t* rtp_packet,
210 size_t rtp_packet_length, 210 size_t rtp_packet_length,
211 const RTPHeader& rtp_header, 211 const RTPHeader& rtp_header,
212 VideoRotation rotation) const override; 212 VideoRotation rotation) const override;
213 213
214 bool TimeToSendPacket(uint16_t sequence_number, int64_t capture_time_ms, 214 bool TimeToSendPacket(uint16_t sequence_number,
215 bool retransmission); 215 int64_t capture_time_ms,
216 size_t TimeToSendPadding(size_t bytes); 216 bool retransmission,
217 int probe_cluster_id);
218 size_t TimeToSendPadding(size_t bytes, int probe_cluster_id);
217 219
218 // NACK. 220 // NACK.
219 int SelectiveRetransmissions() const; 221 int SelectiveRetransmissions() const;
220 int SetSelectiveRetransmissions(uint8_t settings); 222 int SetSelectiveRetransmissions(uint8_t settings);
221 void OnReceivedNACK(const std::list<uint16_t>& nack_sequence_numbers, 223 void OnReceivedNACK(const std::list<uint16_t>& nack_sequence_numbers,
222 int64_t avg_rtt); 224 int64_t avg_rtt);
223 225
224 void SetStorePacketsStatus(bool enable, uint16_t number_to_store); 226 void SetStorePacketsStatus(bool enable, uint16_t number_to_store);
225 227
226 bool StorePackets() const; 228 bool StorePackets() const;
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 uint32_t timestamp, 332 uint32_t timestamp,
331 uint16_t sequence_number, 333 uint16_t sequence_number,
332 const std::vector<uint32_t>& csrcs) const; 334 const std::vector<uint32_t>& csrcs) const;
333 335
334 void UpdateNACKBitRate(uint32_t bytes, int64_t now); 336 void UpdateNACKBitRate(uint32_t bytes, int64_t now);
335 337
336 bool PrepareAndSendPacket(uint8_t* buffer, 338 bool PrepareAndSendPacket(uint8_t* buffer,
337 size_t length, 339 size_t length,
338 int64_t capture_time_ms, 340 int64_t capture_time_ms,
339 bool send_over_rtx, 341 bool send_over_rtx,
340 bool is_retransmit); 342 bool is_retransmit,
343 int probe_cluster_id);
341 344
342 // Return the number of bytes sent. Note that both of these functions may 345 // Return the number of bytes sent. Note that both of these functions may
343 // return a larger value that their argument. 346 // return a larger value that their argument.
344 size_t TrySendRedundantPayloads(size_t bytes); 347 size_t TrySendRedundantPayloads(size_t bytes, int probe_cluster_id);
345 348
346 void BuildPaddingPacket(uint8_t* packet, 349 void BuildPaddingPacket(uint8_t* packet,
347 size_t header_length, 350 size_t header_length,
348 size_t padding_length); 351 size_t padding_length);
349 352
350 void BuildRtxPacket(uint8_t* buffer, size_t* length, 353 void BuildRtxPacket(uint8_t* buffer, size_t* length,
351 uint8_t* buffer_rtx); 354 uint8_t* buffer_rtx);
352 355
353 bool SendPacketToNetwork(const uint8_t* packet, 356 bool SendPacketToNetwork(const uint8_t* packet,
354 size_t size, 357 size_t size,
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 // that the target bitrate is still valid. 503 // that the target bitrate is still valid.
501 rtc::CriticalSection target_bitrate_critsect_; 504 rtc::CriticalSection target_bitrate_critsect_;
502 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); 505 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
503 506
504 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender); 507 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTPSender);
505 }; 508 };
506 509
507 } // namespace webrtc 510 } // namespace webrtc
508 511
509 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 512 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698