Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1534673 - Part 3: Some updates to jsep_session_unittest to avoid comparing track-ids, and stop using msid-semantic. r=mjf

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D23208

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Byron Campen [:bwc] 2019-03-19 16:21:29 +00:00
parent 216fd782cc
commit b550a2d16a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
media/webrtc/signaling/gtest/jsep_session_unittest.cpp
View File

@ -834,8 +834,7 @@ class JsepSessionTest : public JsepSessionTestBase,
if (track.GetMediaType() != SdpMediaSection::kApplication) {
std::string msidAttr("a=msid:");
msidAttr += track.GetStreamIds()[0];
msidAttr += " ";
msidAttr += track.GetTrackId();
// Track id will not match, and will eventually not be present at all
ASSERT_NE(std::string::npos, offer.find(msidAttr))
<< "Did not find " << msidAttr << " in offer";
}
@ -924,8 +923,7 @@ class JsepSessionTest : public JsepSessionTestBase,
if (recvTrack.GetMediaType() != SdpMediaSection::kApplication) {
std::string msidAttr("a=msid:");
msidAttr += recvTrack.GetStreamIds()[0];
msidAttr += " ";
msidAttr += recvTrack.GetTrackId();
// Track id will not match, and will eventually not be present at all
ASSERT_NE(std::string::npos, answer.find(msidAttr))
<< "Did not find " << msidAttr << " in answer";
}
@ -1183,9 +1181,13 @@ class JsepSessionTest : public JsepSessionTestBase,
}
void DisableMsid(std::string* sdp) const {
size_t pos = sdp->find("a=msid-semantic");
ASSERT_NE(std::string::npos, pos);
(*sdp)[pos + 2] = 'X'; // garble, a=Xsid-semantic
while (true) {
size_t pos = sdp->find("a=msid");
if (pos == std::string::npos) {
break;
}
(*sdp)[pos + 2] = 'X'; // garble, a=Xsid
}
}
void DisableBundle(std::string* sdp) const {
@ -1826,7 +1828,6 @@ TEST_P(JsepSessionTest, RenegotiationOffererChangesMsid) {
SetRemoteOffer(offer);
transceiver = GetNegotiatedTransceiver(*mSessionAns, 0);
ASSERT_EQ("foo", transceiver->mRecvTrack.GetStreamIds()[0]);
ASSERT_EQ("bar", transceiver->mRecvTrack.GetTrackId());
std::string answer = CreateAnswer();
SetLocalAnswer(answer);
@ -1873,7 +1874,6 @@ TEST_P(JsepSessionTest, RenegotiationAnswererChangesMsid) {
transceiver = GetNegotiatedTransceiver(*mSessionOff, 0);
ASSERT_EQ("foo", transceiver->mRecvTrack.GetStreamIds()[0]);
ASSERT_EQ("bar", transceiver->mRecvTrack.GetTrackId());
}
TEST_P(JsepSessionTest, RenegotiationOffererStopsTransceiver) {