mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-03-07 22:50:55 +08:00
优化与拦截代码
This commit is contained in:
@@ -245,30 +245,6 @@ bool FFmpegSource::close(MediaSource &sender, bool force) {
|
||||
return true;
|
||||
}
|
||||
|
||||
int FFmpegSource::totalReaderCount(MediaSource &sender) {
|
||||
auto listener = _listener.lock();
|
||||
if(listener){
|
||||
return listener->totalReaderCount(sender);
|
||||
}
|
||||
return sender.readerCount();
|
||||
}
|
||||
|
||||
void FFmpegSource::onNoneReader(MediaSource &sender){
|
||||
auto listener = _listener.lock();
|
||||
if(listener){
|
||||
listener->onNoneReader(sender);
|
||||
return;
|
||||
}
|
||||
MediaSourceEvent::onNoneReader(sender);
|
||||
}
|
||||
|
||||
void FFmpegSource::onRegist(MediaSource &sender, bool regist){
|
||||
auto listener = _listener.lock();
|
||||
if(listener){
|
||||
listener->onRegist(sender, regist);
|
||||
}
|
||||
}
|
||||
|
||||
void FFmpegSource::onGetMediaSource(const MediaSource::Ptr &src) {
|
||||
auto listener = src->getListener();
|
||||
if (listener.lock().get() != this) {
|
||||
|
||||
@@ -40,7 +40,7 @@ private:
|
||||
~FFmpegSnap() = delete;
|
||||
};
|
||||
|
||||
class FFmpegSource : public std::enable_shared_from_this<FFmpegSource> , public MediaSourceEvent{
|
||||
class FFmpegSource : public std::enable_shared_from_this<FFmpegSource> , public MediaSourceEventInterceptor{
|
||||
public:
|
||||
typedef shared_ptr<FFmpegSource> Ptr;
|
||||
typedef function<void(const SockException &ex)> onPlay;
|
||||
@@ -60,9 +60,6 @@ private:
|
||||
|
||||
//MediaSourceEvent override
|
||||
bool close(MediaSource &sender,bool force) override;
|
||||
int totalReaderCount(MediaSource &sender) override;
|
||||
void onNoneReader(MediaSource &sender) override;
|
||||
void onRegist(MediaSource &sender, bool regist) override;
|
||||
|
||||
private:
|
||||
Process _process;
|
||||
@@ -72,7 +69,6 @@ private:
|
||||
string _src_url;
|
||||
string _dst_url;
|
||||
function<void()> _onClose;
|
||||
std::weak_ptr<MediaSourceEvent> _listener;
|
||||
Ticker _replay_ticker;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user