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

修复编译问题

Browse Source
This commit is contained in:
xiongziliang
2021-01-17 20:15:08 +08:00
parent b6cbc87712
commit 5d752c89b5
20 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Rtp/RtpProcess.cpp
View File

@@ -192,7 +192,7 @@ string RtpProcess::getIdentifier() const {
return _media_info._streamid;
}
int RtpProcess::totalReaderCount() {
int RtpProcess::getTotalReaderCount() {
return _muxer ? _muxer->totalReaderCount() : 0;
}

4
src/Rtp/RtpProcess.h
View File

@@ -15,8 +15,6 @@
#include "ProcessInterface.h"
#include "Common/MultiMediaSourceMuxer.h"
using namespace mediakit;
namespace mediakit {
class RtpProcess : public SockInfo, public MediaSinkInterface, public MediaSourceEventInterceptor, public std::enable_shared_from_this<RtpProcess>{
@@ -65,7 +63,7 @@ public:
uint16_t get_peer_port() override;
string getIdentifier() const override;
int totalReaderCount();
int getTotalReaderCount();
void setListener(const std::weak_ptr<MediaSourceEvent> &listener);
protected:

4
src/Rtp/RtpSelector.cpp
View File

@@ -138,7 +138,7 @@ void RtpProcessHelper::attachEvent() {
bool RtpProcessHelper::close(MediaSource &sender, bool force) {
//此回调在其他线程触发
if (!_process || (!force && _process->totalReaderCount())) {
if (!_process || (!force && _process->getTotalReaderCount())) {
return false;
}
auto parent = _parent.lock();
@@ -151,7 +151,7 @@ bool RtpProcessHelper::close(MediaSource &sender, bool force) {
}
int RtpProcessHelper::totalReaderCount(MediaSource &sender) {
return _process ? _process->totalReaderCount() : sender.totalReaderCount();
return _process ? _process->getTotalReaderCount() : sender.totalReaderCount();
}
RtpProcess::Ptr &RtpProcessHelper::getProcess() {

4
src/Rtp/RtpSession.cpp
View File

@@ -79,7 +79,7 @@ void RtpSession::onRtpPacket(const char *data, size_t len) {
bool RtpSession::close(MediaSource &sender, bool force) {
//此回调在其他线程触发
if(!_process || (!force && _process->totalReaderCount())){
if(!_process || (!force && _process->getTotalReaderCount())){
return false;
}
string err = StrPrinter << "close media:" << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId() << " " << force;
@@ -89,7 +89,7 @@ bool RtpSession::close(MediaSource &sender, bool force) {
int RtpSession::totalReaderCount(MediaSource &sender) {
//此回调在其他线程触发
return _process ? _process->totalReaderCount() : sender.totalReaderCount();
return _process ? _process->getTotalReaderCount() : sender.totalReaderCount();
}
}//namespace mediakit