OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 LOG(LS_INFO) << "UpdateAggregateNetworkState: aggregate_state=" | 620 LOG(LS_INFO) << "UpdateAggregateNetworkState: aggregate_state=" |
621 << (aggregate_state == kNetworkUp ? "up" : "down"); | 621 << (aggregate_state == kNetworkUp ? "up" : "down"); |
622 | 622 |
623 congestion_controller_->SignalNetworkState(aggregate_state); | 623 congestion_controller_->SignalNetworkState(aggregate_state); |
624 } | 624 } |
625 | 625 |
626 void Call::OnSentPacket(const rtc::SentPacket& sent_packet) { | 626 void Call::OnSentPacket(const rtc::SentPacket& sent_packet) { |
627 if (first_packet_sent_ms_ == -1) | 627 if (first_packet_sent_ms_ == -1) |
628 first_packet_sent_ms_ = clock_->TimeInMilliseconds(); | 628 first_packet_sent_ms_ = clock_->TimeInMilliseconds(); |
629 congestion_controller_->OnSentPacket(sent_packet); | 629 congestion_controller_->OnSentPacket(sent_packet); |
| 630 |
| 631 ReadLockScoped read_lock(*send_crit_); |
| 632 for (VideoSendStream* stream : video_send_streams_) { |
| 633 // TODO(asapersson): Use sent_packet.send_time_ms. |
| 634 if (stream->OnSentPacket(sent_packet.packet_id)) |
| 635 return; |
| 636 } |
630 } | 637 } |
631 | 638 |
632 void Call::OnNetworkChanged(uint32_t target_bitrate_bps, uint8_t fraction_loss, | 639 void Call::OnNetworkChanged(uint32_t target_bitrate_bps, uint8_t fraction_loss, |
633 int64_t rtt_ms) { | 640 int64_t rtt_ms) { |
634 uint32_t allocated_bitrate_bps = bitrate_allocator_->OnNetworkChanged( | 641 uint32_t allocated_bitrate_bps = bitrate_allocator_->OnNetworkChanged( |
635 target_bitrate_bps, fraction_loss, rtt_ms); | 642 target_bitrate_bps, fraction_loss, rtt_ms); |
636 | 643 |
637 int pad_up_to_bitrate_bps = 0; | 644 int pad_up_to_bitrate_bps = 0; |
638 { | 645 { |
639 ReadLockScoped read_lock(*send_crit_); | 646 ReadLockScoped read_lock(*send_crit_); |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
798 // thread. Then this check can be enabled. | 805 // thread. Then this check can be enabled. |
799 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); | 806 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); |
800 if (RtpHeaderParser::IsRtcp(packet, length)) | 807 if (RtpHeaderParser::IsRtcp(packet, length)) |
801 return DeliverRtcp(media_type, packet, length); | 808 return DeliverRtcp(media_type, packet, length); |
802 | 809 |
803 return DeliverRtp(media_type, packet, length, packet_time); | 810 return DeliverRtp(media_type, packet, length, packet_time); |
804 } | 811 } |
805 | 812 |
806 } // namespace internal | 813 } // namespace internal |
807 } // namespace webrtc | 814 } // namespace webrtc |
OLD | NEW |