From 0d42aab9e7370f14b798548eb10355303d067445 Mon Sep 17 00:00:00 2001
From: xiongziliang <771730766@qq.com>
Date: Mon, 18 Nov 2019 12:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DFFmpeg=E6=8B=89=E6=B5=81?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87close=5Fs?=
 =?UTF-8?q?tream=E6=8E=A5=E5=8F=A3=E5=85=B3=E9=97=AD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/FFmpegSource.cpp  | 55 ++++++++++++++++++++++------------------
 server/FFmpegSource.h    |  7 ++++-
 src/Common/MediaSource.h |  5 ++++
 3 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/server/FFmpegSource.cpp b/server/FFmpegSource.cpp
index 359ed2be..81d98bd5 100644
--- a/server/FFmpegSource.cpp
+++ b/server/FFmpegSource.cpp
@@ -48,7 +48,6 @@ FFmpegSource::FFmpegSource() {
 }
 
 FFmpegSource::~FFmpegSource() {
-    NoticeCenter::Instance().delListener(this, Broadcast::kBroadcastStreamNoneReader);
     DebugL;
 }
 
@@ -83,6 +82,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_
             if(src){
                 //推流给自己成功
                 cb(SockException());
+                strongSelf->onGetMediaSource(src);
                 strongSelf->startTimer(timeout_ms);
                 return;
             }
@@ -192,8 +192,7 @@ void FFmpegSource::startTimer(int timeout_ms) {
                 //同步查找流
                 if (!src) {
                     //流不在线，重新拉流
-                    strongSelf->play(strongSelf->_src_url, strongSelf->_dst_url, timeout_ms,
-                                     [](const SockException &) {});
+                    strongSelf->play(strongSelf->_src_url, strongSelf->_dst_url, timeout_ms, [](const SockException &) {});
                 }
             });
         } else {
@@ -205,29 +204,35 @@ void FFmpegSource::startTimer(int timeout_ms) {
         }
         return true;
     }, _poller);
-
-    NoticeCenter::Instance().delListener(this, Broadcast::kBroadcastStreamNoneReader);
-    NoticeCenter::Instance().addListener(this, Broadcast::kBroadcastStreamNoneReader,[weakSelf](BroadcastStreamNoneReaderArgs) {
-        auto strongSelf = weakSelf.lock();
-        if (!strongSelf) {
-            //自身已经销毁
-            return;
-        }
-
-        if(sender.getVhost() != strongSelf->_media_info._vhost ||
-           sender.getApp() != strongSelf->_media_info._app ||
-           sender.getId() != strongSelf->_media_info._streamid){
-            //不是自己感兴趣的事件，忽略之
-            return;
-        }
-
-        //该流无人观看，我们停止吧
-        if(strongSelf->_onClose){
-            strongSelf->_onClose();
-        }
-    });
 }
 
 void FFmpegSource::setOnClose(const function<void()> &cb){
     _onClose = cb;
-}
\ No newline at end of file
+}
+
+bool FFmpegSource::close(MediaSource &sender, bool force) {
+    auto listener = _listener.lock();
+    if(listener && !listener->close(sender,force)){
+        //关闭失败
+        return false;
+    }
+    //该流无人观看，我们停止吧
+    if(_onClose){
+        _onClose();
+    }
+    return true;
+}
+
+void FFmpegSource::onNoneReader(MediaSource &sender) {
+    auto listener = _listener.lock();
+    if(listener){
+        listener->onNoneReader(sender);
+    }else{
+        MediaSourceEvent::onNoneReader(sender);
+    }
+}
+
+void FFmpegSource::onGetMediaSource(const MediaSource::Ptr &src) {
+    _listener = src->getListener();
+    src->setListener(shared_from_this());
+}
diff --git a/server/FFmpegSource.h b/server/FFmpegSource.h
index 6be92fc3..5cf2c4f7 100644
--- a/server/FFmpegSource.h
+++ b/server/FFmpegSource.h
@@ -39,7 +39,7 @@ using namespace std;
 using namespace toolkit;
 using namespace mediakit;
 
-class FFmpegSource : public std::enable_shared_from_this<FFmpegSource>{
+class FFmpegSource : public std::enable_shared_from_this<FFmpegSource> , public MediaSourceEvent{
 public:
     typedef shared_ptr<FFmpegSource> Ptr;
     typedef function<void(const SockException &ex)> onPlay;
@@ -55,6 +55,10 @@ public:
 private:
     void findAsync(int maxWaitMS ,const function<void(const MediaSource::Ptr &src)> &cb);
     void startTimer(int timeout_ms);
+    void onGetMediaSource(const MediaSource::Ptr &src);
+
+    bool close(MediaSource &sender,bool force) override;
+    void onNoneReader(MediaSource &sender) override ;
 private:
     Process _process;
     Timer::Ptr _timer;
@@ -63,6 +67,7 @@ private:
     string _src_url;
     string _dst_url;
     function<void()> _onClose;
+    std::weak_ptr<MediaSourceEvent> _listener;
 };
 
 
diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h
index a54bc8d8..5cfe597d 100644
--- a/src/Common/MediaSource.h
+++ b/src/Common/MediaSource.h
@@ -167,10 +167,15 @@ public:
         }
         listener->onNoneReader(*this);
     }
+
     virtual void setListener(const std::weak_ptr<MediaSourceEvent> &listener){
         _listener = listener;
     }
 
+    std::weak_ptr<MediaSourceEvent> getListener(){
+        return _listener;
+    }
+
     template <typename FUN>
     static void for_each_media(FUN && fun){
         lock_guard<recursive_mutex> lock(g_mtxMediaSrc);