Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Side by Side Diff: webrtc/modules/pacing/packet_router.cc

Issue 2491293002: Make FlexFEC packets paceable through RTPSender. (Closed)
Patch Set: Feedback response 3. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 (!rtp_module->SendingMedia())
52 continue;
53 if (ssrc == rtp_module->SSRC() || ssrc == rtp_module->FlexfecSsrc()) {
52 return rtp_module->TimeToSendPacket(ssrc, sequence_number, 54 return rtp_module->TimeToSendPacket(ssrc, sequence_number,
53 capture_timestamp, retransmission, 55 capture_timestamp, retransmission,
54 probe_cluster_id); 56 probe_cluster_id);
55 } 57 }
56 } 58 }
57 return true; 59 return true;
58 } 60 }
59 61
60 size_t PacketRouter::TimeToSendPadding(size_t bytes_to_send, 62 size_t PacketRouter::TimeToSendPadding(size_t bytes_to_send,
61 int probe_cluster_id) { 63 int probe_cluster_id) {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 rtc::CritScope cs(&modules_crit_); 102 rtc::CritScope cs(&modules_crit_);
101 for (auto* rtp_module : rtp_modules_) { 103 for (auto* rtp_module : rtp_modules_) {
102 packet->SetSenderSsrc(rtp_module->SSRC()); 104 packet->SetSenderSsrc(rtp_module->SSRC());
103 if (rtp_module->SendFeedbackPacket(*packet)) 105 if (rtp_module->SendFeedbackPacket(*packet))
104 return true; 106 return true;
105 } 107 }
106 return false; 108 return false;
107 } 109 }
108 110
109 } // namespace webrtc 111 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/include/flexfec_sender.h » ('j') | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698