添加rtsp推流器

整理代码

src/Rtsp/Rtsp.h

@@ -38,7 +38,18 @@ using namespace std;
 using namespace toolkit;
 using namespace mediakit;
 
-class SdpTrack{
+namespace mediakit {
+
+namespace Rtsp {
+typedef enum {
+	RTP_Invalid = -1,
+	RTP_TCP = 0,
+	RTP_UDP = 1,
+	RTP_MULTICAST = 2,
+} eRtpType;
+};
+
+class SdpTrack {
 public:
 	typedef std::shared_ptr<SdpTrack> Ptr;
 
@@ -54,8 +65,8 @@ public:
 	float _start = 0;
 	float _end = 0;
 
-	map<char,string> _other;
-	map<string,string> _attr;
+	map<char, string> _other;
+	map<string, string> _attr;
 public:
 	int _pt;
 	string _codec;
@@ -65,50 +76,58 @@ public:
 	string _control_surffix;
 	TrackType _type;
 public:
-    uint8_t _interleaved = 0;
-    bool _inited = false;
-    uint32_t _ssrc = 0;
-    uint16_t _seq = 0;
+	uint8_t _interleaved = 0;
+	bool _inited = false;
+	uint32_t _ssrc = 0;
+	uint16_t _seq = 0;
 	//时间戳，单位毫秒
-    uint32_t _time_stamp = 0;
+	uint32_t _time_stamp = 0;
 };
+
 class SdpAttr {
 public:
 	typedef std::shared_ptr<SdpAttr> Ptr;
-    SdpAttr(){}
-	SdpAttr(const string &sdp){load(sdp);}
-	~SdpAttr(){}
 
-    void load(const string &sdp);
-    bool available() const ;
+	SdpAttr() {}
+
+	SdpAttr(const string &sdp) { load(sdp); }
+
+	~SdpAttr() {}
+
+	void load(const string &sdp);
+
+	bool available() const;
+
+	SdpTrack::Ptr getTrack(TrackType type) const;
+
+	vector<SdpTrack::Ptr> getAvailableTrack() const;
 
-    SdpTrack::Ptr getTrack(TrackType type) const;
-    vector<SdpTrack::Ptr> getAvailableTrack() const;
 private:
-    map<string,SdpTrack::Ptr> _track_map;
+	map<string, SdpTrack::Ptr> _track_map;
 };
 
 
 class RtcpCounter {
 public:
-    uint32_t pktCnt = 0;
-    uint32_t octCount = 0;
-    uint32_t timeStamp = 0;
+	uint32_t pktCnt = 0;
+	uint32_t octCount = 0;
+	uint32_t timeStamp = 0;
 };
 
-string FindField(const char* buf, const char* start, const char *end,int bufSize = 0 );
+string FindField(const char *buf, const char *start, const char *end, int bufSize = 0);
 
-struct StrCaseCompare
-{
-    bool operator()(const string& __x, const string& __y) const
-    {return strcasecmp(__x.data(), __y.data()) < 0 ;}
+struct StrCaseCompare {
+	bool operator()(const string &__x, const string &__y) const { return strcasecmp(__x.data(), __y.data()) < 0; }
 };
-typedef map<string,string,StrCaseCompare> StrCaseMap;
+
+typedef map<string, string, StrCaseCompare> StrCaseMap;
 
 class Parser {
 public:
 	Parser() {}
+
 	virtual ~Parser() {}
+
 	void Parse(const char *buf) {
 		//解析
 		const char *start = buf;
@@ -119,19 +138,19 @@ public:
 				break;
 			}
 			if (start == buf) {
-				_strMethod = FindField(line.c_str(), NULL, " ");
-                _strFullUrl = FindField(line.c_str(), " ", " ");
-				auto args_pos =  _strFullUrl.find('?');
-				if(args_pos != string::npos){
-					_strUrl = _strFullUrl.substr(0,args_pos);
-					_mapUrlArgs = parseArgs(_strFullUrl.substr(args_pos + 1 ));
-				}else{
+				_strMethod = FindField(line.data(), NULL, " ");
+				_strFullUrl = FindField(line.data(), " ", " ");
+				auto args_pos = _strFullUrl.find('?');
+				if (args_pos != string::npos) {
+					_strUrl = _strFullUrl.substr(0, args_pos);
+					_mapUrlArgs = parseArgs(_strFullUrl.substr(args_pos + 1));
+				} else {
 					_strUrl = _strFullUrl;
 				}
-				_strTail = FindField(line.c_str(), (_strFullUrl + " ").c_str(), NULL);
+				_strTail = FindField(line.data(), (_strFullUrl + " ").data(), NULL);
 			} else {
-				auto field = FindField(line.c_str(), NULL, ": ");
-				auto value = FindField(line.c_str(), ": ", NULL);
+				auto field = FindField(line.data(), NULL, ": ");
+				auto value = FindField(line.data(), ": ", NULL);
 				if (field.size() != 0) {
 					_mapHeaders[field] = value;
 				}
@@ -143,23 +162,28 @@ public:
 			}
 		}
 	}
-	const string& Method() const {
+
+	const string &Method() const {
 		//rtsp方法
 		return _strMethod;
 	}
-	const string& Url() const {
+
+	const string &Url() const {
 		//rtsp url
 		return _strUrl;
 	}
-    const string& FullUrl() const {
-        //rtsp url with args
-        return _strFullUrl;
-    }
-	const string& Tail() const {
+
+	const string &FullUrl() const {
+		//rtsp url with args
+		return _strFullUrl;
+	}
+
+	const string &Tail() const {
 		//RTSP/1.0
 		return _strTail;
 	}
-	const string& operator[](const char *name) const {
+
+	const string &operator[](const char *name) const {
 		//rtsp field
 		auto it = _mapHeaders.find(name);
 		if (it == _mapHeaders.end()) {
@@ -167,39 +191,43 @@ public:
 		}
 		return it->second;
 	}
-	const string& Content() const {
+
+	const string &Content() const {
 		return _strContent;
 	}
+
 	void Clear() {
 		_strMethod.clear();
 		_strUrl.clear();
-        _strFullUrl.clear();
+		_strFullUrl.clear();
 		_strTail.clear();
 		_strContent.clear();
 		_mapHeaders.clear();
 		_mapUrlArgs.clear();
 	}
 
-	void setUrl(const string& url) {
+	void setUrl(const string &url) {
 		this->_strUrl = url;
 	}
-	void setContent(const string& content) {
+
+	void setContent(const string &content) {
 		this->_strContent = content;
 	}
 
-	StrCaseMap& getValues() const {
+	StrCaseMap &getValues() const {
 		return _mapHeaders;
 	}
-	StrCaseMap& getUrlArgs() const {
+
+	StrCaseMap &getUrlArgs() const {
 		return _mapUrlArgs;
 	}
 
-	static StrCaseMap parseArgs(const string &str,const char *pair_delim = "&", const char *key_delim = "="){
+	static StrCaseMap parseArgs(const string &str, const char *pair_delim = "&", const char *key_delim = "=") {
 		StrCaseMap ret;
 		auto arg_vec = split(str, pair_delim);
 		for (string &key_val : arg_vec) {
-			auto key = FindField(key_val.data(),NULL,key_delim);
-			auto val = FindField(key_val.data(),key_delim, NULL);
+			auto key = FindField(key_val.data(), NULL, key_delim);
+			auto val = FindField(key_val.data(), key_delim, NULL);
 			ret[key] = val;
 		}
 		return ret;
@@ -211,11 +239,11 @@ private:
 	string _strTail;
 	string _strContent;
 	string _strNull;
-    string _strFullUrl;
+	string _strFullUrl;
 	mutable StrCaseMap _mapHeaders;
 	mutable StrCaseMap _mapUrlArgs;
 };
 
-
+} //namespace mediakit
 
 #endif //RTSP_RTSP_H_