Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1727196: stop making ssrc-group depend on stream-id. r=bwc

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D123672
This commit is contained in:
Nils Ohlmeier 2021-08-29 17:53:12 +00:00
parent cb0d9f9ca1
commit 797c9f2e3b
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/media/webrtc/jsep/JsepTrack.cpp
View File

@ -248,8 +248,7 @@ void JsepTrack::AddToMsection(const std::vector<JsConstraints>& constraintsList,
msection->GetAttributeList().SetAttribute(rids.release());
}
bool requireRtxSsrcs =
rtxEnabled && msection->IsSending() && !mStreamIds.empty();
bool requireRtxSsrcs = rtxEnabled && msection->IsSending();
if (mType != SdpMediaSection::kApplication && mDirection == sdp::kSend) {
UpdateSsrcs(ssrcGenerator, constraintsList.size());

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

@ -7126,6 +7126,34 @@ TEST_F(JsepSessionTest, TestOneWayRtx) {
}
}
TEST_F(JsepSessionTest, TestRtxNoSsrcGroup) {
mSessionOff->AddTransceiver(new JsepTransceiver(
SdpMediaSection::kVideo, SdpDirectionAttribute::kRecvonly));
OfferAnswer(CHECK_SUCCESS);
std::string offer = mSessionOff->GetLocalDescription(kJsepDescriptionCurrent);
ASSERT_EQ(std::string::npos, offer.find("FID")) << offer;
std::string answer =
mSessionOff->GetRemoteDescription(kJsepDescriptionCurrent);
ASSERT_EQ(std::string::npos, answer.find("FID")) << answer;
}
TEST_F(JsepSessionTest, TestRtxSsrcGroupOnlyOffered) {
mSessionOff->AddTransceiver(new JsepTransceiver(
SdpMediaSection::kVideo, SdpDirectionAttribute::kSendonly));
OfferAnswer(CHECK_SUCCESS);
std::string offer = mSessionOff->GetLocalDescription(kJsepDescriptionCurrent);
ASSERT_NE(std::string::npos, offer.find("FID")) << offer;
std::string answer =
mSessionOff->GetRemoteDescription(kJsepDescriptionCurrent);
ASSERT_EQ(std::string::npos, answer.find("FID")) << answer;
}
TEST_F(JsepSessionTest, TestOfferRtxNoMsid) {
for (auto& codec : mSessionOff->Codecs()) {
if (codec->mName == "VP8") {
@ -7147,12 +7175,12 @@ TEST_F(JsepSessionTest, TestOfferRtxNoMsid) {
}
}
// If no MSID is present, we should not have a FID ssrc-group
// MSID stream absence should not influence FID ssrc-group
JsepOfferOptions options;
std::string offer;
JsepSession::Result result = mSessionOff->CreateOffer(options, &offer);
ASSERT_FALSE(result.mError.isSome());
ASSERT_EQ(std::string::npos, offer.find("FID")) << offer;
ASSERT_NE(std::string::npos, offer.find("FID")) << offer;
}
TEST_F(JsepSessionTest, TestDuplicatePayloadTypes) {