整理优化代码

src/Rtsp/Rtsp.h

@@ -63,6 +63,15 @@ public:
 	TrackType type;
 };
 
+class RtcpCounter {
+public:
+	uint32_t pktCnt = 0;
+	uint32_t octCount = 0;
+	//网络字节序
+	uint32_t timeStamp = 0;
+	uint32_t lastTimeStamp = 0;
+};
+
 class SdpTrack {
 public:
 	typedef std::shared_ptr<SdpTrack> Ptr;
@@ -98,13 +107,13 @@ public:
 	uint32_t _time_stamp = 0;
 };
 
-class SdpAttr {
+class SdpParser {
 public:
-	typedef std::shared_ptr<SdpAttr> Ptr;
+	typedef std::shared_ptr<SdpParser> Ptr;
 
-	SdpAttr() {}
-	SdpAttr(const string &sdp) { load(sdp); }
-	~SdpAttr() {}
+	SdpParser() {}
+	SdpParser(const string &sdp) { load(sdp); }
+	~SdpParser() {}
 	void load(const string &sdp);
 	bool available() const;
 	SdpTrack::Ptr getTrack(TrackType type) const;
@@ -114,179 +123,6 @@ private:
 };
 
 
-class RtcpCounter {
-public:
-	uint32_t pktCnt = 0;
-	uint32_t octCount = 0;
-	//网络字节序
-	uint32_t timeStamp = 0;
-    uint32_t lastTimeStamp = 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; }
-};
-
-
-class StrCaseMap : public multimap<string, string, StrCaseCompare>{
-public:
-    typedef multimap<string, string, StrCaseCompare> Super ;
-    StrCaseMap() = default;
-    ~StrCaseMap() = default;
-    string &operator[](const string &key){
-        auto it = find(key);
-        if(it == end()){
-            it = Super::emplace(key,"");
-        }
-        return it->second;
-    }
-
-    template <class K,class V>
-    void emplace(K &&k , V &&v) {
-        auto it = find(k);
-        if(it != end()){
-            return;
-        }
-        Super::emplace(std::forward<K>(k),std::forward<V>(v));
-    }
-
-    template <class K,class V>
-    void emplace_force(K &&k , V &&v) {
-        Super::emplace(std::forward<K>(k),std::forward<V>(v));
-    }
-};
-
-class Parser {
-public:
-	Parser() {}
-
-	virtual ~Parser() {}
-
-	void Parse(const char *buf) {
-		//解析
-		const char *start = buf;
-		Clear();
-		while (true) {
-			auto line = FindField(start, NULL, "\r\n");
-			if (line.size() == 0) {
-				break;
-			}
-			if (start == buf) {
-				_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);
-                    _params = _strFullUrl.substr(args_pos + 1);
-					_mapUrlArgs = parseArgs(_params);
-				} else {
-					_strUrl = _strFullUrl;
-				}
-				_strTail = FindField(line.data(), (_strFullUrl + " ").data(), NULL);
-			} else {
-				auto field = FindField(line.data(), NULL, ": ");
-				auto value = FindField(line.data(), ": ", NULL);
-				if (field.size() != 0) {
-					_mapHeaders.emplace_force(field,value);
-				}
-			}
-			start = start + line.size() + 2;
-			if (strncmp(start, "\r\n", 2) == 0) { //协议解析完毕
-				_strContent = FindField(start, "\r\n", NULL);
-				break;
-			}
-		}
-	}
-
-	const string &Method() const {
-		//rtsp方法
-		return _strMethod;
-	}
-
-	const string &Url() const {
-		//rtsp url
-		return _strUrl;
-	}
-
-	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 {
-		//rtsp field
-		auto it = _mapHeaders.find(name);
-		if (it == _mapHeaders.end()) {
-			return _strNull;
-		}
-		return it->second;
-	}
-
-	const string &Content() const {
-		return _strContent;
-	}
-
-	void Clear() {
-		_strMethod.clear();
-		_strUrl.clear();
-		_strFullUrl.clear();
-        _params.clear();
-		_strTail.clear();
-		_strContent.clear();
-		_mapHeaders.clear();
-		_mapUrlArgs.clear();
-	}
-	 const string &Params() const {
-         return _params;
-	}
-
-	void setUrl(const string &url) {
-		this->_strUrl = url;
-	}
-
-	void setContent(const string &content) {
-		this->_strContent = content;
-	}
-
-	StrCaseMap &getValues() const {
-		return _mapHeaders;
-	}
-
-	StrCaseMap &getUrlArgs() const {
-		return _mapUrlArgs;
-	}
-
-	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);
-			ret.emplace_force(key,val);
-		}
-		return ret;
-	}
-
-private:
-	string _strMethod;
-	string _strUrl;
-	string _strTail;
-	string _strContent;
-	string _strNull;
-	string _strFullUrl;
-	string _params;
-	mutable StrCaseMap _mapHeaders;
-	mutable StrCaseMap _mapUrlArgs;
-};
-
-
 /**
 * rtsp sdp基类
 */