zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the flaky WebRtcSessionTest.TestRtxRemovedByCreateAnswer.

Browse Source 
Use the attribute in MediaContentDescription to test whether Rtx is removed in the answer instead of searching the substring "rtx" in the whole answer sdp.

BUG=webrtc:4943

Review-Url: https://codereview.webrtc.org/1919523002
Cr-Commit-Position: refs/heads/master@{#12639}
This commit is contained in:
zhihuang
2016-05-05 18:37:49 -07:00
committed by Commit bot
parent 44c8a373a5
commit 3a334656de
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
webrtc/api/webrtcsession_unittest.cc
View File

@ -1113,6 +1113,22 @@ class WebRtcSessionTest
EXPECT_EQ(can, session_->CanInsertDtmf(kAudioTrack1));
}
bool ContainsVideoCodecWithName(const SessionDescriptionInterface* desc,
const std::string& codec_name) {
for (const auto& content : desc->description()->contents()) {
if (static_cast<cricket::MediaContentDescription*>(content.description)
->type() == cricket::MEDIA_TYPE_VIDEO) {
const auto* mdesc =
static_cast<cricket::VideoContentDescription*>(content.description);
for (const auto& codec : mdesc->codecs()) {
if (codec.name == codec_name) {
return true;
}
}
}
}
return false;
}
// Helper class to configure loopback network and verify Best
// Connection using right IP protocol for TestLoopbackCall
// method. LoopbackNetworkManager applies firewall rules to block
@ -4277,15 +4293,9 @@ TEST_P(WebRtcSessionTest, TestRenegotiateNewMediaWithCandidatesSeparated) {
SetLocalDescriptionWithoutError(answer);
}
// Flaky on Win and Mac only. See webrtc:4943
#if defined(WEBRTC_WIN) || defined(WEBRTC_MAC)
#define MAYBE_TestRtxRemovedByCreateAnswer DISABLED_TestRtxRemovedByCreateAnswer
#else
#define MAYBE_TestRtxRemovedByCreateAnswer TestRtxRemovedByCreateAnswer
#endif
// Tests that RTX codec is removed from the answer when it isn't supported
// by local side.
TEST_F(WebRtcSessionTest, MAYBE_TestRtxRemovedByCreateAnswer) {
TEST_F(WebRtcSessionTest, TestRtxRemovedByCreateAnswer) {
Init();
SendAudioVideoStream1();
std::string offer_sdp(kSdpWithRtx);
@ -4295,14 +4305,12 @@ TEST_F(WebRtcSessionTest, MAYBE_TestRtxRemovedByCreateAnswer) {
EXPECT_TRUE(offer->ToString(&offer_sdp));
// Offer SDP contains the RTX codec.
EXPECT_TRUE(offer_sdp.find("rtx") != std::string::npos);
EXPECT_TRUE(ContainsVideoCodecWithName(offer, "rtx"));
SetRemoteDescriptionWithoutError(offer);
SessionDescriptionInterface* answer = CreateAnswer();
std::string answer_sdp;
answer->ToString(&answer_sdp);
// Answer SDP removes the unsupported RTX codec.
EXPECT_TRUE(answer_sdp.find("rtx") == std::string::npos);
// Answer SDP does not contain the RTX codec.
EXPECT_FALSE(ContainsVideoCodecWithName(answer, "rtx"));
SetLocalDescriptionWithoutError(answer);
}