From 8210e099d930b5415ed1a6737e81ad6de781386a Mon Sep 17 00:00:00 2001 From: xiongguangjie Date: Fri, 15 Sep 2023 14:19:31 +0800 Subject: [PATCH] fix some compile error --- src/Rtmp/RtmpSession.cpp | 2 +- src/Rtsp/RtspSession.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Rtmp/RtmpSession.cpp b/src/Rtmp/RtmpSession.cpp index fd050ae5..fd09141f 100644 --- a/src/Rtmp/RtmpSession.cpp +++ b/src/Rtmp/RtmpSession.cpp @@ -140,7 +140,7 @@ void RtmpSession::onCmd_publish(AMFDecoder &dec) { auto now_stream_index = _now_stream_index; auto on_res_push = [this](ProtocolOption option){ if (!_push_src) { - _push_src = std::make_shared(_media_info._vhost, _media_info._app, _media_info._streamid); + _push_src = std::make_shared(_media_info); //获取所有权 _push_src_ownership = _push_src->getOwnership(); _push_src->setProtocolOption(option); diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index c9438829..01677526 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -218,7 +218,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) { auto onResPushSrc = [this, parser, full_url](ProtocolOption option) { - SdpParser sdpParser(parser.Content()); + SdpParser sdpParser(parser.content()); _sessionid = makeRandStr(12); _sdp_track = sdpParser.getAvailableTrack(); if (_sdp_track.empty()) { @@ -234,7 +234,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) { } if (!_push_src) { - _push_src = std::make_shared(_media_info._vhost, _media_info._app, _media_info._streamid); + _push_src = std::make_shared(_media_info); // 获取所有权 _push_src_ownership = _push_src->getOwnership(); _push_src->setProtocolOption(option); @@ -253,7 +253,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) { } 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; RtspMediaSource::Ptr rtsp_src; RtspMediaSourceImp::Ptr rtsp_src_imp; @@ -299,7 +299,7 @@ void RtspSession::handleReq_ANNOUNCE(const Parser &parser) { return; } }else{ - auto listener = rtsp_src->getListener(true); + auto listener = rtsp_src->getListener(); //TraceL<(listener.lock()); if(muxer){