Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 19:51:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

完成FLV复用器改造

Browse Source 
优化代码结构
This commit is contained in:
xiongziliang
2018-08-31 14:13:00 +08:00
parent ef9ebc89e0
commit 732eb2d197
15 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Rtmp/RtmpSession.cpp
View File

@@ -167,7 +167,6 @@ void RtmpSession::onCmd_publish(AMFDecoder &dec) {
shutdown();
return;
}
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<MediaSourceEvent>(shared_from_this()));
};
@@ -212,13 +211,6 @@ void RtmpSession::doPlayResponse(const string &err,bool tryDelay,const std::shar
m_mediaInfo.m_app,
m_mediaInfo.m_streamid,
true));
if(src ){
if(!src->ready()){
//流未准备好那么相当于没有
src = nullptr;
}
}
//是否鉴权成功
bool authSuccess = err.empty();
if(authSuccess && !src && tryDelay ){
@@ -509,10 +501,6 @@ void RtmpSession::onRtmpChunk(RtmpPacket &chunkData) {
chunkData.timeStamp = m_stampTicker[chunkData.typeId % 2].elapsedTime();
}
m_pPublisherSrc->onGetMedia(std::make_shared<RtmpPacket>(chunkData));
if(!m_bPublisherSrcRegisted && m_pPublisherSrc->ready()){
m_bPublisherSrcRegisted = true;
m_pPublisherSrc->regist();
}
}
break;
default: