Backed out changeset 35dcd6ad89c6 (bug 1646092) for Gtests failures in JsepSessionTest.OfferAnswerRecvOnlyLines. CLOSED TREE

This commit is contained in:
Dorel Luca 2020-06-18 23:22:29 +03:00
Родитель 83762a1f31
Коммит 524cb78f56
2 изменённых файлов: 3 добавлений и 7 удалений

Просмотреть файл

@ -256,8 +256,8 @@ bool JsepTrack::IsRtxEnabled(
void JsepTrack::AddToMsection(const std::vector<JsConstraints>& constraintsList,
sdp::Direction direction,
SsrcGenerator& ssrcGenerator, bool rtxEnabled,
SdpMediaSection* msection) {
SsrcGenerator& ssrcGenerator,
bool requireRtxSsrcs, SdpMediaSection* msection) {
UniquePtr<SdpSimulcastAttribute> simulcast(new SdpSimulcastAttribute);
UniquePtr<SdpRidAttributeList> rids(new SdpRidAttributeList);
for (const JsConstraints& constraints : constraintsList) {
@ -283,10 +283,6 @@ void JsepTrack::AddToMsection(const std::vector<JsConstraints>& constraintsList,
msection->GetAttributeList().SetAttribute(rids.release());
}
bool requireRtxSsrcs =
rtxEnabled && msection->GetDirectionAttribute().mValue !=
SdpDirectionAttribute::Direction::kRecvonly;
if (mType != SdpMediaSection::kApplication && mDirection == sdp::kSend) {
UpdateSsrcs(ssrcGenerator, constraintsList.size());

Просмотреть файл

@ -277,7 +277,7 @@ class JsepTrack {
void AddToMsection(const std::vector<JsConstraints>& constraintsList,
sdp::Direction direction, SsrcGenerator& ssrcGenerator,
bool rtxEnabled, SdpMediaSection* msection);
bool requireRtxSsrcs, SdpMediaSection* msection);
// See Bug 1642419, this can be removed when all sites are working with RTX.
void SetRtxIsAllowed(bool aRtxIsAllowed) { mRtxIsAllowed = aRtxIsAllowed; }