Bug 1366581: offer bundle support for single m-section. r?bwc
MozReview-Commit-ID: DYmjCmV1fKF
--- a/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
+++ b/media/webrtc/signaling/gtest/jsep_session_unittest.cpp
@@ -921,22 +921,18 @@ protected:
}
}
void CheckPairs(const JsepSession& session, const std::string& context)
{
auto pairs = session.GetNegotiatedTrackPairs();
for (JsepTrackPair& pair : pairs) {
- if (types.size() == 1) {
- ASSERT_FALSE(pair.HasBundleLevel()) << context;
- } else {
- ASSERT_TRUE(pair.HasBundleLevel()) << context;
- ASSERT_EQ(0U, pair.BundleLevel()) << context;
- }
+ ASSERT_TRUE(pair.HasBundleLevel()) << context;
+ ASSERT_EQ(0U, pair.BundleLevel()) << context;
}
}
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
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -670,17 +670,17 @@ JsepSessionImpl::SetupBundle(Sdp* sdp) c
// Set port to 0 for sections with bundle-only attribute. (mjf)
sdp->GetMediaSection(i).SetPort(0);
}
mids.push_back(attrs.GetMid());
}
}
- if (mids.size() > 1) {
+ if (mids.size() >= 1) {
UniquePtr<SdpGroupAttributeList> groupAttr(new SdpGroupAttributeList);
groupAttr->PushEntry(SdpGroupAttributeList::kBundle, mids);
sdp->GetAttributeList().SetAttribute(groupAttr.release());
}
}
nsresult
JsepSessionImpl::GetRemoteIds(const Sdp& sdp,