Skip to content

Z
ZLMediaKit
Commit ec902f51 by xiongziliang
Options

添加 http-flv/rtmp/rtsp通用鉴权接口

parent 6da3a577
正在显示 包含 263 行增加 和 167 行删除
src/Common/MediaSource.cpp
...@@ -150,8 +150,8 @@ void MediaInfo::parse(const string &url){ ...@@ -150,8 +150,8 @@ void MediaInfo::parse(const string &url){
auto pos = steamid.find("?"); auto pos = steamid.find("?");
if(pos != string::npos){ if(pos != string::npos){
m_streamid = steamid.substr(0,pos); m_streamid = steamid.substr(0,pos);
auto params = steamid.substr(pos + 1); m_param_strs = steamid.substr(pos + 1);
m_params = Parser::parseArgs(params); m_params = Parser::parseArgs(m_param_strs);
if(m_params.find(VHOST_KEY) != m_params.end()){ if(m_params.find(VHOST_KEY) != m_params.end()){
m_vhost = m_params[VHOST_KEY]; m_vhost = m_params[VHOST_KEY];
} }
......
src/Common/MediaSource.h
...@@ -83,6 +83,8 @@ public: ...@@ -83,6 +83,8 @@ public:
string m_app; string m_app;
string m_streamid; string m_streamid;
StrCaseMap m_params; StrCaseMap m_params;
string m_param_strs;
}; };
......
src/Common/config.cpp
...@@ -47,13 +47,13 @@ void loadIniConfig(){ ...@@ -47,13 +47,13 @@ void loadIniConfig(){
} }
////////////广播名称/////////// ////////////广播名称///////////
namespace Broadcast { namespace Broadcast {
const char kBroadcastMediaPlayed[] = "kBroadcastMediaPlayed";
const char kBroadcastMediaChanged[] = "kBroadcastMediaChanged"; const char kBroadcastMediaChanged[] = "kBroadcastMediaChanged";
const char kBroadcastRecordMP4[] = "kBroadcastRecordMP4"; const char kBroadcastRecordMP4[] = "kBroadcastRecordMP4";
const char kBroadcastHttpRequest[] = "kBroadcastHttpRequest"; const char kBroadcastHttpRequest[] = "kBroadcastHttpRequest";
const char kBroadcastOnGetRtspRealm[] = "kBroadcastOnGetRtspRealm"; const char kBroadcastOnGetRtspRealm[] = "kBroadcastOnGetRtspRealm";
const char kBroadcastOnRtspAuth[] = "kBroadcastOnRtspAuth"; const char kBroadcastOnRtspAuth[] = "kBroadcastOnRtspAuth";
const char kBroadcastMediaPlayed[] = "kBroadcastMediaPlayed";
const char kBroadcastRtmpPublish[] = "kBroadcastRtmpPublish";
} //namespace Broadcast } //namespace Broadcast
//代理失败最大重试次数 //代理失败最大重试次数
......
src/Common/config.h
...@@ -51,6 +51,7 @@ void loadIniConfig(); ...@@ -51,6 +51,7 @@ void loadIniConfig();
#define SERVER_NAME "ZLMediaKit" #define SERVER_NAME "ZLMediaKit"
#define VHOST_KEY "vhost" #define VHOST_KEY "vhost"
#define HTTP_SCHEMA "http"
#define RTSP_SCHEMA "rtsp" #define RTSP_SCHEMA "rtsp"
#define RTMP_SCHEMA "rtmp" #define RTMP_SCHEMA "rtmp"
#define DEFAULT_VHOST "__defaultVhost__" #define DEFAULT_VHOST "__defaultVhost__"
...@@ -59,15 +60,16 @@ void loadIniConfig(); ...@@ -59,15 +60,16 @@ void loadIniConfig();
////////////广播名称/////////// ////////////广播名称///////////
namespace Broadcast { namespace Broadcast {
extern const char kBroadcastMediaPlayed[];
#define BroadcastMediaPlayedArgs const char *schema,const char *vhost,const char *app,const char *stream
//注册或反注册MediaSource事件广播
extern const char kBroadcastMediaChanged[]; extern const char kBroadcastMediaChanged[];
#define BroadcastMediaChangedArgs bool bRegist, const char *schema,const char *vhost,const char *app,const char *stream #define BroadcastMediaChangedArgs bool bRegist, const char *schema,const char *vhost,const char *app,const char *stream
//录制mp4文件成功后广播
extern const char kBroadcastRecordMP4[]; extern const char kBroadcastRecordMP4[];
#define BroadcastRecordMP4Args const Mp4Info &info #define BroadcastRecordMP4Args const Mp4Info &info
//收到http api请求广播
extern const char kBroadcastHttpRequest[]; extern const char kBroadcastHttpRequest[];
#define BroadcastHttpRequestArgs const Parser &parser,HttpSession::HttpResponseInvoker &invoker,bool &consumed #define BroadcastHttpRequestArgs const Parser &parser,HttpSession::HttpResponseInvoker &invoker,bool &consumed
...@@ -80,6 +82,18 @@ extern const char kBroadcastOnGetRtspRealm[]; ...@@ -80,6 +82,18 @@ extern const char kBroadcastOnGetRtspRealm[];
extern const char kBroadcastOnRtspAuth[]; extern const char kBroadcastOnRtspAuth[];
#define BroadcastOnRtspAuthArgs const char *user_name,bool must_no_encrypt,const RtspSession::onAuth &invoker #define BroadcastOnRtspAuthArgs const char *user_name,bool must_no_encrypt,const RtspSession::onAuth &invoker
//鉴权结果回调对象
typedef std::function<void(bool success)> AuthInvoker;
//收到rtmp推流事件广播，通过该事件控制推流鉴权
extern const char kBroadcastRtmpPublish[];
#define BroadcastRtmpPublishArgs MediaInfo &args,Broadcast::AuthInvoker &invoker
//播放rtsp或rtmp事件广播，通过该事件控制播放鉴权
extern const char kBroadcastMediaPlayed[];
#define BroadcastMediaPlayedArgs MediaInfo &args,Broadcast::AuthInvoker &invoker
} //namespace Broadcast } //namespace Broadcast
//代理失败最大重试次数 //代理失败最大重试次数
......
src/Http/HttpSession.cpp
...@@ -171,7 +171,8 @@ void HttpSession::onManager() { ...@@ -171,7 +171,8 @@ void HttpSession::onManager() {
shutdown(); shutdown();
} }
} }
//http-flv 链接格式:http://vhost-url:port/app/streamid.flv?key1=value1&key2=value2
//如果url(除去?以及后面的参数)后缀是.flv,那么表明该url是一个http-flv直播。
inline bool HttpSession::checkLiveFlvStream(){ inline bool HttpSession::checkLiveFlvStream(){
auto pos = strrchr(m_parser.Url().data(),'.'); auto pos = strrchr(m_parser.Url().data(),'.');
if(!pos){ if(!pos){
...@@ -182,87 +183,118 @@ inline bool HttpSession::checkLiveFlvStream(){ ...@@ -182,87 +183,118 @@ inline bool HttpSession::checkLiveFlvStream(){
//未找到".flv"后缀 //未找到".flv"后缀
return false; return false;
} }
auto fullUrl = string("http://") + m_parser["Host"] + FindField(m_parser.Url().data(),NULL,pos); //拼接成完整url
auto fullUrl = string(HTTP_SCHEMA) + "://" + m_parser["Host"] + m_parser.FullUrl();
MediaInfo info(fullUrl); MediaInfo info(fullUrl);
if(!m_parser.getUrlArgs()[VHOST_KEY].empty()){ info.m_streamid.erase(info.m_streamid.size() - 4);//去除.flv后缀
info.m_vhost = m_parser.getUrlArgs()[VHOST_KEY];
}
auto mediaSrc = dynamic_pointer_cast<RtmpMediaSource>(MediaSource::find(RTMP_SCHEMA,info.m_vhost,info.m_app,info.m_streamid)); auto mediaSrc = dynamic_pointer_cast<RtmpMediaSource>(MediaSource::find(RTMP_SCHEMA,info.m_vhost,info.m_app,info.m_streamid));
if(!mediaSrc){ if(!mediaSrc){
//该rtmp源不存在 //该rtmp源不存在
return false; sendNotFound(true);
shutdown();
return true;
} }
if(!mediaSrc->ready()){ if(!mediaSrc->ready()){
//未准备好 //未准备好
return false; sendNotFound(true);
} shutdown();
//找到rtmp源，发送http头，负载后续发送 return true;
sendResponse("200 OK", makeHttpHeader(false,0,get_mime_type(m_parser.Url().data())), ""); }
//发送flv文件头
char flv_file_header[] = "FLV\x1\x5\x0\x0\x0\x9"; // have audio and have video auto onRes = [this,mediaSrc](bool authSuccess){
bool is_have_audio = false,is_have_video = false; if(!authSuccess){
string status = "401 Unauthorized";
mediaSrc->getConfigFrame([&](const RtmpPacket::Ptr &pkt){ sendResponse(status.data(), makeHttpHeader(true,status.size()),status);
if(pkt->typeId == MSG_VIDEO){ shutdown();
is_have_video = true; return ;
} }
if(pkt->typeId == MSG_AUDIO){ //找到rtmp源，发送http头，负载后续发送
is_have_audio = true; sendResponse("200 OK", makeHttpHeader(false,0,get_mime_type(".flv")), "");
} //发送flv文件头
}); char flv_file_header[] = "FLV\x1\x5\x0\x0\x0\x9"; // have audio and have video
bool is_have_audio = false,is_have_video = false;
if (is_have_audio && is_have_video) {
flv_file_header[4] = 0x05; mediaSrc->getConfigFrame([&](const RtmpPacket::Ptr &pkt){
} else if (is_have_audio && !is_have_video) { if(pkt->typeId == MSG_VIDEO){
flv_file_header[4] = 0x04; is_have_video = true;
} else if (!is_have_audio && is_have_video) { }
flv_file_header[4] = 0x01; if(pkt->typeId == MSG_AUDIO){
} else { is_have_audio = true;
flv_file_header[4] = 0x00; }
} });
//send flv header
send(flv_file_header, sizeof(flv_file_header) - 1); if (is_have_audio && is_have_video) {
//send metadata flv_file_header[4] = 0x05;
AMFEncoder invoke; } else if (is_have_audio && !is_have_video) {
invoke << "onMetaData" << mediaSrc->getMetaData(); flv_file_header[4] = 0x04;
sendRtmp(MSG_DATA, invoke.data(), 0); } else if (!is_have_audio && is_have_video) {
//send config frame flv_file_header[4] = 0x01;
mediaSrc->getConfigFrame([&](const RtmpPacket::Ptr &pkt){ } else {
onSendMedia(pkt); flv_file_header[4] = 0x00;
}); }
//send flv header
//开始发送rtmp负载 send(flv_file_header, sizeof(flv_file_header) - 1);
m_pRingReader = mediaSrc->getRing()->attach(); //send metadata
weak_ptr<HttpSession> weakSelf = dynamic_pointer_cast<HttpSession>(shared_from_this()); AMFEncoder invoke;
m_pRingReader->setReadCB([weakSelf](const RtmpPacket::Ptr &pkt){ invoke << "onMetaData" << mediaSrc->getMetaData();
auto strongSelf = weakSelf.lock(); sendRtmp(MSG_DATA, invoke.data(), 0);
if(!strongSelf) { //send config frame
return; mediaSrc->getConfigFrame([&](const RtmpPacket::Ptr &pkt){
} onSendMedia(pkt);
strongSelf->async([pkt,weakSelf](){ });
auto strongSelf = weakSelf.lock();
if(!strongSelf) { //开始发送rtmp负载
return; m_pRingReader = mediaSrc->getRing()->attach();
} weak_ptr<HttpSession> weakSelf = dynamic_pointer_cast<HttpSession>(shared_from_this());
strongSelf->onSendMedia(pkt); m_pRingReader->setReadCB([weakSelf](const RtmpPacket::Ptr &pkt){
}); auto strongSelf = weakSelf.lock();
}); if(!strongSelf) {
m_pRingReader->setDetachCB([weakSelf](){ return;
auto strongSelf = weakSelf.lock(); }
if(!strongSelf) { strongSelf->async([pkt,weakSelf](){
return; auto strongSelf = weakSelf.lock();
} if(!strongSelf) {
strongSelf->async_first([weakSelf](){ return;
auto strongSelf = weakSelf.lock(); }
if(!strongSelf) { strongSelf->onSendMedia(pkt);
return; });
} });
strongSelf->shutdown(); m_pRingReader->setDetachCB([weakSelf](){
}); auto strongSelf = weakSelf.lock();
}); if(!strongSelf) {
return true; return;
}
strongSelf->async_first([weakSelf](){
auto strongSelf = weakSelf.lock();
if(!strongSelf) {
return;
}
strongSelf->shutdown();
});
});
};
weak_ptr<HttpSession> weakSelf = dynamic_pointer_cast<HttpSession>(shared_from_this());
Broadcast::AuthInvoker invoker = [weakSelf,onRes](bool authSuccess){
auto strongSelf = weakSelf.lock();
if(!strongSelf){
return;
}
strongSelf->async([weakSelf,onRes,authSuccess](){
auto strongSelf = weakSelf.lock();
if(!strongSelf){
return;
}
onRes(authSuccess);
});
};
auto flag = NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaPlayed,info,invoker);
if(!flag){
//该事件无人监听,默认不鉴权
onRes(true);
}
return true;
} }
inline HttpSession::HttpCode HttpSession::Handle_Req_GET() { inline HttpSession::HttpCode HttpSession::Handle_Req_GET() {
//先看看该http事件是否被拦截 //先看看该http事件是否被拦截
...@@ -274,11 +306,9 @@ inline HttpSession::HttpCode HttpSession::Handle_Req_GET() { ...@@ -274,11 +306,9 @@ inline HttpSession::HttpCode HttpSession::Handle_Req_GET() {
} }
//事件未被拦截，则认为是http下载请求 //事件未被拦截，则认为是http下载请求
auto fullUrl = string("http://") + m_parser["Host"] + m_parser.Url(); auto fullUrl = string(HTTP_SCHEMA) + "://" + m_parser["Host"] + m_parser.FullUrl();
MediaInfo info(fullUrl); MediaInfo info(fullUrl);
if(!m_parser.getUrlArgs()[VHOST_KEY].empty()){
info.m_vhost = m_parser.getUrlArgs()[VHOST_KEY];
}
string strFile = m_strPath + "/" + info.m_vhost + m_parser.Url(); string strFile = m_strPath + "/" + info.m_vhost + m_parser.Url();
/////////////HTTP连接是否需要被关闭//////////////// /////////////HTTP连接是否需要被关闭////////////////
static uint32_t reqCnt = mINI::Instance()[Config::Http::kMaxReqCount].as<uint32_t>(); static uint32_t reqCnt = mINI::Instance()[Config::Http::kMaxReqCount].as<uint32_t>();
......
src/Rtsp/Rtsp.h
...@@ -101,15 +101,15 @@ public: ...@@ -101,15 +101,15 @@ public:
} }
if (start == buf) { if (start == buf) {
m_strMethod = FindField(line.c_str(), NULL, " "); m_strMethod = FindField(line.c_str(), NULL, " ");
auto full_url = FindField(line.c_str(), " ", " "); m_strFullUrl = FindField(line.c_str(), " ", " ");
auto args_pos = full_url.find('?'); auto args_pos = m_strFullUrl.find('?');
if(args_pos != string::npos){ if(args_pos != string::npos){
m_strUrl = full_url.substr(0,args_pos); m_strUrl = m_strFullUrl.substr(0,args_pos);
m_mapUrlArgs = parseArgs(full_url.substr(args_pos + 1 )); m_mapUrlArgs = parseArgs(m_strFullUrl.substr(args_pos + 1 ));
}else{ }else{
m_strUrl = full_url; m_strUrl = m_strFullUrl;
} }
m_strTail = FindField(line.c_str(), (full_url + " ").c_str(), NULL); m_strTail = FindField(line.c_str(), (m_strFullUrl + " ").c_str(), NULL);
} else { } else {
auto field = FindField(line.c_str(), NULL, ": "); auto field = FindField(line.c_str(), NULL, ": ");
auto value = FindField(line.c_str(), ": ", NULL); auto value = FindField(line.c_str(), ": ", NULL);
...@@ -132,6 +132,10 @@ public: ...@@ -132,6 +132,10 @@ public:
//rtsp url //rtsp url
return m_strUrl; return m_strUrl;
} }
const string& FullUrl() const {
//rtsp url with args
return m_strFullUrl;
}
const string& Tail() const { const string& Tail() const {
//RTSP/1.0 //RTSP/1.0
return m_strTail; return m_strTail;
...@@ -150,6 +154,7 @@ public: ...@@ -150,6 +154,7 @@ public:
void Clear() { void Clear() {
m_strMethod.clear(); m_strMethod.clear();
m_strUrl.clear(); m_strUrl.clear();
m_strFullUrl.clear();
m_strTail.clear(); m_strTail.clear();
m_strContent.clear(); m_strContent.clear();
m_mapValues.clear(); m_mapValues.clear();
...@@ -189,6 +194,7 @@ private: ...@@ -189,6 +194,7 @@ private:
string m_strTail; string m_strTail;
string m_strContent; string m_strContent;
string m_strNull; string m_strNull;
string m_strFullUrl;
mutable StrCaseMap m_mapValues; mutable StrCaseMap m_mapValues;
mutable StrCaseMap m_mapUrlArgs; mutable StrCaseMap m_mapUrlArgs;
}; };
......
src/Rtsp/RtspSession.cpp
...@@ -193,10 +193,7 @@ bool RtspSession::handleReq_Describe() { ...@@ -193,10 +193,7 @@ bool RtspSession::handleReq_Describe() {
{ {
//解析url获取媒体名称 //解析url获取媒体名称
m_strUrl = m_parser.Url(); m_strUrl = m_parser.Url();
m_mediaInfo.parse(m_strUrl); m_mediaInfo.parse(m_parser.FullUrl());
if(!m_parser.getUrlArgs()[VHOST_KEY].empty()){
m_mediaInfo.m_vhost = m_parser.getUrlArgs()[VHOST_KEY];
}
} }
if (!findStream()) { if (!findStream()) {
...@@ -644,82 +641,113 @@ bool RtspSession::handleReq_Play() { ...@@ -644,82 +641,113 @@ bool RtspSession::handleReq_Play() {
send_SessionNotFound(); send_SessionNotFound();
return false; return false;
} }
auto onRes = [this](bool authSuccess){
char response[2 * 1024];
m_pcBuf = response;
if(!authSuccess && m_bFirstPlay){
//第一次play是播放，否则是恢复播放。只对播放鉴权
int n = sprintf(m_pcBuf,
"RTSP/1.0 401 Unauthorized\r\n"
"CSeq: %d\r\n"
"Server: %s-%0.2f(build in %s)\r\n"
"%s\r\n",
m_iCseq, SERVER_NAME, RTSP_VERSION, RTSP_BUILDTIME, dateHeader().data());
send(m_pcBuf,n);
shutdown();
return;
}
if(m_pRtpReader){
weak_ptr<RtspSession> weakSelf = dynamic_pointer_cast<RtspSession>(shared_from_this());
SockUtil::setNoDelay(m_pSender->rawFD(), false);
m_pRtpReader->setReadCB([weakSelf](const RtpPacket::Ptr &pack) {
auto strongSelf = weakSelf.lock();
if(!strongSelf) {
return;
}
strongSelf->async([weakSelf,pack](){
auto strongSelf = weakSelf.lock();
if(!strongSelf) {
return;
}
strongSelf->sendRtpPacket(pack);
});
});
}
if(m_pRtpReader){ auto pMediaSrc = m_pMediaSrc.lock();
weak_ptr<RtspSession> weakSelf = dynamic_pointer_cast<RtspSession>(shared_from_this()); uint32_t iStamp = 0;
SockUtil::setNoDelay(m_pSender->rawFD(), false); if(pMediaSrc){
m_pRtpReader->setReadCB([weakSelf](const RtpPacket::Ptr &pack) { auto strRange = m_parser["Range"];
auto strongSelf = weakSelf.lock(); if (strRange.size() && !m_bFirstPlay) {
if(!strongSelf) { auto strStart = FindField(strRange.data(), "npt=", "-");
return; if (strStart == "now") {
} strStart = "0";
strongSelf->async([weakSelf,pack](){ }
auto strongSelf = weakSelf.lock(); auto iStartTime = atof(strStart.data());
if(!strongSelf) { InfoL << "rtsp seekTo:" << iStartTime;
return; pMediaSrc->seekTo(iStartTime * 1000);
} iStamp = pMediaSrc->getStamp();
strongSelf->sendRtpPacket(pack); }else if(pMediaSrc->getRing()->readerCount() == 1){
}); //第一个消费者
pMediaSrc->seekTo(0);
}); iStamp = 0;
} }else{
iStamp = pMediaSrc->getStamp();
auto pMediaSrc = m_pMediaSrc.lock(); }
uint32_t iStamp = 0; for (unsigned int i = 0; i < m_uiTrackCnt; i++) {
if(pMediaSrc){ auto &track = m_aTrackInfo[i];
auto strRange = m_parser["Range"]; track.ssrc = pMediaSrc->getSsrc(track.trackId);
if (strRange.size() && !m_bFirstPlay) { track.seq = pMediaSrc->getSeqence(track.trackId);
auto strStart = FindField(strRange.data(), "npt=", "-"); track.timeStamp = pMediaSrc->getTimestamp(track.trackId);
if (strStart == "now") { }
strStart = "0";
}
auto iStartTime = atof(strStart.data());
InfoL << "rtsp seekTo:" << iStartTime;
pMediaSrc->seekTo(iStartTime * 1000);
iStamp = pMediaSrc->getStamp();
}else if(pMediaSrc->getRing()->readerCount() == 1){
//第一个消费者
pMediaSrc->seekTo(0);
iStamp = 0;
}else{
iStamp = pMediaSrc->getStamp();
} }
for (unsigned int i = 0; i < m_uiTrackCnt; i++) { m_bFirstPlay = false;
auto &track = m_aTrackInfo[i]; int iLen = sprintf(m_pcBuf, "RTSP/1.0 200 OK\r\n"
track.ssrc = pMediaSrc->getSsrc(track.trackId); "CSeq: %d\r\n"
track.seq = pMediaSrc->getSeqence(track.trackId); "Server: %s-%0.2f(build in %s)\r\n"
track.timeStamp = pMediaSrc->getTimestamp(track.trackId); "%s"
} "Session: %s\r\n"
} "Range: npt=%.2f-\r\n"
m_bFirstPlay = false; "RTP-Info: ", m_iCseq, SERVER_NAME, RTSP_VERSION, RTSP_BUILDTIME,
int iLen = sprintf(m_pcBuf, "RTSP/1.0 200 OK\r\n" dateHeader().data(), m_strSession.data(),iStamp/1000.0);
"CSeq: %d\r\n"
"Server: %s-%0.2f(build in %s)\r\n" for (unsigned int i = 0; i < m_uiTrackCnt; i++) {
"%s" auto &track = m_aTrackInfo[i];
"Session: %s\r\n" if (track.inited == false) {
"Range: npt=%.2f-\r\n" //还有track没有setup
"RTP-Info: ", m_iCseq, SERVER_NAME, RTSP_VERSION, RTSP_BUILDTIME, shutdown();
dateHeader().data(), m_strSession.data(),iStamp/1000.0); return;
}
iLen += sprintf(m_pcBuf + iLen, "url=%s/%s%d;seq=%d;rtptime=%u,",
m_strUrl.data(), track.trackStyle.data(),
track.trackId, track.seq,track.timeStamp);
}
iLen -= 1;
(m_pcBuf)[iLen] = '\0';
iLen += sprintf(m_pcBuf + iLen, "\r\n\r\n");
send(m_pcBuf, iLen);
};
for (unsigned int i = 0; i < m_uiTrackCnt; i++) { weak_ptr<RtspSession> weakSelf = dynamic_pointer_cast<RtspSession>(shared_from_this());
auto &track = m_aTrackInfo[i]; Broadcast::AuthInvoker invoker = [weakSelf,onRes](bool authSuccess){
if (track.inited == false) { auto strongSelf = weakSelf.lock();
//还有track没有setup if(!strongSelf){
return false; return;
} }
iLen += sprintf(m_pcBuf + iLen, "url=%s/%s%d;seq=%d;rtptime=%u,", strongSelf->async([weakSelf,onRes,authSuccess](){
m_strUrl.data(), track.trackStyle.data(), auto strongSelf = weakSelf.lock();
track.trackId, track.seq,track.timeStamp); if(!strongSelf){
} return;
iLen -= 1; }
(m_pcBuf)[iLen] = '\0'; onRes(authSuccess);
iLen += sprintf(m_pcBuf + iLen, "\r\n\r\n"); });
send(m_pcBuf, iLen); };
NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaPlayed, auto flag = NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaPlayed,m_mediaInfo,invoker);
RTSP_SCHEMA, if(!flag){
m_mediaInfo.m_vhost.data(), //该事件无人监听,默认不鉴权
m_mediaInfo.m_app.data(), onRes(true);
m_mediaInfo.m_streamid.data()); }
return true; return true;
} }
......
tests/test_server.cpp
...@@ -107,6 +107,22 @@ static onceToken s_token([](){ ...@@ -107,6 +107,22 @@ static onceToken s_token([](){
invoker(false,user); invoker(false,user);
}); });
}); });
NoticeCenter::Instance().addListener(nullptr,Config::Broadcast::kBroadcastRtmpPublish,[](BroadcastRtmpPublishArgs){
InfoL << args.m_vhost << " " << args.m_app << " " << args.m_streamid << " " << args.m_param_strs ;
EventPoller::Instance().async([invoker](){
invoker(true);
});
});
NoticeCenter::Instance().addListener(nullptr,Config::Broadcast::kBroadcastMediaPlayed,[](BroadcastMediaPlayedArgs){
InfoL << args.m_schema << " " << args.m_vhost << " " << args.m_app << " " << args.m_streamid << " " << args.m_param_strs ;
EventPoller::Instance().async([invoker](){
invoker(true);
});
});
}, nullptr); }, nullptr);
int main(int argc,char *argv[]){ int main(int argc,char *argv[]){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论