From 4f072eb36a51bb30f31ea7f2f14f87cdaa2a50e8 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Tue, 6 Feb 2018 10:56:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B8=A2=E5=87=BA=E6=8E=A8?= =?UTF-8?q?=E6=B5=81=E5=99=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MediaSource.h | 28 ++++++++++++++++++++++++++++ src/MediaFile/MediaReader.cpp | 4 ++++ src/MediaFile/MediaReader.h | 1 + src/Rtmp/RtmpSession.cpp | 5 +++-- src/Rtmp/RtmpSession.h | 8 +++++++- src/Rtsp/Rtsp.h | 12 ++++++------ 6 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 9f95a0ee..e2bd3975 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -55,11 +55,17 @@ public: virtual ~MediaSourceEvent(){}; public: virtual bool seekTo(uint32_t ui32Stamp){ + //拖动进度条 return false; } virtual uint32_t getStamp() { + //获取时间戳 return 0; } + virtual bool shutDown() { + //通知其停止推流 + return false; + } }; class MediaInfo { @@ -151,9 +157,30 @@ public: } return listener->getStamp(); } + bool shutDown() { + auto listener = m_listener.lock(); + if(!listener){ + return false; + } + return listener->shutDown(); + } void setListener(const std::weak_ptr &listener){ m_listener = listener; } + + template + static void for_each_media(FUN && fun){ + lock_guard lock(g_mtxMediaSrc); + for (auto &pr0 : g_mapMediaSrc){ + for(auto &pr1 : pr0.second){ + for(auto &pr2 : pr1.second){ + for(auto &pr3 : pr2.second){ + fun(pr0.first,pr1.first,pr2.first,pr3.first,pr3.second.lock()); + } + } + } + } + } private: template static bool searchMedia(const string &schema, @@ -195,6 +222,7 @@ private: } } }; + void unregisted(); protected: std::weak_ptr m_listener; diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp index 66680e26..d9f74070 100644 --- a/src/MediaFile/MediaReader.cpp +++ b/src/MediaFile/MediaReader.cpp @@ -181,6 +181,10 @@ void MediaReader::startReadMP4() { uint32_t MediaReader::getStamp() { return m_iSeekTime + m_ticker.elapsedTime(); } +bool MediaReader::shutDown(){ + AsyncTaskThread::Instance().CancelTask(reinterpret_cast(this)); + return true; +} bool MediaReader::readSample(int iTimeInc) { TimeTicker(); diff --git a/src/MediaFile/MediaReader.h b/src/MediaFile/MediaReader.h index 81a74a49..ae43609f 100644 --- a/src/MediaFile/MediaReader.h +++ b/src/MediaFile/MediaReader.h @@ -51,6 +51,7 @@ public: public: bool seekTo(uint32_t ui32Stamp) override; uint32_t getStamp() override; + bool shutDown() override; private: #ifdef ENABLE_MP4V2 diff --git a/src/Rtmp/RtmpSession.cpp b/src/Rtmp/RtmpSession.cpp index ace4bce8..230836a0 100644 --- a/src/Rtmp/RtmpSession.cpp +++ b/src/Rtmp/RtmpSession.cpp @@ -145,7 +145,7 @@ void RtmpSession::onCmd_publish(AMFDecoder &dec) { sendReply("onStatus", nullptr, status); if (!ok) { WarnL << "onPublish:" - << (authSuccess ? "Already publishing:" : err.data()) + << (authSuccess ? "Already publishing:" : err.data()) << " " << m_mediaInfo.m_vhost << " " << m_mediaInfo.m_app << " " << m_mediaInfo.m_streamid << endl; @@ -154,6 +154,7 @@ void RtmpSession::onCmd_publish(AMFDecoder &dec) { } m_bPublisherSrcRegisted = false; m_pPublisherSrc.reset(new RtmpToRtspMediaSource(m_mediaInfo.m_vhost,m_mediaInfo.m_app,m_mediaInfo.m_streamid)); + m_pPublisherSrc->setListener(dynamic_pointer_cast(shared_from_this())); }; weak_ptr weakSelf = dynamic_pointer_cast(shared_from_this()); @@ -213,7 +214,7 @@ void RtmpSession::doPlay(AMFDecoder &dec){ sendReply("onStatus", nullptr, status); if (!ok) { WarnL << "onPlayed:" - << (authSuccess ? "No such stream:" : err.data()) + << (authSuccess ? "No such stream:" : err.data()) << " " << m_mediaInfo.m_vhost << " " << m_mediaInfo.m_app << " " << m_mediaInfo.m_streamid diff --git a/src/Rtmp/RtmpSession.h b/src/Rtmp/RtmpSession.h index 2efa95d4..48980b74 100644 --- a/src/Rtmp/RtmpSession.h +++ b/src/Rtmp/RtmpSession.h @@ -44,7 +44,7 @@ using namespace ZL::Network; namespace ZL { namespace Rtmp { -class RtmpSession: public TcpLimitedSession ,public RtmpProtocol{ +class RtmpSession: public TcpLimitedSession ,public RtmpProtocol , public MediaSourceEvent{ public: typedef std::shared_ptr Ptr; RtmpSession(const std::shared_ptr &_th, const Socket::Ptr &_sock); @@ -95,6 +95,12 @@ private: invoke << str << m_dNowReqID << reply << status; sendResponse(MSG_CMD, invoke.data()); } + + bool shutDown() override { + InfoL << "kick out:" << m_mediaInfo.m_vhost << " " << m_mediaInfo.m_app << " " << m_mediaInfo.m_streamid; + safeShutdown(); + return true; + } }; } /* namespace Rtmp */ diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h index 9b9f41b7..55bce5c6 100644 --- a/src/Rtsp/Rtsp.h +++ b/src/Rtsp/Rtsp.h @@ -114,7 +114,7 @@ public: auto field = FindField(line.c_str(), NULL, ": "); auto value = FindField(line.c_str(), ": ", NULL); if (field.size() != 0) { - m_mapValues[field] = value; + m_mapHeaders[field] = value; } } start = start + line.size() + 2; @@ -142,8 +142,8 @@ public: } const string& operator[](const char *name) const { //rtsp field - auto it = m_mapValues.find(name); - if (it == m_mapValues.end()) { + auto it = m_mapHeaders.find(name); + if (it == m_mapHeaders.end()) { return m_strNull; } return it->second; @@ -157,7 +157,7 @@ public: m_strFullUrl.clear(); m_strTail.clear(); m_strContent.clear(); - m_mapValues.clear(); + m_mapHeaders.clear(); m_mapUrlArgs.clear(); } @@ -169,7 +169,7 @@ public: } StrCaseMap& getValues() const { - return m_mapValues; + return m_mapHeaders; } StrCaseMap& getUrlArgs() const { return m_mapUrlArgs; @@ -195,7 +195,7 @@ private: string m_strContent; string m_strNull; string m_strFullUrl; - mutable StrCaseMap m_mapValues; + mutable StrCaseMap m_mapHeaders; mutable StrCaseMap m_mapUrlArgs; };