weiai/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-03-21 05:20:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

RTP代理支持完整的事件

Browse Source
This commit is contained in:
xiongziliang
2020-02-28 16:25:14 +08:00
parent 5acdf1f789
commit 109fab2cb1
6 changed files with 114 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Rtp/RtpSelector.cpp
View File

@@ -63,11 +63,12 @@ RtpProcess::Ptr RtpSelector::getProcess(uint32_t ssrc,bool makeNew) {
if(it == _map_rtp_process.end() && !makeNew){
return nullptr;
}
RtpProcess::Ptr &ref = _map_rtp_process[ssrc];
RtpProcessHelper::Ptr &ref = _map_rtp_process[ssrc];
if(!ref){
ref = std::make_shared<RtpProcess>(ssrc);
ref = std::make_shared<RtpProcessHelper>(ssrc,shared_from_this());
ref->attachEvent();
}
return ref;
return ref->getProcess();
}
void RtpSelector::delProcess(uint32_t ssrc,const RtpProcess *ptr) {
@@ -77,7 +78,7 @@ void RtpSelector::delProcess(uint32_t ssrc,const RtpProcess *ptr) {
return;
}
if(it->second.get() != ptr){
if(it->second->getProcess().get() != ptr){
return;
}
@@ -87,7 +88,7 @@ void RtpSelector::delProcess(uint32_t ssrc,const RtpProcess *ptr) {
void RtpSelector::onManager() {
lock_guard<decltype(_mtx_map)> lck(_mtx_map);
for (auto it = _map_rtp_process.begin(); it != _map_rtp_process.end();) {
if (it->second->alive()) {
if (it->second->getProcess()->alive()) {
++it;
continue;
}
@@ -102,5 +103,47 @@ RtpSelector::RtpSelector() {
RtpSelector::~RtpSelector() {
}
RtpProcessHelper::RtpProcessHelper(uint32_t ssrc, const weak_ptr<RtpSelector> &parent) {
_ssrc = ssrc;
_parent = parent;
_process = std::make_shared<RtpProcess>(_ssrc);
}
RtpProcessHelper::~RtpProcessHelper() {
}
void RtpProcessHelper::attachEvent() {
_process->setListener(shared_from_this());
}
bool RtpProcessHelper::close(MediaSource &sender, bool force) {
//此回调在其他线程触发
if(!_process || (!force && _process->totalReaderCount())){
return false;
}
auto parent = _parent.lock();
if(!parent){
return false;
}
parent->delProcess(_ssrc,_process.get());
string err = StrPrinter << "close media:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId() << " " << force;
return true;
}
void RtpProcessHelper::onNoneReader(MediaSource &sender) {
if(!_process || _process->totalReaderCount()){
return;
}
MediaSourceEvent::onNoneReader(sender);
}
int RtpProcessHelper::totalReaderCount(MediaSource &sender) {
return _process ? _process->totalReaderCount() : sender.totalReaderCount();
}
RtpProcess::Ptr &RtpProcessHelper::getProcess() {
return _process;
}
}//namespace mediakit
#endif//defined(ENABLE_RTPPROXY)