amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Revert "添加递归溢出检测代码: #1363"

Browse Source 
This reverts commit 8937d9ea92.
This commit is contained in:
ziyue 2022-01-24 11:38:36 +08:00
parent 80ecd2098e
commit 0ae9a8c8c8
2 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Common/MediaSource.cpp
View File

@ -609,28 +609,7 @@ string MediaSourceEvent::getOriginUrl(MediaSource &sender) const {
return getOriginUrl_l(&sender);
}
class InvokeDepthHelper {
public:
InvokeDepthHelper(const int &depth, int max_depth, const LogContextCapture &log)
: _depth(const_cast<int &>(depth)) {
if (++_depth > max_depth) {
throw std::runtime_error("invalid call depth: " + to_string(_depth));
} else {
const_cast<LogContextCapture &>(log).clear();
}
}
~InvokeDepthHelper() { --_depth; }
private:
int &_depth;
};
#define CHECK_CALL_DEPTH() \
InvokeDepthHelper \
heler(_invoke_depth, 5, ErrorL << "invalid call depth[" << _invoke_depth + 1 << "] on object: " << this)
MediaOriginType MediaSourceEventInterceptor::getOriginType(MediaSource &sender) const {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return MediaOriginType::unknown;
@ -639,7 +618,6 @@ MediaOriginType MediaSourceEventInterceptor::getOriginType(MediaSource &sender)
}
string MediaSourceEventInterceptor::getOriginUrl(MediaSource &sender) const {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return MediaSourceEvent::getOriginUrl(sender);
@ -652,7 +630,6 @@ string MediaSourceEventInterceptor::getOriginUrl(MediaSource &sender) const {
}
std::shared_ptr<SockInfo> MediaSourceEventInterceptor::getOriginSock(MediaSource &sender) const {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return nullptr;
@ -661,7 +638,6 @@ std::shared_ptr<SockInfo> MediaSourceEventInterceptor::getOriginSock(MediaSource
}
bool MediaSourceEventInterceptor::seekTo(MediaSource &sender, uint32_t stamp) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return false;
@ -670,7 +646,6 @@ bool MediaSourceEventInterceptor::seekTo(MediaSource &sender, uint32_t stamp) {
}
bool MediaSourceEventInterceptor::pause(MediaSource &sender, bool pause) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return false;
@ -679,7 +654,6 @@ bool MediaSourceEventInterceptor::pause(MediaSource &sender, bool pause) {
}
bool MediaSourceEventInterceptor::speed(MediaSource &sender, float speed) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return false;
@ -688,7 +662,6 @@ bool MediaSourceEventInterceptor::speed(MediaSource &sender, float speed) {
}
bool MediaSourceEventInterceptor::close(MediaSource &sender, bool force) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return false;
@ -697,7 +670,6 @@ bool MediaSourceEventInterceptor::close(MediaSource &sender, bool force) {
}
int MediaSourceEventInterceptor::totalReaderCount(MediaSource &sender) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return sender.readerCount();
@ -706,7 +678,6 @@ int MediaSourceEventInterceptor::totalReaderCount(MediaSource &sender) {
}
void MediaSourceEventInterceptor::onReaderChanged(MediaSource &sender, int size) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
MediaSourceEvent::onReaderChanged(sender, size);
@ -716,7 +687,6 @@ void MediaSourceEventInterceptor::onReaderChanged(MediaSource &sender, int size)
}
void MediaSourceEventInterceptor::onRegist(MediaSource &sender, bool regist) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (listener) {
listener->onRegist(sender, regist);
@ -724,7 +694,6 @@ void MediaSourceEventInterceptor::onRegist(MediaSource &sender, bool regist) {
}
bool MediaSourceEventInterceptor::setupRecord(MediaSource &sender, Recorder::type type, bool start, const string &custom_path, size_t max_second) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return false;
@ -733,7 +702,6 @@ bool MediaSourceEventInterceptor::setupRecord(MediaSource &sender, Recorder::typ
}
bool MediaSourceEventInterceptor::isRecording(MediaSource &sender, Recorder::type type) {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return false;
@ -742,7 +710,6 @@ bool MediaSourceEventInterceptor::isRecording(MediaSource &sender, Recorder::typ
}
vector<Track::Ptr> MediaSourceEventInterceptor::getMediaTracks(MediaSource &sender, bool trackReady) const {
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (!listener) {
return vector<Track::Ptr>();
@ -751,7 +718,6 @@ vector<Track::Ptr> MediaSourceEventInterceptor::getMediaTracks(MediaSource &send
}
void MediaSourceEventInterceptor::startSendRtp(MediaSource &sender, const string &dst_url, uint16_t dst_port, const string &ssrc, bool is_udp, uint16_t src_port, const function<void(uint16_t local_port, const SockException &ex)> &cb){
CHECK_CALL_DEPTH();
auto listener = _listener.lock();
if (listener) {
listener->startSendRtp(sender, dst_url, dst_port, ssrc, is_udp, src_port, cb);
@ -760,8 +726,7 @@ void MediaSourceEventInterceptor::startSendRtp(MediaSource &sender, const string
}
}
bool MediaSourceEventInterceptor::stopSendRtp(MediaSource &sender, const string &ssrc) {
CHECK_CALL_DEPTH();
bool MediaSourceEventInterceptor::stopSendRtp(MediaSource &sender, const string &ssrc){
auto listener = _listener.lock();
if (listener) {
return listener->stopSendRtp(sender, ssrc);

1
src/Common/MediaSource.h
View File

@ -124,7 +124,6 @@ public:
bool stopSendRtp(MediaSource &sender, const string &ssrc) override;
private:
int _invoke_depth = 0;
std::weak_ptr<MediaSourceEvent> _listener;
};