diff options
| author | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-24 16:41:25 +0000 |
|---|---|---|
| committer | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-24 16:41:25 +0000 |
| commit | 4a1b3e3a69d349b0d3e91f607f24e02d8b975688 (patch) | |
| tree | da30959f40b1c31a881a2f5df8734c8e65432c32 /modules/rtp_rtcp/source/rtp_rtcp_impl.cc | |
| parent | a4dc1ae57dff218db6e18471eee6dec2108189fe (diff) | |
| download | webrtc-4a1b3e3a69d349b0d3e91f607f24e02d8b975688.tar.gz | |
Make sure padding is sent on the first sending RTP module.
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/13989004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6774 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/rtp_rtcp/source/rtp_rtcp_impl.cc')
| -rw-r--r-- | modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index a26b36a5..1a3b79cb 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -613,14 +613,10 @@ int ModuleRtpRtcpImpl::TimeToSendPadding(int bytes) { } } else { CriticalSectionScoped lock(critical_section_module_ptrs_.get()); - // Decide what media stream to pad on based on a round-robin scheme. for (size_t i = 0; i < child_modules_.size(); ++i) { - padding_index_ = (padding_index_ + 1) % child_modules_.size(); // Send padding on one of the modules sending media. - if (child_modules_[padding_index_]->SendingMedia() && - child_modules_[padding_index_]->rtp_sender_.GetTargetBitrate() > 0) { - return child_modules_[padding_index_]->rtp_sender_.TimeToSendPadding( - bytes); + if (child_modules_[i]->SendingMedia()) { + return child_modules_[i]->rtp_sender_.TimeToSendPadding(bytes); } } } |