Browse Source

Cleaned up inline methods in Description

Paul-Louis Ageneau 1 year ago
parent
commit
a9a6f9eba4
3 changed files with 35 additions and 24 deletions
  1. 11 14
      include/rtc/description.hpp
  2. 1 1
      include/rtc/rtc.hpp
  3. 23 9
      src/description.cpp

+ 11 - 14
include/rtc/description.hpp

@@ -78,14 +78,14 @@ public:
 	public:
 		virtual ~Entry() = default;
 
-		virtual string type() const { return mType; }
-		virtual string description() const { return mDescription; }
-		virtual string mid() const { return mMid; }
+		virtual string type() const;
+		virtual string description() const;
+		virtual string mid() const;
 
-		Direction direction() const { return mDirection; }
+		Direction direction() const;
 		void setDirection(Direction dir);
 
-		bool isRemoved() const { return mIsRemoved; }
+		bool isRemoved() const;
 		void markRemoved();
 
 		std::vector<string> attributes() const;
@@ -144,12 +144,12 @@ public:
 		string description() const override;
 		Application reciprocate() const;
 
-		void setSctpPort(uint16_t port) { mSctpPort = port; }
-		void hintSctpPort(uint16_t port) { mSctpPort = mSctpPort.value_or(port); }
-		void setMaxMessageSize(size_t size) { mMaxMessageSize = size; }
+		void setSctpPort(uint16_t port);
+		void hintSctpPort(uint16_t port);
+		void setMaxMessageSize(size_t size);
 
-		optional<uint16_t> sctpPort() const { return mSctpPort; }
-		optional<size_t> maxMessageSize() const { return mMaxMessageSize; }
+		optional<uint16_t> sctpPort() const;
+		optional<size_t> maxMessageSize() const;
 
 		virtual void parseSdpLine(string_view line) override;
 
@@ -178,7 +178,7 @@ public:
 		bool hasSSRC(uint32_t ssrc) const;
 		void clearSSRCs();
 		std::vector<uint32_t> getSSRCs() const;
-		std::optional<std::string> getCNameForSsrc(uint32_t ssrc) const;
+		optional<std::string> getCNameForSsrc(uint32_t ssrc) const;
 
 		int bitrate() const;
 		void setBitrate(int bitrate);
@@ -233,11 +233,8 @@ public:
 		void addAudioCodec(int payloadType, string codec, optional<string> profile = std::nullopt);
 
 		void addOpusCodec(int payloadType, optional<string> profile = DEFAULT_OPUS_AUDIO_PROFILE);
-
 		void addPCMACodec(int payloadType, optional<string> profile = std::nullopt);
-
 		void addPCMUCodec(int payloadType, optional<string> profile = std::nullopt);
-		
 		void addAacCodec(int payloadType, optional<string> profile = std::nullopt);
 	};
 

+ 1 - 1
include/rtc/rtc.hpp

@@ -33,7 +33,7 @@
 #include "rtcpreceivingsession.hpp"
 #include "rtcpsrreporter.hpp"
 
-// Opus/h264/AV1/h265 streaming
+// Opus/AAC/h264/h265/AV1 streaming
 #include "h264packetizationhandler.hpp"
 #include "h265packetizationhandler.hpp"
 #include "av1packetizationhandler.hpp"

+ 23 - 9
src/description.cpp

@@ -521,8 +521,18 @@ Description::Entry::Entry(const string &mline, string mid, Direction dir)
 	mIsRemoved = (port == 0);
 }
 
+string Description::Entry::type() const { return mType; }
+
+string Description::Entry::description() const { return mDescription; }
+
+string Description::Entry::mid() const { return mMid; }
+
+Description::Direction Description::Entry::direction() const { return mDirection; }
+
 void Description::Entry::setDirection(Direction dir) { mDirection = dir; }
 
+bool Description::Entry::isRemoved() const { return mIsRemoved; }
+
 void Description::Entry::markRemoved() { mIsRemoved = true; }
 
 std::vector<string> Description::attributes() const { return mAttributes; }
@@ -532,9 +542,7 @@ void Description::addAttribute(string attr) {
 		mAttributes.emplace_back(std::move(attr));
 }
 
-void Description::Entry::addRid(string rid) {
-	mRids.emplace_back(rid);
-}
+void Description::Entry::addRid(string rid) { mRids.emplace_back(rid); }
 
 void Description::removeAttribute(const string &attr) {
 	mAttributes.erase(
@@ -728,8 +736,7 @@ void Description::Media::addSSRC(uint32_t ssrc, optional<string> name, optional<
 	if (msid) {
 		mAttributes.emplace_back("ssrc:" + std::to_string(ssrc) + " msid:" + *msid + " " +
 		                         trackId.value_or(*msid));
-		mAttributes.emplace_back("msid:" + *msid + " " +
-				trackId.value_or(*msid));
+		mAttributes.emplace_back("msid:" + *msid + " " + trackId.value_or(*msid));
 	}
 
 	mSsrcs.emplace_back(ssrc);
@@ -795,6 +802,16 @@ Description::Application Description::Application::reciprocate() const {
 	return reciprocated;
 }
 
+void Description::Application::setSctpPort(uint16_t port) { mSctpPort = port; }
+
+void Description::Application::hintSctpPort(uint16_t port) { mSctpPort = mSctpPort.value_or(port); }
+
+void Description::Application::setMaxMessageSize(size_t size) { mMaxMessageSize = size; }
+
+optional<uint16_t> Description::Application::sctpPort() const { return mSctpPort; }
+
+optional<size_t> Description::Application::maxMessageSize() const { return mMaxMessageSize; }
+
 string Description::Application::generateSdpLines(string_view eol) const {
 	std::ostringstream sdp;
 	sdp << Entry::generateSdpLines(eol);
@@ -1144,7 +1161,6 @@ void Description::Audio::addAacCodec(int payloadType, optional<string> profile)
 	} else {
 		addAudioCodec(payloadType, "MP4A-LATM", "cpresent=1");
 	}
-	
 }
 
 Description::Video::Video(string mid, Direction dir)
@@ -1196,9 +1212,7 @@ void Description::Video::addVP9Codec(int payloadType) {
 	addVideoCodec(payloadType, "VP9", nullopt);
 }
 
-void Description::Video::addAV1Codec(int pt) {
-	addVideoCodec(pt, "AV1", nullopt);
-}
+void Description::Video::addAV1Codec(int pt) { addVideoCodec(pt, "AV1", nullopt); }
 
 Description::Type Description::stringToType(const string &typeString) {
 	using TypeMap_t = std::unordered_map<string, Type>;