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

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

Issue 2086633002: Revert of Remove audio/video distinction for probe packets. (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) 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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 return; 260 return;
261 } 261 }
262 Packets::iterator it = queue_.begin(); 262 Packets::iterator it = queue_.begin();
263 for (; it != queue_.end(); ++it) { 263 for (; it != queue_.end(); ++it) {
264 if ((*it)->send_time_us() > end_of_batch_time_us) { 264 if ((*it)->send_time_us() > end_of_batch_time_us) {
265 break; 265 break;
266 } 266 }
267 } 267 }
268 Packets to_transfer; 268 Packets to_transfer;
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)
271 packet->set_paced(true);
270 bwe_->OnPacketsSent(to_transfer); 272 bwe_->OnPacketsSent(to_transfer);
271 batch->merge(to_transfer, DereferencingComparator<Packet>); 273 batch->merge(to_transfer, DereferencingComparator<Packet>);
272 } 274 }
273 275
274 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc, 276 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc,
275 uint16_t sequence_number, 277 uint16_t sequence_number,
276 int64_t capture_time_ms, 278 int64_t capture_time_ms,
277 bool retransmission, 279 bool retransmission,
278 int probe_cluster_id) { 280 int probe_cluster_id) {
279 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end(); 281 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end();
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 RecordBitrate(); 480 RecordBitrate();
479 } 481 }
480 482
481 uint32_t TcpSender::TargetBitrateKbps() { 483 uint32_t TcpSender::TargetBitrateKbps() {
482 return bitrate_kbps_; 484 return bitrate_kbps_;
483 } 485 }
484 486
485 } // namespace bwe 487 } // namespace bwe
486 } // namespace testing 488 } // namespace testing
487 } // namespace webrtc 489 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/packet.h ('k') | webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698