Bug 1531505 - Part 1: Ignore source-level msid if media-level msid is present. r=mjf
authorByron Campen [:bwc] <docfaraday@gmail.com>
Fri, 15 Mar 2019 18:04:23 +0000
changeset 464432 12950622952644a4f7bff0e5b776d84dc81a1224
parent 464431 466d9c2c222dff3d7b8e64658dad991c48cb5518
child 464433 8e01eb4f12c7701b7f7f389a9db3229606ba0179
push id35716
push useraciure@mozilla.com
push dateSun, 17 Mar 2019 09:42:17 +0000
treeherdermozilla-central@8ee97c045359 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmjf
bugs1531505
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1531505 - Part 1: Ignore source-level msid if media-level msid is present. r=mjf Differential Revision: https://phabricator.services.mozilla.com/D23202
media/webrtc/signaling/src/sdp/SdpHelper.cpp
--- a/media/webrtc/signaling/src/sdp/SdpHelper.cpp
+++ b/media/webrtc/signaling/src/sdp/SdpHelper.cpp
@@ -395,19 +395,20 @@ nsresult SdpHelper::GetIdsFromMsid(const
 
   return NS_OK;
 }
 
 nsresult SdpHelper::GetMsids(const SdpMediaSection& msection,
                              std::vector<SdpMsidAttributeList::Msid>* msids) {
   if (msection.GetAttributeList().HasAttribute(SdpAttribute::kMsidAttribute)) {
     *msids = msection.GetAttributeList().GetMsid().mMsids;
+    return NS_OK;
   }
 
-  // Can we find some additional msids in ssrc attributes?
+  // If there are no a=msid, can we find msids in ssrc attributes?
   // (Chrome does not put plain-old msid attributes in its SDP)
   if (msection.GetAttributeList().HasAttribute(SdpAttribute::kSsrcAttribute)) {
     auto& ssrcs = msection.GetAttributeList().GetSsrc().mSsrcs;
 
     for (auto i = ssrcs.begin(); i != ssrcs.end(); ++i) {
       if (i->attribute.find("msid:") == 0) {
         std::string streamId;
         std::string trackId;