addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口

src/Rtp/GB28181Process.cpp

@@ -149,6 +149,7 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
         //设置frame回调
         _rtp_decoder[pt]->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([this](const Frame::Ptr &frame) {
             onRtpDecode(frame);
+            return true;
         }));
     }
 

src/Rtp/PSEncoder.cpp

@@ -48,7 +48,7 @@ void PSEncoder::init() {
     });
 }
 
-void PSEncoder::addTrack(const Track::Ptr &track) {
+bool PSEncoder::addTrack(const Track::Ptr &track) {
     switch (track->getCodecId()) {
         case CodecH264: {
             _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_VIDEO_H264, nullptr, 0);
@@ -80,10 +80,11 @@ void PSEncoder::addTrack(const Track::Ptr &track) {
             break;
         }
 
-        default: WarnL << "mpeg-ps 不支持该编码格式,已忽略:" << track->getCodecName(); break;
+        default: WarnL << "mpeg-ps 不支持该编码格式,已忽略:" << track->getCodecName(); return false;;
     }
     //尝试音视频同步
     stampSync();
+    return true;
 }
 
 void PSEncoder::stampSync(){
@@ -110,10 +111,10 @@ void PSEncoder::resetTracks() {
     init();
 }
 
-void PSEncoder::inputFrame(const Frame::Ptr &frame) {
+bool PSEncoder::inputFrame(const Frame::Ptr &frame) {
     auto it = _codec_to_trackid.find(frame->getCodecId());
     if (it == _codec_to_trackid.end()) {
-        return;
+        return false;
     }
     auto &track_info = it->second;
     int64_t dts_out, pts_out;
@@ -121,20 +122,19 @@ void PSEncoder::inputFrame(const Frame::Ptr &frame) {
         case CodecH264:
         case CodecH265: {
             //这里的代码逻辑是让SPS、PPS、IDR这些时间戳相同的帧打包到一起当做一个帧处理，
-            _frame_merger.inputFrame(frame, [&](uint32_t dts, uint32_t pts, const Buffer::Ptr &buffer, bool have_idr) {
+            return _frame_merger.inputFrame(frame, [&](uint32_t dts, uint32_t pts, const Buffer::Ptr &buffer, bool have_idr) {
                 track_info.stamp.revise(dts, pts, dts_out, pts_out);
                 //取视频时间戳为TS的时间戳
                 _timestamp = (uint32_t) pts_out;
                 ps_muxer_input(_muxer.get(), track_info.track_id, have_idr ? 0x0001 : 0,
                                pts_out * 90LL, dts_out * 90LL, buffer->data(), buffer->size());
             });
-            break;
         }
 
         case CodecAAC: {
             if (frame->prefixSize() == 0) {
                 WarnL << "必须提供adts头才能mpeg-ps打包";
-                break;
+                return false;
             }
         }
 
@@ -143,7 +143,7 @@ void PSEncoder::inputFrame(const Frame::Ptr &frame) {
             _timestamp = (uint32_t) dts_out;
             ps_muxer_input(_muxer.get(), track_info.track_id, frame->keyFrame() ? 0x0001 : 0, pts_out * 90LL,
                            dts_out * 90LL, frame->data(), frame->size());
-            break;
+            return true;
         }
     }
 }

src/Rtp/PSEncoder.h

@@ -26,7 +26,7 @@ public:
     /**
      * 添加音视频轨道
      */
-    void addTrack(const Track::Ptr &track) override;
+    bool addTrack(const Track::Ptr &track) override;
 
     /**
      * 重置音视频轨道
@@ -36,7 +36,7 @@ public:
     /**
      * 输入帧数据
      */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;
 
 protected:
     /**

src/Rtp/RtpProcess.cpp

@@ -106,37 +106,38 @@ bool RtpProcess::inputRtp(bool is_udp, const Socket::Ptr &sock, const char *data
     return ret;
 }
 
-void RtpProcess::inputFrame(const Frame::Ptr &frame) {
+bool RtpProcess::inputFrame(const Frame::Ptr &frame) {
     _dts = frame->dts();
     if (_save_file_video && frame->getTrackType() == TrackVideo) {
         fwrite((uint8_t *) frame->data(), frame->size(), 1, _save_file_video.get());
     }
     if (_muxer) {
         _last_frame_time.resetTime();
-        _muxer->inputFrame(frame);
-    } else {
-        if (_cached_func.size() > kMaxCachedFrame) {
-            WarnL << "cached frame of track(" << frame->getCodecName() << ") is too much, now dropped";
-            return;
-        }
-        auto frame_cached = Frame::getCacheAbleFrame(frame);
-        lock_guard<recursive_mutex> lck(_func_mtx);
-        _cached_func.emplace_back([this, frame_cached]() {
-            _last_frame_time.resetTime();
-            _muxer->inputFrame(frame_cached);
-        });
+        return _muxer->inputFrame(frame);
     }
+    if (_cached_func.size() > kMaxCachedFrame) {
+        WarnL << "cached frame of track(" << frame->getCodecName() << ") is too much, now dropped";
+        return false;
+    }
+    auto frame_cached = Frame::getCacheAbleFrame(frame);
+    lock_guard<recursive_mutex> lck(_func_mtx);
+    _cached_func.emplace_back([this, frame_cached]() {
+        _last_frame_time.resetTime();
+        _muxer->inputFrame(frame_cached);
+    });
+    return true;
 }
 
-void RtpProcess::addTrack(const Track::Ptr &track) {
+bool RtpProcess::addTrack(const Track::Ptr &track) {
     if (_muxer) {
-        _muxer->addTrack(track);
-    } else {
-        lock_guard<recursive_mutex> lck(_func_mtx);
-        _cached_func.emplace_back([this, track]() {
-            _muxer->addTrack(track);
-        });
+        return _muxer->addTrack(track);
     }
+
+    lock_guard<recursive_mutex> lck(_func_mtx);
+    _cached_func.emplace_back([this, track]() {
+        _muxer->addTrack(track);
+    });
+    return true;
 }
 
 void RtpProcess::addTrackCompleted() {

src/Rtp/RtpProcess.h

@@ -67,8 +67,8 @@ public:
     void setListener(const std::weak_ptr<MediaSourceEvent> &listener);
 
 protected:
-    void inputFrame(const Frame::Ptr &frame) override;
-    void addTrack(const Track::Ptr & track) override;
+    bool inputFrame(const Frame::Ptr &frame) override;
+    bool addTrack(const Track::Ptr & track) override;
     void addTrackCompleted() override;
     void resetTracks() override {};
 

src/Rtp/RtpSender.cpp

@@ -97,8 +97,8 @@ void RtpSender::onConnect(){
     InfoL << "开始发送 rtp:" << _socket->get_peer_ip() << ":" << _socket->get_peer_port() << ", 是否为udp方式:" << _is_udp;
 }
 
-void RtpSender::addTrack(const Track::Ptr &track){
-    _interface->addTrack(track);
+bool RtpSender::addTrack(const Track::Ptr &track){
+    return _interface->addTrack(track);
 }
 
 void RtpSender::addTrackCompleted(){
@@ -110,11 +110,9 @@ void RtpSender::resetTracks(){
 }
 
 //此函数在其他线程执行
-void RtpSender::inputFrame(const Frame::Ptr &frame) {
-    if (_is_connect) {
-        //连接成功后才做实质操作(节省cpu资源)
-        _interface->inputFrame(frame);
-    }
+bool RtpSender::inputFrame(const Frame::Ptr &frame) {
+    //连接成功后才做实质操作(节省cpu资源)
+    return _is_connect ? _interface->inputFrame(frame) : false;
 }
 
 //此函数在其他线程执行

src/Rtp/RtpSender.h

@@ -42,14 +42,14 @@ public:
     /**
      * 输入帧数据
      */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;
 
     /**
      * 添加track，内部会调用Track的clone方法
      * 只会克隆sps pps这些信息 ，而不会克隆Delegate相关关系
      * @param track
      */
-    virtual void addTrack(const Track::Ptr & track) override;
+    virtual bool addTrack(const Track::Ptr & track) override;
 
     /**
      * 添加所有Track完毕