generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure padding is sent on the first sending RTP module.

Browse Source 
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13989004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6774 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org
2014-07-24 16:41:25 +00:00
parent 45304ff0a7
commit f9460688a6
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@@ -613,14 +613,10 @@ int ModuleRtpRtcpImpl::TimeToSendPadding(int bytes) {
} }
} else { } else {
CriticalSectionScoped lock(critical_section_module_ptrs_.get()); 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) { 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. // Send padding on one of the modules sending media.
if (child_modules_[padding_index_]->SendingMedia() && if (child_modules_[i]->SendingMedia()) {
child_modules_[padding_index_]->rtp_sender_.GetTargetBitrate() > 0) { return child_modules_[i]->rtp_sender_.TimeToSendPadding(bytes);
return child_modules_[padding_index_]->rtp_sender_.TimeToSendPadding(
bytes);
} }
} }
} }

6
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
View File

@@ -388,7 +388,7 @@ class RtpSendingTest : public ::testing::Test {
VideoCodec codec_; VideoCodec codec_;
}; };
TEST_F(RtpSendingTest, RoundRobinPadding) { TEST_F(RtpSendingTest, DISABLED_RoundRobinPadding) {
// We have to send on an SSRC to be allowed to pad, since a marker bit must // We have to send on an SSRC to be allowed to pad, since a marker bit must
// be sent prior to padding packets. // be sent prior to padding packets.
const uint8_t payload[200] = {0}; const uint8_t payload[200] = {0};
@@ -410,7 +410,7 @@ TEST_F(RtpSendingTest, RoundRobinPadding) {
ExpectPadding(expected_padding); ExpectPadding(expected_padding);
} }
TEST_F(RtpSendingTest, RoundRobinPaddingRtx) { TEST_F(RtpSendingTest, DISABLED_RoundRobinPaddingRtx) {
// Enable RTX to allow padding to be sent prior to media. // Enable RTX to allow padding to be sent prior to media.
for (int i = 1; i < codec_.numberOfSimulcastStreams + 1; ++i) { for (int i = 1; i < codec_.numberOfSimulcastStreams + 1; ++i) {
// Abs-send-time is needed to be allowed to send padding prior to media, // Abs-send-time is needed to be allowed to send padding prior to media,
@@ -440,7 +440,7 @@ TEST_F(RtpSendingTest, RoundRobinPaddingRtx) {
ExpectPadding(expected_padding); ExpectPadding(expected_padding);
} }
TEST_F(RtpSendingTest, RoundRobinPaddingRtxRedundantPayloads) { TEST_F(RtpSendingTest, DISABLED_RoundRobinPaddingRtxRedundantPayloads) {
for (int i = 1; i < codec_.numberOfSimulcastStreams + 1; ++i) { for (int i = 1; i < codec_.numberOfSimulcastStreams + 1; ++i) {
senders_[i]->SetRtxSendPayloadType(96); senders_[i]->SetRtxSendPayloadType(96);
senders_[i]->SetRtxSsrc(kSenderRtxSsrc + i); senders_[i]->SetRtxSsrc(kSenderRtxSsrc + i);

2
webrtc/video/end_to_end_tests.cc
View File

@@ -1539,7 +1539,7 @@ TEST_F(EndToEndTest, CanSwitchToUseAllSsrcs) {
TestSendsSetSsrcs(kNumSsrcs, true); TestSendsSetSsrcs(kNumSsrcs, true);
} }
TEST_F(EndToEndTest, RedundantPayloadsTransmittedOnAllSsrcs) { TEST_F(EndToEndTest, DISABLED_RedundantPayloadsTransmittedOnAllSsrcs) {
class ObserveRedundantPayloads: public test::EndToEndTest { class ObserveRedundantPayloads: public test::EndToEndTest {
public: public:
ObserveRedundantPayloads() ObserveRedundantPayloads()