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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 to_transfer.splice(to_transfer.begin(), queue_, queue_.begin(), it); | 273 to_transfer.splice(to_transfer.begin(), queue_, queue_.begin(), it); |
274 for (Packet* packet : to_transfer) | 274 for (Packet* packet : to_transfer) |
275 packet->set_paced(true); | 275 packet->set_paced(true); |
276 bwe_->OnPacketsSent(to_transfer); | 276 bwe_->OnPacketsSent(to_transfer); |
277 batch->merge(to_transfer, DereferencingComparator<Packet>); | 277 batch->merge(to_transfer, DereferencingComparator<Packet>); |
278 } | 278 } |
279 | 279 |
280 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc, | 280 bool PacedVideoSender::TimeToSendPacket(uint32_t ssrc, |
281 uint16_t sequence_number, | 281 uint16_t sequence_number, |
282 int64_t capture_time_ms, | 282 int64_t capture_time_ms, |
283 bool retransmission) { | 283 bool retransmission, |
| 284 int cluster_id) { |
284 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end(); | 285 for (Packets::iterator it = pacer_queue_.begin(); it != pacer_queue_.end(); |
285 ++it) { | 286 ++it) { |
286 MediaPacket* media_packet = static_cast<MediaPacket*>(*it); | 287 MediaPacket* media_packet = static_cast<MediaPacket*>(*it); |
287 if (media_packet->header().sequenceNumber == sequence_number) { | 288 if (media_packet->header().sequenceNumber == sequence_number) { |
288 int64_t pace_out_time_ms = clock_.TimeInMilliseconds(); | 289 int64_t pace_out_time_ms = clock_.TimeInMilliseconds(); |
289 | 290 |
290 // Make sure a packet is never paced out earlier than when it was put into | 291 // Make sure a packet is never paced out earlier than when it was put into |
291 // the pacer. | 292 // the pacer. |
292 assert(pace_out_time_ms >= media_packet->send_time_ms()); | 293 assert(pace_out_time_ms >= media_packet->send_time_ms()); |
293 | 294 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 RecordBitrate(); | 486 RecordBitrate(); |
486 } | 487 } |
487 | 488 |
488 uint32_t TcpSender::TargetBitrateKbps() { | 489 uint32_t TcpSender::TargetBitrateKbps() { |
489 return bitrate_kbps_; | 490 return bitrate_kbps_; |
490 } | 491 } |
491 | 492 |
492 } // namespace bwe | 493 } // namespace bwe |
493 } // namespace testing | 494 } // namespace testing |
494 } // namespace webrtc | 495 } // namespace webrtc |
OLD | NEW |