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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
561 for (auto& kv : video_receive_ssrcs_) { | 561 for (auto& kv : video_receive_ssrcs_) { |
562 kv.second->SignalNetworkState(state); | 562 kv.second->SignalNetworkState(state); |
563 } | 563 } |
564 } | 564 } |
565 } | 565 } |
566 | 566 |
567 void Call::OnSentPacket(const rtc::SentPacket& sent_packet) { | 567 void Call::OnSentPacket(const rtc::SentPacket& sent_packet) { |
568 if (first_packet_sent_ms_ == -1) | 568 if (first_packet_sent_ms_ == -1) |
569 first_packet_sent_ms_ = clock_->TimeInMilliseconds(); | 569 first_packet_sent_ms_ = clock_->TimeInMilliseconds(); |
570 congestion_controller_->OnSentPacket(sent_packet); | 570 congestion_controller_->OnSentPacket(sent_packet); |
571 | |
572 ReadLockScoped read_lock(*send_crit_); | |
573 for (VideoSendStream* stream : video_send_streams_) { | |
574 stream->OnSentPacket(sent_packet.packet_id); | |
stefan-webrtc
2015/12/10 08:37:49
Should this method return if the packet belonged t
åsapersson
2015/12/15 14:28:26
Done.
See other comment about per stream.
| |
575 } | |
571 } | 576 } |
572 | 577 |
573 void Call::OnNetworkChanged(uint32_t target_bitrate_bps, uint8_t fraction_loss, | 578 void Call::OnNetworkChanged(uint32_t target_bitrate_bps, uint8_t fraction_loss, |
574 int64_t rtt_ms) { | 579 int64_t rtt_ms) { |
575 uint32_t allocated_bitrate_bps = bitrate_allocator_->OnNetworkChanged( | 580 uint32_t allocated_bitrate_bps = bitrate_allocator_->OnNetworkChanged( |
576 target_bitrate_bps, fraction_loss, rtt_ms); | 581 target_bitrate_bps, fraction_loss, rtt_ms); |
577 | 582 |
578 int pad_up_to_bitrate_bps = 0; | 583 int pad_up_to_bitrate_bps = 0; |
579 { | 584 { |
580 ReadLockScoped read_lock(*send_crit_); | 585 ReadLockScoped read_lock(*send_crit_); |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
737 // thread. Then this check can be enabled. | 742 // thread. Then this check can be enabled. |
738 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); | 743 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); |
739 if (RtpHeaderParser::IsRtcp(packet, length)) | 744 if (RtpHeaderParser::IsRtcp(packet, length)) |
740 return DeliverRtcp(media_type, packet, length); | 745 return DeliverRtcp(media_type, packet, length); |
741 | 746 |
742 return DeliverRtp(media_type, packet, length, packet_time); | 747 return DeliverRtp(media_type, packet, length, packet_time); |
743 } | 748 } |
744 | 749 |
745 } // namespace internal | 750 } // namespace internal |
746 } // namespace webrtc | 751 } // namespace webrtc |
OLD | NEW |