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

Don't return an estimated receive BW for channels not receiving video.

Browse Source 
BUG=1834
TEST=ViE RTP autotest
R=stefan@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4121 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2013-05-28 15:00:15 +00:00
parent 4079c31c0a
commit a066cbf37c
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
View File

@ -297,6 +297,16 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
tbChannel.videoChannel, tbChannel.videoChannel,
&estimated_bandwidth)); &estimated_bandwidth));
EXPECT_GT(estimated_bandwidth, 0u); EXPECT_GT(estimated_bandwidth, 0u);
int passive_channel = -1;
EXPECT_EQ(ViE.base->CreateReceiveChannel(passive_channel,
tbChannel.videoChannel), 0);
EXPECT_EQ(ViE.base->StartReceive(passive_channel), 0);
EXPECT_EQ(
ViE.rtp_rtcp->GetEstimatedReceiveBandwidth(passive_channel,
&estimated_bandwidth),
0);
EXPECT_EQ(estimated_bandwidth, 0u);
} }
// Check that rec stats extended max is greater than what we've sent. // Check that rec stats extended max is greater than what we've sent.

3
webrtc/video_engine/vie_receiver.cc
View File

@ -278,7 +278,8 @@ void ViEReceiver::EstimatedReceiveBandwidth(
// LatestEstimate returns an error if there is no valid bitrate estimate, but // LatestEstimate returns an error if there is no valid bitrate estimate, but
// ViEReceiver instead returns a zero estimate. // ViEReceiver instead returns a zero estimate.
remote_bitrate_estimator_->LatestEstimate(&ssrcs, available_bandwidth); remote_bitrate_estimator_->LatestEstimate(&ssrcs, available_bandwidth);
if (!ssrcs.empty()) { if (std::find(ssrcs.begin(), ssrcs.end(), rtp_rtcp_->RemoteSSRC()) !=
ssrcs.end()) {
*available_bandwidth /= ssrcs.size(); *available_bandwidth /= ssrcs.size();
} else { } else {
*available_bandwidth = 0; *available_bandwidth = 0;