Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1164061 - Backout signaling unittest changes for tmmbr r=jesup

Browse Source
This commit is contained in:
Ethan Hugg 2015-05-12 09:15:00 -07:00
parent 9b0603bad4
commit a5589141de
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
media/webrtc/signaling/test/signaling_unittests.cpp
View File

@ -907,7 +907,6 @@ class SignalingAgent {
mBundleEnabled(true),
mExpectedFrameRequestType(VideoSessionConduit::FrameRequestPli),
mExpectNack(true),
mExpectTmmbr(true),
mExpectRtcpMuxAudio(true),
mExpectRtcpMuxVideo(true),
mRemoteDescriptionSet(false) {
@ -1202,7 +1201,6 @@ class SignalingAgent {
mozilla::VideoSessionConduit *video_conduit =
static_cast<mozilla::VideoSessionConduit*>(conduit);
ASSERT_EQ(mExpectNack, video_conduit->UsingNackBasic());
ASSERT_EQ(mExpectTmmbr, video_conduit->UsingTmmbr());
ASSERT_EQ(mExpectedFrameRequestType,
video_conduit->FrameRequestMethod());
ASSERT_EQ(mExpectRtcpMuxVideo, pipeline->IsDoingRtcpMux())
@ -1551,7 +1549,6 @@ public:
bool mBundleEnabled;
VideoSessionConduit::FrameRequestType mExpectedFrameRequestType;
bool mExpectNack;
bool mExpectTmmbr;
bool mExpectRtcpMuxAudio;
bool mExpectRtcpMuxVideo;
bool mRemoteDescriptionSet;
@ -1993,7 +1990,6 @@ public:
void TestRtcpFbAnswer(const std::set<std::string>& feedback,
bool expectNack,
bool expectTmmbr,
VideoSessionConduit::FrameRequestType frameRequestType) {
EnsureInit();
OfferOptions options;
@ -2012,7 +2008,6 @@ public:
a1_->SetExpectedFrameRequestType(frameRequestType);
a1_->mExpectNack = expectNack;
a1_->mExpectTmmbr = expectTmmbr;
WaitForCompleted();
CheckPipelines();
@ -2023,7 +2018,6 @@ public:
void TestRtcpFbOffer(
const std::set<std::string>& feedback,
bool expectNack,
bool expectTmmbr,
VideoSessionConduit::FrameRequestType frameRequestType) {
EnsureInit();
OfferOptions options;
@ -2036,7 +2030,6 @@ public:
a2_->SetRemote(TestObserver::OFFER, modifiedOffer);
a2_->SetExpectedFrameRequestType(frameRequestType);
a2_->mExpectNack = expectNack;
a2_->mExpectTmmbr = expectTmmbr;
a2_->CreateAnswer(OFFER_AV | ANSWER_AV);
@ -3394,25 +3387,23 @@ TEST_P(SignalingTest, RtcpFbInOffer)
EnsureInit();
OfferOptions options;
a1_->CreateOffer(options, OFFER_AV);
const char *expected[] = { "nack", "nack pli", "ccm fir", "ccm tmmbr" };
const char *expected[] = { "nack", "nack pli", "ccm fir" };
CheckRtcpFbSdp(a1_->offer(), ARRAY_TO_SET(std::string, expected));
}
TEST_P(SignalingTest, RtcpFbOfferAll)
{
const char *feedbackTypes[] = { "nack", "nack pli", "ccm fir", "ccm tmmbr" };
const char *feedbackTypes[] = { "nack", "nack pli", "ccm fir" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
true,
VideoSessionConduit::FrameRequestPli);
}
TEST_P(SignalingTest, RtcpFbOfferNoNackBasic)
{
const char *feedbackTypes[] = { "nack pli", "ccm fir", "ccm tmmbr" };
const char *feedbackTypes[] = { "nack pli", "ccm fir" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
true,
VideoSessionConduit::FrameRequestPli);
}
@ -3421,7 +3412,6 @@ TEST_P(SignalingTest, RtcpFbOfferNoNackPli)
const char *feedbackTypes[] = { "nack", "ccm fir" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestFir);
}
@ -3430,7 +3420,6 @@ TEST_P(SignalingTest, RtcpFbOfferNoCcmFir)
const char *feedbackTypes[] = { "nack", "nack pli" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestPli);
}
@ -3438,7 +3427,6 @@ TEST_P(SignalingTest, RtcpFbOfferNoNack)
{
const char *feedbackTypes[] = { "ccm fir" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
VideoSessionConduit::FrameRequestFir);
}
@ -3448,7 +3436,6 @@ TEST_P(SignalingTest, RtcpFbOfferNoFrameRequest)
const char *feedbackTypes[] = { "nack" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestNone);
}
@ -3456,7 +3443,6 @@ TEST_P(SignalingTest, RtcpFbOfferPliOnly)
{
const char *feedbackTypes[] = { "nack pli" };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
VideoSessionConduit::FrameRequestPli);
}
@ -3465,7 +3451,6 @@ TEST_P(SignalingTest, RtcpFbOfferNoFeedback)
{
const char *feedbackTypes[] = { };
TestRtcpFbOffer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
VideoSessionConduit::FrameRequestNone);
}
@ -3475,7 +3460,6 @@ TEST_P(SignalingTest, RtcpFbAnswerAll)
const char *feedbackTypes[] = { "nack", "nack pli", "ccm fir" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestPli);
}
@ -3483,7 +3467,6 @@ TEST_P(SignalingTest, RtcpFbAnswerNoNackBasic)
{
const char *feedbackTypes[] = { "nack pli", "ccm fir" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
VideoSessionConduit::FrameRequestPli);
}
@ -3493,7 +3476,6 @@ TEST_P(SignalingTest, RtcpFbAnswerNoNackPli)
const char *feedbackTypes[] = { "nack", "ccm fir" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestFir);
}
@ -3502,7 +3484,6 @@ TEST_P(SignalingTest, RtcpFbAnswerNoCcmFir)
const char *feedbackTypes[] = { "nack", "nack pli" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestPli);
}
@ -3510,7 +3491,6 @@ TEST_P(SignalingTest, RtcpFbAnswerNoNack)
{
const char *feedbackTypes[] = { "ccm fir" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
VideoSessionConduit::FrameRequestFir);
}
@ -3520,7 +3500,6 @@ TEST_P(SignalingTest, RtcpFbAnswerNoFrameRequest)
const char *feedbackTypes[] = { "nack" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
true,
false,
VideoSessionConduit::FrameRequestNone);
}
@ -3528,8 +3507,7 @@ TEST_P(SignalingTest, RtcpFbAnswerPliOnly)
{
const char *feedbackTypes[] = { "nack pli" };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
0,
VideoSessionConduit::FrameRequestPli);
}
@ -3537,8 +3515,7 @@ TEST_P(SignalingTest, RtcpFbAnswerNoFeedback)
{
const char *feedbackTypes[] = { };
TestRtcpFbAnswer(ARRAY_TO_SET(std::string, feedbackTypes),
false,
false,
0,
VideoSessionConduit::FrameRequestNone);
}
@ -4391,12 +4368,6 @@ TEST_P(SignalingTest, UseNonPrefferedPayloadTypeOnAnswer)
strlen("\r\na=rtcp-fb:121 ccm fir"),
"\r\na=rtcp-fb:121 ccm fir");
match = answer.find("\r\na=rtcp-fb:120 ccm tmmbr");
ASSERT_NE(std::string::npos, match);
answer.replace(match,
strlen("\r\na=rtcp-fb:121 ccm tmmbr"),
"\r\na=rtcp-fb:121 ccm tmmbr");
std::cout << "Modified SDP " << std::endl
<< indent(answer) << std::endl;