diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp index 378aefbf..0be8901a 100644 --- a/src/Common/MediaSource.cpp +++ b/src/Common/MediaSource.cpp @@ -28,7 +28,6 @@ #include "MediaSource.h" #include "MediaFile/MediaReader.h" #include "Util/util.h" -#include "Rtsp/Rtsp.h" #include "Network/sockutil.h" #include "Network/TcpSession.h" diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 07caa13a..8a560997 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -34,10 +34,11 @@ #include #include #include "Common/config.h" +#include "Common/Parser.h" #include "Util/logger.h" #include "Util/TimeTicker.h" #include "Util/NoticeCenter.h" -#include "Rtsp/Rtsp.h" +#include "Extension/Track.h" using namespace std; using namespace toolkit; diff --git a/src/Common/Parser.cpp b/src/Common/Parser.cpp new file mode 100644 index 00000000..58bb8ffd --- /dev/null +++ b/src/Common/Parser.cpp @@ -0,0 +1,32 @@ +// +// Created by xzl on 2019/6/28. +// + +#include "Parser.h" + +namespace mediakit{ + +string FindField(const char* buf, const char* start, const char *end ,int bufSize) { + if(bufSize <=0 ){ + bufSize = strlen(buf); + } + const char *msg_start = buf, *msg_end = buf + bufSize; + int len = 0; + if (start != NULL) { + len = strlen(start); + msg_start = strstr(buf, start); + } + if (msg_start == NULL) { + return ""; + } + msg_start += len; + if (end != NULL) { + msg_end = strstr(msg_start, end); + if (msg_end == NULL) { + return ""; + } + } + return string(msg_start, msg_end); +} + +}//namespace mediakit \ No newline at end of file diff --git a/src/Common/Parser.h b/src/Common/Parser.h new file mode 100644 index 00000000..29c6b49e --- /dev/null +++ b/src/Common/Parser.h @@ -0,0 +1,182 @@ +// +// Created by xzl on 2019/6/28. +// + +#ifndef ZLMEDIAKIT_PARSER_H +#define ZLMEDIAKIT_PARSER_H + +#include +#include +#include "Util/util.h" +using namespace std; +using namespace toolkit; + +namespace mediakit{ + +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{ + public: + typedef multimap 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 + void emplace(K &&k , V &&v) { + auto it = find(k); + if(it != end()){ + return; + } + Super::emplace(std::forward(k),std::forward(v)); + } + + template + void emplace_force(K &&k , V &&v) { + Super::emplace(std::forward(k),std::forward(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; +}; + + +}//namespace mediakit + +#endif //ZLMEDIAKIT_PARSER_H diff --git a/src/Http/HttpClient.cpp b/src/Http/HttpClient.cpp index 9d85f5b1..72b1c2db 100644 --- a/src/Http/HttpClient.cpp +++ b/src/Http/HttpClient.cpp @@ -26,7 +26,7 @@ #include #include "HttpClient.h" -#include "Rtsp/Rtsp.h" +#include "Common/config.h" namespace mediakit { diff --git a/src/Http/HttpClient.h b/src/Http/HttpClient.h index bd41acf0..492100e0 100644 --- a/src/Http/HttpClient.h +++ b/src/Http/HttpClient.h @@ -31,9 +31,10 @@ #include #include #include -#include "Rtsp/Rtsp.h" #include "Util/util.h" +#include "Util/mini.h" #include "Network/TcpClient.h" +#include "Common/Parser.h" #include "HttpRequestSplitter.h" #include "HttpCookie.h" #include "HttpChunkedSplitter.h" diff --git a/src/Http/HttpCookieManager.h b/src/Http/HttpCookieManager.h index 3942cdc8..0bf18c98 100644 --- a/src/Http/HttpCookieManager.h +++ b/src/Http/HttpCookieManager.h @@ -32,7 +32,7 @@ #include "Util/mini.h" #include "Util/TimeTicker.h" #include "Network/Socket.h" -#include "Rtsp/Rtsp.h" +#include "Common/Parser.h" using namespace std; using namespace toolkit; diff --git a/src/Http/HttpSession.h b/src/Http/HttpSession.h index d6b4829f..51171250 100644 --- a/src/Http/HttpSession.h +++ b/src/Http/HttpSession.h @@ -28,7 +28,7 @@ #include #include "Common/config.h" -#include "Rtsp/Rtsp.h" +#include "Common/Parser.h" #include "Network/TcpSession.h" #include "Network/TcpServer.h" #include "Rtmp/RtmpMediaSource.h" diff --git a/src/Player/PlayerBase.cpp b/src/Player/PlayerBase.cpp index a97777a3..9c517595 100644 --- a/src/Player/PlayerBase.cpp +++ b/src/Player/PlayerBase.cpp @@ -26,7 +26,6 @@ #include #include "PlayerBase.h" -#include "Rtsp/Rtsp.h" #include "Rtsp/RtspPlayerImp.h" #include "Rtmp/RtmpPlayerImp.h" using namespace toolkit; diff --git a/src/Pusher/PusherBase.cpp b/src/Pusher/PusherBase.cpp index 49fd4375..47d7226e 100644 --- a/src/Pusher/PusherBase.cpp +++ b/src/Pusher/PusherBase.cpp @@ -26,7 +26,6 @@ #include #include "PusherBase.h" -#include "Rtsp/Rtsp.h" #include "Rtsp/RtspPusher.h" #include "Rtmp/RtmpPusher.h" diff --git a/src/Rtmp/RtmpPlayer.cpp b/src/Rtmp/RtmpPlayer.cpp index cdb72914..b22a2885 100644 --- a/src/Rtmp/RtmpPlayer.cpp +++ b/src/Rtmp/RtmpPlayer.cpp @@ -25,7 +25,6 @@ */ #include "RtmpPlayer.h" -#include "Rtsp/Rtsp.h" #include "Rtmp/utils.h" #include "Util/util.h" #include "Util/onceToken.h" diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp index 9bbb03f7..6fef2632 100644 --- a/src/Rtmp/RtmpProtocol.cpp +++ b/src/Rtmp/RtmpProtocol.cpp @@ -24,7 +24,6 @@ * SOFTWARE. */ #include "RtmpProtocol.h" -#include "Rtsp/Rtsp.h" #include "Rtmp/utils.h" #include "Util/util.h" #include "Util/onceToken.h" diff --git a/src/Rtmp/RtmpPusher.cpp b/src/Rtmp/RtmpPusher.cpp index c4def99f..65e17047 100644 --- a/src/Rtmp/RtmpPusher.cpp +++ b/src/Rtmp/RtmpPusher.cpp @@ -25,7 +25,6 @@ */ #include "RtmpPusher.h" #include "Rtmp/utils.h" -#include "Rtsp/Rtsp.h" #include "Util/util.h" #include "Util/onceToken.h" #include "Thread/ThreadPool.h" diff --git a/src/Rtsp/RtpBroadCaster.h b/src/Rtsp/RtpBroadCaster.h index 58090174..10a5bb48 100644 --- a/src/Rtsp/RtpBroadCaster.h +++ b/src/Rtsp/RtpBroadCaster.h @@ -33,7 +33,6 @@ #include #include #include "Common/config.h" -#include "Rtsp.h" #include "RtspMediaSource.h" #include "Util/mini.h" #include "Network/Socket.h" diff --git a/src/Rtsp/RtpReceiver.h b/src/Rtsp/RtpReceiver.h index 277d811e..a4a7c807 100644 --- a/src/Rtsp/RtpReceiver.h +++ b/src/Rtsp/RtpReceiver.h @@ -31,7 +31,6 @@ #include #include #include -#include "Rtsp.h" #include "RtspMuxer/RtpCodec.h" #include "RtspMediaSource.h" diff --git a/src/Rtsp/Rtsp.cpp b/src/Rtsp/Rtsp.cpp index 14c72e3d..e2521796 100644 --- a/src/Rtsp/Rtsp.cpp +++ b/src/Rtsp/Rtsp.cpp @@ -26,34 +26,11 @@ #include #include "Rtsp.h" +#include "Common/Parser.h" namespace mediakit{ -string FindField(const char* buf, const char* start, const char *end ,int bufSize) { - if(bufSize <=0 ){ - bufSize = strlen(buf); - } - const char *msg_start = buf, *msg_end = buf + bufSize; - int len = 0; - if (start != NULL) { - len = strlen(start); - msg_start = strstr(buf, start); - } - if (msg_start == NULL) { - return ""; - } - msg_start += len; - if (end != NULL) { - msg_end = strstr(msg_start, end); - if (msg_end == NULL) { - return ""; - } - } - return string(msg_start, msg_end); -} - - -void SdpAttr::load(const string &sdp) { +void SdpParser::load(const string &sdp) { _track_map.clear(); string key; SdpTrack::Ptr track = std::make_shared(); @@ -88,7 +65,7 @@ void SdpAttr::load(const string &sdp) { case 'm':{ _track_map[key] = track; track = std::make_shared(); - key = FindField(opt_val.data(), nullptr," ");; + key = FindField(opt_val.data(), nullptr," "); track->_m = opt_val; } break; @@ -161,11 +138,11 @@ void SdpAttr::load(const string &sdp) { } } -bool SdpAttr::available() const { +bool SdpParser::available() const { return getTrack(TrackAudio) || getTrack(TrackVideo); } -SdpTrack::Ptr SdpAttr::getTrack(TrackType type) const { +SdpTrack::Ptr SdpParser::getTrack(TrackType type) const { for (auto &pr : _track_map){ if(pr.second->_type == type){ return pr.second; @@ -174,7 +151,7 @@ SdpTrack::Ptr SdpAttr::getTrack(TrackType type) const { return nullptr; } -vector SdpAttr::getAvailableTrack() const { +vector SdpParser::getAvailableTrack() const { vector ret; auto video = getTrack(TrackVideo); if(video){ diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h index 4bcf9972..fda033b9 100644 --- a/src/Rtsp/Rtsp.h +++ b/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 Ptr; @@ -98,13 +107,13 @@ public: uint32_t _time_stamp = 0; }; -class SdpAttr { +class SdpParser { public: - typedef std::shared_ptr Ptr; + typedef std::shared_ptr 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{ -public: - typedef multimap 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 - void emplace(K &&k , V &&v) { - auto it = find(k); - if(it != end()){ - return; - } - Super::emplace(std::forward(k),std::forward(v)); - } - - template - void emplace_force(K &&k , V &&v) { - Super::emplace(std::forward(k),std::forward(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基类 */ diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h index 78911810..5778ef15 100644 --- a/src/Rtsp/RtspMediaSource.h +++ b/src/Rtsp/RtspMediaSource.h @@ -32,7 +32,6 @@ #include #include #include -#include "Rtsp.h" #include "Common/config.h" #include "Common/MediaSource.h" #include "RtspMuxer/RtpCodec.h" @@ -79,14 +78,14 @@ public: } virtual uint32_t getSsrc(TrackType trackType) { - auto track = _sdpAttr.getTrack(trackType); + auto track = _sdpParser.getTrack(trackType); if(!track){ return 0; } return track->_ssrc; } virtual uint16_t getSeqence(TrackType trackType) { - auto track = _sdpAttr.getTrack(trackType); + auto track = _sdpParser.getTrack(trackType); if(!track){ return 0; } @@ -94,11 +93,11 @@ public: } uint32_t getTimeStamp(TrackType trackType) override { - auto track = _sdpAttr.getTrack(trackType); + auto track = _sdpParser.getTrack(trackType); if(track) { return track->_time_stamp; } - auto tracks = _sdpAttr.getAvailableTrack(); + auto tracks = _sdpParser.getAvailableTrack(); switch (tracks.size()){ case 0: return 0; case 1: return tracks[0]->_time_stamp; @@ -107,7 +106,7 @@ public: } virtual void setTimeStamp(uint32_t uiStamp) { - auto tracks = _sdpAttr.getAvailableTrack(); + auto tracks = _sdpParser.getAvailableTrack(); for (auto &track : tracks) { track->_time_stamp = uiStamp; } @@ -116,14 +115,14 @@ public: virtual void onGetSDP(const string& sdp) { //派生类设置该媒体源媒体描述信息 _strSdp = sdp; - _sdpAttr.load(sdp); + _sdpParser.load(sdp); if(_pRing){ regist(); } } void onWrite(const RtpPacket::Ptr &rtppt, bool keyPos) override { - auto track = _sdpAttr.getTrack(rtppt->type); + auto track = _sdpParser.getTrack(rtppt->type); if(track){ track->_seq = rtppt->sequence; track->_time_stamp = rtppt->timeStamp; @@ -166,7 +165,7 @@ private: } } protected: - SdpAttr _sdpAttr; + SdpParser _sdpParser; string _strSdp; //媒体描述信息 RingType::Ptr _pRing; //rtp环形缓冲 int _ringSize; diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index 6853116d..65ed6dbe 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -220,13 +220,13 @@ void RtspPlayer::handleResDESCRIBE(const Parser& parser) { } //解析sdp - _sdpAttr.load(parser.Content()); - _aTrackInfo = _sdpAttr.getAvailableTrack(); + _sdpParser.load(parser.Content()); + _aTrackInfo = _sdpParser.getAvailableTrack(); if (_aTrackInfo.empty()) { throw std::runtime_error("无有效的Sdp Track"); } - if (!onCheckSDP(parser.Content(), _sdpAttr)) { + if (!onCheckSDP(parser.Content(), _sdpParser)) { throw std::runtime_error("onCheckSDP faied"); } diff --git a/src/Rtsp/RtspPlayer.h b/src/Rtsp/RtspPlayer.h index acf032a8..68235d18 100644 --- a/src/Rtsp/RtspPlayer.h +++ b/src/Rtsp/RtspPlayer.h @@ -29,7 +29,6 @@ #include #include -#include "Rtsp.h" #include "RtspSession.h" #include "RtspMediaSource.h" #include "Player/PlayerBase.h" @@ -60,7 +59,7 @@ public: float getPacketLossRate(TrackType type) const override; protected: //派生类回调函数 - virtual bool onCheckSDP(const string &strSdp, const SdpAttr &sdpAttr) = 0; + virtual bool onCheckSDP(const string &strSdp, const SdpParser &parser) = 0; virtual void onRecvRTP(const RtpPacket::Ptr &pRtppt, const SdpTrack::Ptr &track) = 0; uint32_t getProgressMilliSecond() const; void seekToMilliSecond(uint32_t ms); @@ -123,7 +122,7 @@ private: void sendReceiverReport(bool overTcp,int iTrackIndex); private: string _strUrl; - SdpAttr _sdpAttr; + SdpParser _sdpParser; vector _aTrackInfo; function _onHandshake; Socket::Ptr _apRtpSock[2]; //RTP端口,trackid idx 为数组下标 diff --git a/src/Rtsp/RtspPlayerImp.h b/src/Rtsp/RtspPlayerImp.h index 80b99e34..82525746 100644 --- a/src/Rtsp/RtspPlayerImp.h +++ b/src/Rtsp/RtspPlayerImp.h @@ -61,19 +61,19 @@ public: }; private: //派生类回调函数 - bool onCheckSDP(const string &sdp, const SdpAttr &sdpAttr) override { + bool onCheckSDP(const string &sdp, const SdpParser &parser) override { _pRtspMediaSrc = dynamic_pointer_cast(_pMediaSrc); if(_pRtspMediaSrc){ _pRtspMediaSrc->onGetSDP(sdp); } - _parser.reset(new RtspDemuxer(sdpAttr)); + _parser.reset(new RtspDemuxer(parser)); return true; } - void onRecvRTP(const RtpPacket::Ptr &rtppt, const SdpTrack::Ptr &track) override { + void onRecvRTP(const RtpPacket::Ptr &rtp, const SdpTrack::Ptr &track) override { if(_pRtspMediaSrc){ - _pRtspMediaSrc->onWrite(rtppt,true); + _pRtspMediaSrc->onWrite(rtp,true); } - _parser->inputRtp(rtppt); + _parser->inputRtp(rtp); //由于我们重载isInited方法强制认为一旦获取sdp那么就初始化Track成功, //所以我们不需要在后续检验是否初始化成功 diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp index d49694e6..c30e6152 100644 --- a/src/Rtsp/RtspPusher.cpp +++ b/src/Rtsp/RtspPusher.cpp @@ -169,8 +169,8 @@ void RtspPusher::sendAnnounce() { throw std::runtime_error("the media source was released"); } //解析sdp - _sdpAttr.load(src->getSdp()); - _aTrackInfo = _sdpAttr.getAvailableTrack(); + _sdpParser.load(src->getSdp()); + _aTrackInfo = _sdpParser.getAvailableTrack(); if (_aTrackInfo.empty()) { throw std::runtime_error("无有效的Sdp Track"); diff --git a/src/Rtsp/RtspPusher.h b/src/Rtsp/RtspPusher.h index fea59917..0d1c5890 100644 --- a/src/Rtsp/RtspPusher.h +++ b/src/Rtsp/RtspPusher.h @@ -7,7 +7,6 @@ #include #include -#include "Rtsp.h" #include "RtspMediaSource.h" #include "Util/util.h" #include "Util/logger.h" @@ -81,7 +80,7 @@ private: Event _onPublished; string _strUrl; - SdpAttr _sdpAttr; + SdpParser _sdpParser; vector _aTrackInfo; string _strSession; unsigned int _uiCseq = 1; diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index 95ca8816..d3677ca5 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -244,7 +244,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) { _strSession = makeRandStr(12); _strSdp = parser.Content(); - _aTrackInfo = SdpAttr(_strSdp).getAvailableTrack(); + _aTrackInfo = SdpParser(_strSdp).getAvailableTrack(); _pushSrc = std::make_shared(_mediaInfo._vhost,_mediaInfo._app,_mediaInfo._streamid); _pushSrc->setListener(dynamic_pointer_cast(shared_from_this())); @@ -363,8 +363,8 @@ void RtspSession::onAuthSuccess() { } //找到了响应的rtsp流 strongSelf->_strSdp = rtsp_src->getSdp(); - SdpAttr sdpAttr(strongSelf->_strSdp); - strongSelf->_aTrackInfo = sdpAttr.getAvailableTrack(); + SdpParser sdpParser(strongSelf->_strSdp); + strongSelf->_aTrackInfo = sdpParser.getAvailableTrack(); if (strongSelf->_aTrackInfo.empty()) { //该流无效 strongSelf->send_StreamNotFound(); diff --git a/src/Rtsp/RtspSession.h b/src/Rtsp/RtspSession.h index ed3970e5..35019881 100644 --- a/src/Rtsp/RtspSession.h +++ b/src/Rtsp/RtspSession.h @@ -36,7 +36,6 @@ #include "Common/config.h" #include "Network/TcpSession.h" #include "Player/PlayerBase.h" -#include "Rtsp.h" #include "RtpBroadCaster.h" #include "RtspMediaSource.h" #include "RtspSplitter.h" diff --git a/src/Rtsp/RtspSplitter.h b/src/Rtsp/RtspSplitter.h index 1345a8bc..5390c654 100644 --- a/src/Rtsp/RtspSplitter.h +++ b/src/Rtsp/RtspSplitter.h @@ -27,7 +27,7 @@ #ifndef ZLMEDIAKIT_RTSPSPLITTER_H #define ZLMEDIAKIT_RTSPSPLITTER_H -#include "Rtsp.h" +#include "Common/Parser.h" #include "Http/HttpRequestSplitter.h" namespace mediakit{ diff --git a/src/RtspMuxer/RtpCodec.h b/src/RtspMuxer/RtpCodec.h index a422703a..7ce212c7 100644 --- a/src/RtspMuxer/RtpCodec.h +++ b/src/RtspMuxer/RtpCodec.h @@ -29,7 +29,6 @@ #include #include "Util/RingBuffer.h" -#include "Rtsp/Rtsp.h" #include "Player/PlayerBase.h" using namespace toolkit; diff --git a/src/RtspMuxer/RtspDemuxer.cpp b/src/RtspMuxer/RtspDemuxer.cpp index 12ecd703..faecd3e2 100644 --- a/src/RtspMuxer/RtspDemuxer.cpp +++ b/src/RtspMuxer/RtspDemuxer.cpp @@ -35,14 +35,14 @@ using namespace std; namespace mediakit { RtspDemuxer::RtspDemuxer(const string& sdp) { - loadSdp(SdpAttr(sdp)); + loadSdp(SdpParser(sdp)); } -RtspDemuxer::RtspDemuxer(const SdpAttr &attr) { +RtspDemuxer::RtspDemuxer(const SdpParser &attr) { loadSdp(attr); } -void RtspDemuxer::loadSdp(const SdpAttr &attr) { +void RtspDemuxer::loadSdp(const SdpParser &attr) { auto tracks = attr.getAvailableTrack(); for (auto &track : tracks){ switch (track->_type) { diff --git a/src/RtspMuxer/RtspDemuxer.h b/src/RtspMuxer/RtspDemuxer.h index 5dec22d3..d2836d2c 100644 --- a/src/RtspMuxer/RtspDemuxer.h +++ b/src/RtspMuxer/RtspDemuxer.h @@ -28,7 +28,6 @@ #define SRC_RTP_RTSPDEMUXER_H_ #include -#include "Rtsp/Rtsp.h" #include "Player/PlayerBase.h" #include "Util/TimeTicker.h" #include "RtspMuxer/RtpCodec.h" @@ -42,7 +41,7 @@ class RtspDemuxer : public Demuxer{ public: typedef std::shared_ptr Ptr; RtspDemuxer(const string &sdp); - RtspDemuxer(const SdpAttr &attr); + RtspDemuxer(const SdpParser &parser); virtual ~RtspDemuxer(){}; /** @@ -54,7 +53,7 @@ public: private: void makeAudioTrack(const SdpTrack::Ptr &audio); void makeVideoTrack(const SdpTrack::Ptr &video); - void loadSdp(const SdpAttr &attr); + void loadSdp(const SdpParser &parser); private: RtpCodec::Ptr _audioRtpDecoder; RtpCodec::Ptr _videoRtpDecoder;