| OLD | NEW |
| 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 Loading... |
| 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); | |
| 272 bwe_->OnPacketsSent(to_transfer); | 270 bwe_->OnPacketsSent(to_transfer); |
| 273 batch->merge(to_transfer, DereferencingComparator<Packet>); | 271 batch->merge(to_transfer, DereferencingComparator<Packet>); |
| 274 } | 272 } |
| 275 | 273 |
| 276 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc, | 274 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc, |
| 277 uint16_t sequence_number, | 275 uint16_t sequence_number, |
| 278 int64_t capture_time_ms, | 276 int64_t capture_time_ms, |
| 279 bool retransmission, | 277 bool retransmission, |
| 280 int probe_cluster_id) { | 278 int probe_cluster_id) { |
| 281 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end(); | 279 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end(); |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 RecordBitrate(); | 478 RecordBitrate(); |
| 481 } | 479 } |
| 482 | 480 |
| 483 uint32_t TcpSender::TargetBitrateKbps() { | 481 uint32_t TcpSender::TargetBitrateKbps() { |
| 484 return bitrate_kbps_; | 482 return bitrate_kbps_; |
| 485 } | 483 } |
| 486 | 484 |
| 487 } // namespace bwe | 485 } // namespace bwe |
| 488 } // namespace testing | 486 } // namespace testing |
| 489 } // namespace webrtc | 487 } // namespace webrtc |
| OLD | NEW |