Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-16 04:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复rtp tcp推流情况下获取Origin相关失败的问题

Browse Source
This commit is contained in:
xiongziliang
2020-10-24 23:34:22 +08:00
parent d74604e014
commit b5a25793c4
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Rtp/RtpProcess.cpp
View File

@@ -176,11 +176,7 @@ int RtpProcess::totalReaderCount() {
}
void RtpProcess::setListener(const std::weak_ptr<MediaSourceEvent> &listener) {
if (_muxer) {
_muxer->setMediaListener(listener);
} else {
_listener = listener;
}
setDelegate(listener);
}
void RtpProcess::emitOnPublish() {
@@ -195,7 +191,7 @@ void RtpProcess::emitOnPublish() {
strongSelf->_media_info._app,
strongSelf->_media_info._streamid, 0,
true, true, enableHls, enableMP4);
strongSelf->_muxer->setMediaListener(strongSelf->_listener);
strongSelf->_muxer->setMediaListener(strongSelf);
InfoP(strongSelf) << "允许RTP推流";
} else {
WarnP(strongSelf) << "禁止RTP推流:" << err;
@@ -212,5 +208,17 @@ void RtpProcess::emitOnPublish() {
}
}
MediaOriginType RtpProcess::getOriginType(MediaSource &sender) const{
return MediaOriginType::rtp_push;
}
string RtpProcess::getOriginUrl(MediaSource &sender) const {
return _media_info._full_url;
}
std::shared_ptr<SockInfo> RtpProcess::getOriginSock(MediaSource &sender) const{
return const_cast<RtpProcess *>(this)->shared_from_this();
}
}//namespace mediakit
#endif//defined(ENABLE_RTPPROXY)