Bug 1437166: Removed GetSsrcGroup entirely. r=bwc,dminor
Removed all occurances of GetSsrcGroup in the C++/Rust and C++/sipcc glue code
Removed C++ unit test CheckSsrcGroupInSessionLevel
MozReview-Commit-ID: DImctiH6mUo
--- a/media/webrtc/signaling/gtest/sdp_unittests.cpp
+++ b/media/webrtc/signaling/gtest/sdp_unittests.cpp
@@ -3702,39 +3702,16 @@ TEST_P(NewSdpTest, CheckSsrcInSessionLev
if (mSdp) {
ASSERT_FALSE(mSdp->GetMediaSection(0).GetAttributeList().HasAttribute(
SdpAttribute::kSsrcAttribute));
ASSERT_FALSE(mSdp->GetAttributeList().HasAttribute(
SdpAttribute::kSsrcAttribute));
}
}
-const std::string kSsrcGroupInSessionSDP =
-"v=0" CRLF
-"o=Mozilla-SIPUA-35.0a1 5184 0 IN IP4 0.0.0.0" CRLF
-"s=SIP Call" CRLF
-"c=IN IP4 224.0.0.1/100/12" CRLF
-"t=0 0" CRLF
-"a=ssrc-group:FID 5000" CRLF
-"m=video 9 RTP/SAVPF 120" CRLF
-"c=IN IP4 0.0.0.0" CRLF
-"a=rtpmap:120 VP8/90000" CRLF;
-
-// This may or may not parse, but if it does, the errant attribute
-// should be ignored.
-TEST_P(NewSdpTest, CheckSsrcGroupInSessionLevel) {
- ParseSdp(kSsrcGroupInSessionSDP, false);
- if (mSdp) {
- ASSERT_FALSE(mSdp->GetMediaSection(0).GetAttributeList().HasAttribute(
- SdpAttribute::kSsrcGroupAttribute));
- ASSERT_FALSE(mSdp->GetAttributeList().HasAttribute(
- SdpAttribute::kSsrcGroupAttribute));
- }
-}
-
const std::string kMalformedImageattr =
"v=0" CRLF
"o=Mozilla-SIPUA-35.0a1 5184 0 IN IP4 0.0.0.0" CRLF
"s=SIP Call" CRLF
"c=IN IP4 224.0.0.1/100/12" CRLF
"t=0 0" CRLF
"m=video 9 RTP/SAVPF 120" CRLF
"c=IN IP4 0.0.0.0" CRLF
--- a/media/webrtc/signaling/src/sdp/RsdparsaSdpAttributeList.cpp
+++ b/media/webrtc/signaling/src/sdp/RsdparsaSdpAttributeList.cpp
@@ -388,23 +388,16 @@ RsdparsaSdpAttributeList::GetSsrc() cons
{
if (!HasAttribute(SdpAttribute::kSsrcAttribute)) {
MOZ_CRASH();
}
const SdpAttribute* attr = GetAttribute(SdpAttribute::kSsrcAttribute);
return *static_cast<const SdpSsrcAttributeList*>(attr);
}
-const SdpSsrcGroupAttributeList&
-RsdparsaSdpAttributeList::GetSsrcGroup() const
-{
- // TODO: See Bug 1437166.
- MOZ_CRASH("Not yet implemented");
-}
-
void
RsdparsaSdpAttributeList::LoadAttribute(RustAttributeList *attributeList,
AttributeType type)
{
if(!mAttributes[type]) {
switch(type) {
case SdpAttribute::kIceUfragAttribute:
LoadIceUfrag(attributeList);
--- a/media/webrtc/signaling/src/sdp/RsdparsaSdpAttributeList.h
+++ b/media/webrtc/signaling/src/sdp/RsdparsaSdpAttributeList.h
@@ -40,17 +40,16 @@ public:
const SdpConnectionAttribute& GetConnection() const override;
const SdpFingerprintAttributeList& GetFingerprint() const override;
const SdpGroupAttributeList& GetGroup() const override;
const SdpOptionsAttribute& GetIceOptions() const override;
const SdpRtcpAttribute& GetRtcp() const override;
const SdpRemoteCandidatesAttribute& GetRemoteCandidates() const override;
const SdpSetupAttribute& GetSetup() const override;
const SdpSsrcAttributeList& GetSsrc() const override;
- const SdpSsrcGroupAttributeList& GetSsrcGroup() const override;
const SdpDtlsMessageAttribute& GetDtlsMessage() const override;
// These attributes can appear multiple times, so the returned
// classes actually represent a collection of values.
const std::vector<std::string>& GetCandidate() const override;
const SdpExtmapAttributeList& GetExtmap() const override;
const SdpFmtpAttributeList& GetFmtp() const override;
const SdpImageattrAttributeList& GetImageattr() const override;
--- a/media/webrtc/signaling/src/sdp/SdpAttributeList.h
+++ b/media/webrtc/signaling/src/sdp/SdpAttributeList.h
@@ -63,17 +63,16 @@ public:
virtual const SdpMsidSemanticAttributeList& GetMsidSemantic() const = 0;
virtual const SdpRidAttributeList& GetRid() const = 0;
virtual const SdpRtcpFbAttributeList& GetRtcpFb() const = 0;
virtual const SdpRtpmapAttributeList& GetRtpmap() const = 0;
virtual const SdpSctpmapAttributeList& GetSctpmap() const = 0;
virtual uint32_t GetSctpPort() const = 0;
virtual uint32_t GetMaxMessageSize() const = 0;
virtual const SdpSsrcAttributeList& GetSsrc() const = 0;
- virtual const SdpSsrcGroupAttributeList& GetSsrcGroup() const = 0;
// These attributes are effectively simple types, so we'll make life
// easy by just returning their value.
virtual const std::string& GetIcePwd() const = 0;
virtual const std::string& GetIceUfrag() const = 0;
virtual const std::string& GetIdentity() const = 0;
virtual const std::string& GetLabel() const = 0;
virtual unsigned int GetMaxptime() const = 0;
--- a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
+++ b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
@@ -1425,22 +1425,16 @@ SipccSdpAttributeList::GetSsrc() const
{
if (!HasAttribute(SdpAttribute::kSsrcAttribute)) {
MOZ_CRASH();
}
const SdpAttribute* attr = GetAttribute(SdpAttribute::kSsrcAttribute);
return *static_cast<const SdpSsrcAttributeList*>(attr);
}
-const SdpSsrcGroupAttributeList&
-SipccSdpAttributeList::GetSsrcGroup() const
-{
- MOZ_CRASH("Not yet implemented");
-}
-
void
SipccSdpAttributeList::Serialize(std::ostream& os) const
{
for (size_t i = 0; i < kNumAttributeTypes; ++i) {
if (mAttributes[i]) {
os << *mAttributes[i];
}
}
--- a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h
+++ b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h
@@ -44,17 +44,16 @@ public:
override;
virtual const SdpGroupAttributeList& GetGroup() const override;
virtual const SdpOptionsAttribute& GetIceOptions() const override;
virtual const SdpRtcpAttribute& GetRtcp() const override;
virtual const SdpRemoteCandidatesAttribute& GetRemoteCandidates() const
override;
virtual const SdpSetupAttribute& GetSetup() const override;
virtual const SdpSsrcAttributeList& GetSsrc() const override;
- virtual const SdpSsrcGroupAttributeList& GetSsrcGroup() const override;
virtual const SdpDtlsMessageAttribute& GetDtlsMessage() const override;
// These attributes can appear multiple times, so the returned
// classes actually represent a collection of values.
virtual const std::vector<std::string>& GetCandidate() const override;
virtual const SdpExtmapAttributeList& GetExtmap() const override;
virtual const SdpFmtpAttributeList& GetFmtp() const override;
virtual const SdpImageattrAttributeList& GetImageattr() const override;