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

Removed flaky REMB test. This test is now covered by:

Browse Source 
- RemoteBitrateEstimatorTest
- BitrateControllerTest
- RtcpFormatRembTest
- ViERembTest

BUG=477
TEST=See above.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2431 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2012-06-21 09:29:53 +00:00
parent 173538faa3
commit 67f98ec63a
1 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc
View File

@ -354,95 +354,6 @@ void ViEAutoTest::ViERtpRtcpStandardTest()
// Deregister external transport
EXPECT_EQ(0, ViE.network->DeregisterSendTransport(tbChannel.videoChannel));
// The linux virtual cam, vivi, gives a too simple image to encode,
// resulting in a low bitrate, and the REMB test below fails.
if (tbCapture.device_name() != "vivi") {
// Create three channels. 1 and 2 are grouped together and will get a
// common REMB packet. 3 is in its own group and will get a separate REMB
// packet. To verify we receive a REMB, set a higher start bitrate for 2
// than 1 and verify the estimated send bitrate for 2 is lowered. Also,
// verify that the bitrate estimate for 3 is kept high and not lowered
// due to 1 and 2.
const unsigned int start_rate_1_bps = 100000;
const unsigned int start_rate_2_bps = 300000;
const unsigned int start_rate_3_bps = 1000000;
int channel_1 = -1;
int channel_2 = -1;
int channel_3 = -1;
EXPECT_EQ(0, ViE.base->CreateChannel(channel_1));
EXPECT_EQ(0, ViE.base->CreateChannel(channel_2, channel_1));
EXPECT_EQ(0, ViE.base->CreateChannel(channel_3));
//TbCaptureDevice tbCapture(ViE);
tbCapture.ConnectTo(channel_1);
tbCapture.ConnectTo(channel_2);
tbCapture.ConnectTo(channel_3);
TbExternalTransport transport_1(*(ViE.network));
TbExternalTransport transport_2(*(ViE.network));
TbExternalTransport transport_3(*(ViE.network));
EXPECT_EQ(0, ViE.network->RegisterSendTransport(channel_1, transport_1));
EXPECT_EQ(0, ViE.network->RegisterSendTransport(channel_2, transport_2));
EXPECT_EQ(0, ViE.network->RegisterSendTransport(channel_3, transport_3));
webrtc::VideoCodec video_codec;
for (int idx = 0; idx < ViE.codec->NumberOfCodecs(); ++idx) {
ViE.codec->GetCodec(idx, video_codec);
if (video_codec.codecType == webrtc::kVideoCodecVP8) {
break;
}
}
EXPECT_EQ(0, ViE.codec->SetReceiveCodec(channel_1, video_codec));
EXPECT_EQ(0, ViE.codec->SetReceiveCodec(channel_2, video_codec));
EXPECT_EQ(0, ViE.codec->SetReceiveCodec(channel_3, video_codec));
video_codec.startBitrate = start_rate_1_bps / 1000;
EXPECT_EQ(0, ViE.codec->SetSendCodec(channel_1, video_codec));
video_codec.startBitrate = start_rate_2_bps / 1000;
EXPECT_EQ(0, ViE.codec->SetSendCodec(channel_2, video_codec));
video_codec.startBitrate = start_rate_3_bps / 1000;
EXPECT_EQ(0, ViE.codec->SetSendCodec(channel_3, video_codec));
EXPECT_EQ(0, ViE.rtp_rtcp->SetRembStatus(channel_1, true, true));
EXPECT_EQ(0, ViE.rtp_rtcp->SetRembStatus(channel_2, true, true));
EXPECT_EQ(0, ViE.rtp_rtcp->SetRembStatus(channel_3, true, true));
EXPECT_EQ(0, ViE.base->StartReceive(channel_1));
EXPECT_EQ(0, ViE.base->StartReceive(channel_2));
EXPECT_EQ(0, ViE.base->StartReceive(channel_3));
EXPECT_EQ(0, ViE.base->StartSend(channel_1));
EXPECT_EQ(0, ViE.base->StartSend(channel_2));
EXPECT_EQ(0, ViE.base->StartSend(channel_3));
AutoTestSleep(KAutoTestSleepTimeMs);
EXPECT_EQ(0, ViE.base->StopReceive(channel_1));
EXPECT_EQ(0, ViE.base->StopReceive(channel_2));
EXPECT_EQ(0, ViE.base->StopReceive(channel_3));
EXPECT_EQ(0, ViE.base->StopSend(channel_1));
EXPECT_EQ(0, ViE.base->StopSend(channel_2));
EXPECT_EQ(0, ViE.base->StopSend(channel_3));
unsigned int bw_estimate_1 = 0;
unsigned int bw_estimate_2 = 0;
unsigned int bw_estimate_3 = 0;
ViE.rtp_rtcp->GetEstimatedSendBandwidth(channel_1, &bw_estimate_1);
ViE.rtp_rtcp->GetEstimatedSendBandwidth(channel_2, &bw_estimate_2);
ViE.rtp_rtcp->GetEstimatedSendBandwidth(channel_3, &bw_estimate_3);
EXPECT_LT(bw_estimate_1, start_rate_2_bps);
EXPECT_LT(bw_estimate_2, start_rate_2_bps);
EXPECT_NE(bw_estimate_1, start_rate_1_bps);
// Add some margin to avoid flaky test runs.
EXPECT_GT(bw_estimate_3, 0.75 * start_rate_3_bps);
EXPECT_EQ(0, ViE.base->DeleteChannel(channel_1));
EXPECT_EQ(0, ViE.base->DeleteChannel(channel_2));
EXPECT_EQ(0, ViE.base->DeleteChannel(channel_3));
}
//***************************************************************
// Testing finished. Tear down Video Engine