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

Side by Side Diff: webrtc/modules/pacing/paced_sender.h

Issue 1962303002: Added cluster id to PacedSender::Callback::TimeToSendPacket. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addded probing cluster unittest. Created 4 years, 7 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/pacing/bitrate_prober.cc ('k') | webrtc/modules/pacing/paced_sender.cc » ('j') | 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 24 matching lines...) Expand all
35 public: 35 public:
36 class PacketSender { 36 class PacketSender {
37 public: 37 public:
38 // Note: packets sent as a result of a callback should not pass by this 38 // Note: packets sent as a result of a callback should not pass by this
39 // module again. 39 // module again.
40 // Called when it's time to send a queued packet. 40 // Called when it's time to send a queued packet.
41 // Returns false if packet cannot be sent. 41 // Returns false if packet cannot be sent.
42 virtual bool TimeToSendPacket(uint32_t ssrc, 42 virtual bool TimeToSendPacket(uint32_t ssrc,
43 uint16_t sequence_number, 43 uint16_t sequence_number,
44 int64_t capture_time_ms, 44 int64_t capture_time_ms,
45 bool retransmission) = 0; 45 bool retransmission,
46 int probe_cluster_id) = 0;
46 // Called when it's a good time to send a padding data. 47 // Called when it's a good time to send a padding data.
47 // Returns the number of bytes sent. 48 // Returns the number of bytes sent.
48 virtual size_t TimeToSendPadding(size_t bytes) = 0; 49 virtual size_t TimeToSendPadding(size_t bytes) = 0;
49 50
50 protected: 51 protected:
51 virtual ~PacketSender() {} 52 virtual ~PacketSender() {}
52 }; 53 };
53 54
54 // Expected max pacer delay in ms. If ExpectedQueueTimeMs() is higher than 55 // Expected max pacer delay in ms. If ExpectedQueueTimeMs() is higher than
55 // this value, the packet producers should wait (eg drop frames rather than 56 // this value, the packet producers should wait (eg drop frames rather than
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 int64_t TimeUntilNextProcess() override; 124 int64_t TimeUntilNextProcess() override;
124 125
125 // Process any pending packets in the queue(s). 126 // Process any pending packets in the queue(s).
126 void Process() override; 127 void Process() override;
127 128
128 private: 129 private:
129 // Updates the number of bytes that can be sent for the next time interval. 130 // Updates the number of bytes that can be sent for the next time interval.
130 void UpdateBytesPerInterval(int64_t delta_time_in_ms) 131 void UpdateBytesPerInterval(int64_t delta_time_in_ms)
131 EXCLUSIVE_LOCKS_REQUIRED(critsect_); 132 EXCLUSIVE_LOCKS_REQUIRED(critsect_);
132 133
133 bool SendPacket(const paced_sender::Packet& packet) 134 bool SendPacket(const paced_sender::Packet& packet, int probe_cluster_id)
134 EXCLUSIVE_LOCKS_REQUIRED(critsect_); 135 EXCLUSIVE_LOCKS_REQUIRED(critsect_);
135 void SendPadding(size_t padding_needed) EXCLUSIVE_LOCKS_REQUIRED(critsect_); 136 void SendPadding(size_t padding_needed) EXCLUSIVE_LOCKS_REQUIRED(critsect_);
136 137
137 Clock* const clock_; 138 Clock* const clock_;
138 PacketSender* const packet_sender_; 139 PacketSender* const packet_sender_;
139 140
140 std::unique_ptr<CriticalSectionWrapper> critsect_; 141 std::unique_ptr<CriticalSectionWrapper> critsect_;
141 bool paused_ GUARDED_BY(critsect_); 142 bool paused_ GUARDED_BY(critsect_);
142 bool probing_enabled_; 143 bool probing_enabled_;
143 // This is the media budget, keeping track of how many bits of media 144 // This is the media budget, keeping track of how many bits of media
(...skipping 13 matching lines...) Expand all
157 uint32_t min_send_bitrate_kbps_ GUARDED_BY(critsect_); 158 uint32_t min_send_bitrate_kbps_ GUARDED_BY(critsect_);
158 uint32_t pacing_bitrate_kbps_ GUARDED_BY(critsect_); 159 uint32_t pacing_bitrate_kbps_ GUARDED_BY(critsect_);
159 160
160 int64_t time_last_update_us_ GUARDED_BY(critsect_); 161 int64_t time_last_update_us_ GUARDED_BY(critsect_);
161 162
162 std::unique_ptr<paced_sender::PacketQueue> packets_ GUARDED_BY(critsect_); 163 std::unique_ptr<paced_sender::PacketQueue> packets_ GUARDED_BY(critsect_);
163 uint64_t packet_counter_; 164 uint64_t packet_counter_;
164 }; 165 };
165 } // namespace webrtc 166 } // namespace webrtc
166 #endif // WEBRTC_MODULES_PACING_PACED_SENDER_H_ 167 #endif // WEBRTC_MODULES_PACING_PACED_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/pacing/bitrate_prober.cc ('k') | webrtc/modules/pacing/paced_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698