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

修复无人播放事件触发延时不准确的bug

Browse Source
This commit is contained in:
xiongziliang
2020-03-23 10:21:17 +08:00
parent 1168174c2b
commit ace200716a
21 changed files with 42 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Rtp/RtpSelector.cpp
View File

@@ -142,13 +142,6 @@ bool RtpProcessHelper::close(MediaSource &sender, bool 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();
}

2
src/Rtp/RtpSelector.h
View File

@@ -47,8 +47,6 @@ public:
protected:
// 通知其停止推流
bool close(MediaSource &sender,bool force) override;
// 通知无人观看
void onNoneReader(MediaSource &sender) override;
// 观看总人数
int totalReaderCount(MediaSource &sender) override;
private:

8
src/Rtp/RtpSession.cpp
View File

@@ -87,14 +87,6 @@ bool RtpSession::close(MediaSource &sender, bool force) {
return true;
}
void RtpSession::onNoneReader(MediaSource &sender) {
//此回调在其他线程触发
if(!_process || _process->totalReaderCount()){
return;
}
MediaSourceEvent::onNoneReader(sender);
}
int RtpSession::totalReaderCount(MediaSource &sender) {
//此回调在其他线程触发
return _process ? _process->totalReaderCount() : sender.totalReaderCount();

2
src/Rtp/RtpSession.h
View File

@@ -46,8 +46,6 @@ public:
protected:
// 通知其停止推流
bool close(MediaSource &sender,bool force) override;
// 通知无人观看
void onNoneReader(MediaSource &sender) override;
// 观看总人数
int totalReaderCount(MediaSource &sender) override;
void onRtpPacket(const char *data,uint64_t len) override;