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 30 matching lines...) Expand all Loading... | |
41 } | 41 } |
42 | 42 |
43 bool PacketRouter::TimeToSendPacket(uint32_t ssrc, | 43 bool PacketRouter::TimeToSendPacket(uint32_t ssrc, |
44 uint16_t sequence_number, | 44 uint16_t sequence_number, |
45 int64_t capture_timestamp, | 45 int64_t capture_timestamp, |
46 bool retransmission, | 46 bool retransmission, |
47 int probe_cluster_id) { | 47 int probe_cluster_id) { |
48 RTC_DCHECK(pacer_thread_checker_.CalledOnValidThread()); | 48 RTC_DCHECK(pacer_thread_checker_.CalledOnValidThread()); |
49 rtc::CritScope cs(&modules_crit_); | 49 rtc::CritScope cs(&modules_crit_); |
50 for (auto* rtp_module : rtp_modules_) { | 50 for (auto* rtp_module : rtp_modules_) { |
51 if (rtp_module->SendingMedia() && ssrc == rtp_module->SSRC()) { | 51 if (ssrc == rtp_module->SSRC() || ssrc == rtp_module->FlexfecSsrc()) { |
brandtr
2016/11/11 10:28:16
Moved this check to RTP module itself.
| |
52 return rtp_module->TimeToSendPacket(ssrc, sequence_number, | 52 return rtp_module->TimeToSendPacket(ssrc, sequence_number, |
53 capture_timestamp, retransmission, | 53 capture_timestamp, retransmission, |
54 probe_cluster_id); | 54 probe_cluster_id); |
55 } | 55 } |
56 } | 56 } |
57 return true; | 57 return true; |
58 } | 58 } |
59 | 59 |
60 size_t PacketRouter::TimeToSendPadding(size_t bytes_to_send, | 60 size_t PacketRouter::TimeToSendPadding(size_t bytes_to_send, |
61 int probe_cluster_id) { | 61 int probe_cluster_id) { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 rtc::CritScope cs(&modules_crit_); | 100 rtc::CritScope cs(&modules_crit_); |
101 for (auto* rtp_module : rtp_modules_) { | 101 for (auto* rtp_module : rtp_modules_) { |
102 packet->SetSenderSsrc(rtp_module->SSRC()); | 102 packet->SetSenderSsrc(rtp_module->SSRC()); |
103 if (rtp_module->SendFeedbackPacket(*packet)) | 103 if (rtp_module->SendFeedbackPacket(*packet)) |
104 return true; | 104 return true; |
105 } | 105 } |
106 return false; | 106 return false; |
107 } | 107 } |
108 | 108 |
109 } // namespace webrtc | 109 } // namespace webrtc |
OLD | NEW |