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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc

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/remote_bitrate_estimator/test/packet_sender.h ('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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 to_transfer.splice(to_transfer.begin(), queue_, queue_.begin(), it); 269 to_transfer.splice(to_transfer.begin(), queue_, queue_.begin(), it);
270 for (Packet* packet : to_transfer) 270 for (Packet* packet : to_transfer)
271 packet->set_paced(true); 271 packet->set_paced(true);
272 bwe_->OnPacketsSent(to_transfer); 272 bwe_->OnPacketsSent(to_transfer);
273 batch->merge(to_transfer, DereferencingComparator<Packet>); 273 batch->merge(to_transfer, DereferencingComparator<Packet>);
274 } 274 }
275 275
276 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc, 276 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc,
277 uint16_t sequence_number, 277 uint16_t sequence_number,
278 int64_t capture_time_ms, 278 int64_t capture_time_ms,
279 bool retransmission) { 279 bool retransmission,
280 int probe_cluster_id) {
280 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end(); 281 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end();
281 ++it) { 282 ++it) {
282 MediaPacket* media_packet = static_cast<MediaPacket*>(*it); 283 MediaPacket* media_packet = static_cast<MediaPacket*>(*it);
283 if (media_packet->header().sequenceNumber == sequence_number) { 284 if (media_packet->header().sequenceNumber == sequence_number) {
284 int64_t pace_out_time_ms = clock_.TimeInMilliseconds(); 285 int64_t pace_out_time_ms = clock_.TimeInMilliseconds();
285 286
286 // Make sure a packet is never paced out earlier than when it was put into 287 // Make sure a packet is never paced out earlier than when it was put into
287 // the pacer. 288 // the pacer.
288 assert(pace_out_time_ms >= media_packet->send_time_ms()); 289 assert(pace_out_time_ms >= media_packet->send_time_ms());
289 290
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 RecordBitrate(); 480 RecordBitrate();
480 } 481 }
481 482
482 uint32_t TcpSender::TargetBitrateKbps() { 483 uint32_t TcpSender::TargetBitrateKbps() {
483 return bitrate_kbps_; 484 return bitrate_kbps_;
484 } 485 }
485 486
486 } // namespace bwe 487 } // namespace bwe
487 } // namespace testing 488 } // namespace testing
488 } // namespace webrtc 489 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/packet_sender.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698