Merge pull request mozilla#32 from adamroach/multistream

One more multivalue attribute
ekr · Sep 18, 2014 · 6f62ebb · 6f62ebb
2 parents fca8c06 + 9d85db7
commit 6f62ebb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/media/webrtc/signaling/src/sdp/SdpAttribute.h b/media/webrtc/signaling/src/sdp/SdpAttribute.h
@@ -285,10 +285,10 @@ class SdpImageattrAttributeList : public SdpAttribute
 //   msid-attr = "msid:" identifier [ SP appdata ]
 //   identifier = 1*64token-char ; see RFC 4566
 //   appdata = 1*64token-char  ; see RFC 4566
-class SdpMsidAttribute : public SdpAttribute
+class SdpMsidAttributeList : public SdpAttribute
 {
 public:
-  SdpMsidAttribute() :
+  SdpMsidAttributeList() :
     SdpAttribute(kMsidAttribute, "msid") {}
 };
 

diff --git a/media/webrtc/signaling/src/sdp/SdpAttributeList.h b/media/webrtc/signaling/src/sdp/SdpAttributeList.h
@@ -29,7 +29,6 @@ class SdpAttributeList
   virtual const SdpGroupAttribute& GetGroup() const = 0;
   virtual const SdpIceOptionsAttribute& GetIceOptions() const = 0;
   virtual const SdpIdentityAttribute& GetIdentity() const = 0;
-  virtual const SdpMsidAttribute& GetMsid() const = 0;
   virtual const SdpRtcpAttribute& GetRtcp() const = 0;
   virtual const SdpRemoteCandidatesAttribute& GetRemoteCandidates() const = 0;
   virtual const SdpSetupAttribute& GetSetup() const = 0;
@@ -42,6 +41,7 @@ class SdpAttributeList
   virtual const SdpExtmapAttributeList& GetExtmap() const = 0;
   virtual const SdpFmtpAttributeList& GetFmtp() const = 0;
   virtual const SdpImageattrAttributeList& GetImageattr() const = 0;
+  virtual const SdpMsidAttributeList& GetMsid() const = 0;
   virtual const SdpRtcpFbAttributeList& GetRtcpFb() const = 0;
   virtual const SdpRtpmapAttributeList& GetRtpmap() const = 0;
   virtual const SdpSctpmapAttributeList& GetSctpmap() const = 0;

diff --git a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
@@ -100,7 +100,7 @@ SipccSdpAttributeList::GetMid() const {
   MOZ_CRASH();
 }
 
-const SdpMsidAttribute&
+const SdpMsidAttributeList&
 SipccSdpAttributeList::GetMsid() const {
   MOZ_CRASH();;
 }

diff --git a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.h
@@ -41,7 +41,7 @@ class SipccSdpAttributeList : public SdpAttributeList
   virtual uint32_t GetMaxprate() const MOZ_OVERRIDE;
   virtual uint32_t GetMaxptime() const MOZ_OVERRIDE;
   virtual const std::string& GetMid() const MOZ_OVERRIDE;
-  virtual const SdpMsidAttribute& GetMsid() const MOZ_OVERRIDE;
+  virtual const SdpMsidAttributeList& GetMsid() const MOZ_OVERRIDE;
   virtual uint32_t GetPtime() const MOZ_OVERRIDE;
   virtual const SdpRtcpAttribute& GetRtcp() const MOZ_OVERRIDE;
   virtual const SdpRtcpFbAttributeList& GetRtcpFb() const MOZ_OVERRIDE;