Merge pull request mozilla#14 from martinthomson/sdp_stub

Working on getting it working
martinthomson · Sep 17, 2014 · 45706ca · 45706ca
2 parents 55ddf1c + b60d84f
commit 45706ca
Show file tree

Hide file tree

Showing 17 changed files with 592 additions and 303 deletions.
diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp
@@ -132,9 +132,11 @@
 
          './src/sdp/Sdp.h',
          './src/sdp/SdpAttribute.h',
+         './src/sdp/SdpAttributeList.h',
          './src/sdp/SdpEnum.h',
          './src/sdp/SdpMediaSection.h',
          './src/sdp/SipccSdp.h',
+         './src/sdp/SipccSdpAttributeList.h',
          './src/sdp/SipccSdpMediaSection.h',
          './src/sdp/SipccSdpParser.h',
          './src/sdp/SipccSdp.cpp',

diff --git a/media/webrtc/signaling/src/sdp/Sdp.h b/media/webrtc/signaling/src/sdp/Sdp.h
@@ -25,18 +25,17 @@ class Sdp
 public:
   Sdp();
 
-  unsigned int GetVersion() const = 0;
-  virtual SdpOriginator GetOriginator() const = 0;
-  // Note: connection information is always retrieved from media sections
+  virtual SdpOrigin GetOrigin() const = 0;
   virtual std::string GetSessionName() const = 0;
-  virtual Maybe<SdpBandwidth> GetBandwidth(const std::string& type) const = 0;
+  // Note: connection information is always retrieved from media sections
+  virtual std::string GetBandwidth(std::string type) const = 0;
 
-  const SdpAttributeList &GetAttributeList() const;
-  SdpAttributeList &GetAttributeList();
+  virtual const SdpAttributeList &GetAttributeList() const = 0;
+  virtual SdpAttributeList &GetAttributeList() = 0;
 
-  uint16_t GetMediaSectionCount() const;
-  const SdpMediaSection &GetMediaSection(uint16_t level) const;
-  SdpMediaSection &GetMediaSection(uint16_t level);
+  virtual uint16_t GetMediaSectionCount() const = 0;
+  virtual const SdpMediaSection &GetMediaSection(uint16_t level) const = 0;
+  virtual SdpMediaSection &GetMediaSection(uint16_t level) = 0;
 
 protected:
   virtual ~Sdp() {};
@@ -45,12 +44,12 @@ class Sdp
 class SdpOrigin
 {
 public:
-  std::string GetUsername() const;
-  uint64_t GetSessionId() const;
-  uint64_t GetSessionVersion() const;
-  sdp::NetType GetNetType() const;
-  sdp::AddrType GetAddrType() const;
-  std::string GetAddress() const;
+  virtual std::string GetUsername() const = 0;
+  virtual uint64_t GetSessionId() const = 0;
+  virtual uint64_t GetSessionVersion() const = 0;
+  virtual sdp::NetType GetNetType() const = 0;
+  virtual sdp::AddrType GetAddrType() const = 0;
+  virtual std::string GetAddress() const = 0;
 };
 
 }