优化关闭媒体源相关逻辑: #1963

src/Common/MediaSource.cpp

@@ -211,10 +211,14 @@ bool MediaSource::speed(float speed) {
 
 bool MediaSource::close(bool force) {
     auto listener = _listener.lock();
-    if(!listener){
+    if (!listener) {
         return false;
     }
-    return listener->close(*this,force);
+    if (!force && totalReaderCount()) {
+        //有人观看，不强制关闭
+        return false;
+    }
+    return listener->close(*this);
 }
 
 float MediaSource::getLossRate(mediakit::TrackType type) {
@@ -680,12 +684,12 @@ bool MediaSourceEventInterceptor::speed(MediaSource &sender, float speed) {
     return listener->speed(sender, speed);
 }
 
-bool MediaSourceEventInterceptor::close(MediaSource &sender, bool force) {
+bool MediaSourceEventInterceptor::close(MediaSource &sender) {
     auto listener = _listener.lock();
     if (!listener) {
         return false;
     }
-    return listener->close(sender, force);
+    return listener->close(sender);
 }
 
 int MediaSourceEventInterceptor::totalReaderCount(MediaSource &sender) {

src/Common/MediaSource.h

@@ -74,7 +74,7 @@ public:
     // 通知倍数
     virtual bool speed(MediaSource &sender, float speed) { return false; }
     // 通知其停止产生流
-    virtual bool close(MediaSource &sender, bool force) { return false; }
+    virtual bool close(MediaSource &sender) { return false; }
     // 获取观看总人数，此函数一般强制重载
     virtual int totalReaderCount(MediaSource &sender) { throw NotImplemented(toolkit::demangle(typeid(*this).name()) + "::totalReaderCount not implemented"); }
     // 通知观看人数变化
@@ -150,7 +150,7 @@ public:
     bool seekTo(MediaSource &sender, uint32_t stamp) override;
     bool pause(MediaSource &sender,  bool pause) override;
     bool speed(MediaSource &sender, float speed) override;
-    bool close(MediaSource &sender, bool force) override;
+    bool close(MediaSource &sender) override;
     int totalReaderCount(MediaSource &sender) override;
     void onReaderChanged(MediaSource &sender, int size) override;
     void onRegist(MediaSource &sender, bool regist) override;