THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some compile error

This commit is contained in:
xiongguangjie 2023-09-15 14:19:31 +08:00
parent 228cbb1127
commit 8210e099d9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Rtmp/RtmpSession.cpp
View File

@ -140,7 +140,7 @@ void RtmpSession::onCmd_publish(AMFDecoder &dec) {
auto now_stream_index = _now_stream_index; auto now_stream_index = _now_stream_index;
auto on_res_push = [this](ProtocolOption option){ auto on_res_push = [this](ProtocolOption option){
if (!_push_src) { if (!_push_src) {
_push_src = std::make_shared<RtmpMediaSourceImp>(_media_info._vhost, _media_info._app, _media_info._streamid); _push_src = std::make_shared<RtmpMediaSourceImp>(_media_info);
//获取所有权 //获取所有权
_push_src_ownership = _push_src->getOwnership(); _push_src_ownership = _push_src->getOwnership();
_push_src->setProtocolOption(option); _push_src->setProtocolOption(option);

8
src/Rtsp/RtspSession.cpp
View File

@ -218,7 +218,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
auto onResPushSrc = [this, parser, full_url](ProtocolOption option) { auto onResPushSrc = [this, parser, full_url](ProtocolOption option) {
SdpParser sdpParser(parser.Content()); SdpParser sdpParser(parser.content());
_sessionid = makeRandStr(12); _sessionid = makeRandStr(12);
_sdp_track = sdpParser.getAvailableTrack(); _sdp_track = sdpParser.getAvailableTrack();
if (_sdp_track.empty()) { if (_sdp_track.empty()) {
@ -234,7 +234,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
} }
if (!_push_src) { if (!_push_src) {
_push_src = std::make_shared<RtspMediaSourceImp>(_media_info._vhost, _media_info._app, _media_info._streamid); _push_src = std::make_shared<RtspMediaSourceImp>(_media_info);
// 获取所有权 // 获取所有权
_push_src_ownership = _push_src->getOwnership(); _push_src_ownership = _push_src->getOwnership();
_push_src->setProtocolOption(option); _push_src->setProtocolOption(option);
@ -253,7 +253,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
} }
assert(!_push_src); assert(!_push_src);
auto src = MediaSource::find(RTSP_SCHEMA, _media_info._vhost, _media_info._app, _media_info._streamid); auto src = MediaSource::find(_media_info);
auto push_failed = (bool)src; auto push_failed = (bool)src;
RtspMediaSource::Ptr rtsp_src; RtspMediaSource::Ptr rtsp_src;
RtspMediaSourceImp::Ptr rtsp_src_imp; RtspMediaSourceImp::Ptr rtsp_src_imp;
@ -299,7 +299,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) {
return; return;
} }
}else{ }else{
auto listener = rtsp_src->getListener(true); auto listener = rtsp_src->getListener();
//TraceL<<toolkit::demangle(typeid(*listener.lock()).name()); //TraceL<<toolkit::demangle(typeid(*listener.lock()).name());
auto muxer = dynamic_pointer_cast<MultiMediaSourceMuxer>(listener.lock()); auto muxer = dynamic_pointer_cast<MultiMediaSourceMuxer>(listener.lock());
if(muxer){ if(muxer){