添加MediaSink类，简化重复逻辑代码

src/RtmpMuxer/RtmpMediaSourceMuxer.h

@@ -52,7 +52,7 @@ public:
         return _mediaSouce->getRing()->readerCount();
     }
 private:
-    void onInited() override {
+    void onAllTrackReady() override {
         _mediaSouce->onGetMetaData(getMetedata());
     }
 private:

src/RtmpMuxer/RtmpMuxer.cpp

@@ -28,53 +28,49 @@
 
 namespace mediakit {
 
-void RtmpMuxer::addTrack(const Track::Ptr &track_in) {
-    //克隆Track，只拷贝其数据，不拷贝其数据转发关系
-    auto track = track_in->clone();
-    auto codec_id = track->getCodecId();
-    _track_map[codec_id] = track;
-
-    auto lam = [this,track](){
-        //异步生成Rtmp编码器
-        auto encoder = Factory::getRtmpCodecByTrack(track);
-        if (!encoder) {
-            return;
-        }
-
-        //根据track生产metedata
-        Metedata::Ptr metedate;
-        switch (track->getTrackType()){
-            case TrackVideo:{
-                metedate = std::make_shared<VideoMete>(dynamic_pointer_cast<VideoTrack>(track));
-            }
-                break;
-            case TrackAudio:{
-                metedate = std::make_shared<AudioMete>(dynamic_pointer_cast<AudioTrack>(track));
-            }
-                break;
-            default:
-                return;;
-
-        }
-        //添加其metedata
-        metedate->getMetedata().object_for_each([&](const std::string &key, const AMFValue &value){
-            _metedata.set(key,value);
-        });
-        //设置Track的代理，这样输入frame至Track时，最终数据将输出到RtmpEncoder中
-        track->addDelegate(encoder);
-        //Rtmp编码器共用同一个环形缓存
-        encoder->setRtmpRing(_rtmpRing);
-    };
-    if(track->ready()){
-        lam();
+RtmpMuxer::RtmpMuxer(const TitleMete::Ptr &title) {
+    if(!title){
+        _metedata = std::make_shared<TitleMete>()->getMetedata();
     }else{
-        _trackReadyCallback[codec_id] = lam;
+        _metedata = title->getMetedata();
     }
+    _rtmpRing = std::make_shared<RtmpRingInterface::RingType>();
+}
+
+void RtmpMuxer::onTrackReady(const Track::Ptr &track) {
+    //生成rtmp编码器
+    auto encoder = Factory::getRtmpCodecByTrack(track);
+    if (!encoder) {
+        return;
+    }
+    //根据track生产metedata
+    Metedata::Ptr metedate;
+    switch (track->getTrackType()){
+        case TrackVideo:{
+            metedate = std::make_shared<VideoMete>(dynamic_pointer_cast<VideoTrack>(track));
+        }
+            break;
+        case TrackAudio:{
+            metedate = std::make_shared<AudioMete>(dynamic_pointer_cast<AudioTrack>(track));
+        }
+            break;
+        default:
+            return;;
+
+    }
+    //添加其metedata
+    metedate->getMetedata().object_for_each([&](const std::string &key, const AMFValue &value){
+        _metedata.set(key,value);
+    });
+    //设置Track的代理，这样输入frame至Track时，最终数据将输出到RtmpEncoder中
+    track->addDelegate(encoder);
+    //Rtmp编码器共用同一个环形缓存
+    encoder->setRtmpRing(_rtmpRing);
 }
 
 
 const AMFValue &RtmpMuxer::getMetedata() const {
-    if(!_trackReadyCallback.empty()){
+    if(!isAllTrackReady()){
         //尚未就绪
         static AMFValue s_amf;
         return s_amf;
@@ -82,36 +78,8 @@ const AMFValue &RtmpMuxer::getMetedata() const {
     return _metedata;
 }
 
-
-void RtmpMuxer::inputFrame(const Frame::Ptr &frame) {
-    auto codec_id = frame->getCodecId();
-    auto it = _track_map.find(codec_id);
-    if (it == _track_map.end()) {
-        return;
-    }
-    it->second->inputFrame(frame);
-    if(!_inited && !_trackReadyCallback.empty() && it->second->ready()){
-        //Track由未就绪状态装换成就绪状态，我们就生成metedata以及Rtmp编码器
-        auto it_callback = _trackReadyCallback.find(codec_id);
-        if(it_callback != _trackReadyCallback.end()){
-            it_callback->second();
-            _trackReadyCallback.erase(it_callback);
-        }
-    }
-
-    if(!_inited && _trackReadyCallback.empty()){
-        _inited = true;
-        onInited();
-    }
-}
-
-bool RtmpMuxer::inputRtmp(const RtmpPacket::Ptr &rtmp , bool key_pos) {
-    _rtmpRing->write(rtmp,key_pos);
-    return key_pos;
-}
-
 RtmpRingInterface::RingType::Ptr RtmpMuxer::getRtmpRing() const {
     return _rtmpRing;
 }
 
-}
+}/* namespace mediakit */

src/RtmpMuxer/RtmpMuxer.h

@@ -29,65 +29,41 @@
 
 #include "RtmpMetedata.h"
 #include "Player/Frame.h"
+#include "Common/MediaSink.h"
 
 namespace mediakit{
 
-class RtmpMuxer : public FrameRingWriterInterface{
+class RtmpMuxer : public MediaSink{
 public:
     typedef std::shared_ptr<RtmpMuxer> Ptr;
 
     /**
      * 构造函数
      */
-    RtmpMuxer(const TitleMete::Ptr &title = nullptr) : _metedata(AMF_OBJECT){
-        if(!title){
-            _metedata = std::make_shared<TitleMete>()->getMetedata();
-        }else{
-            _metedata = title->getMetedata();
-        }
-        _rtmpRing = std::make_shared<RtmpRingInterface::RingType>();
-    }
+    RtmpMuxer(const TitleMete::Ptr &title);
     virtual ~RtmpMuxer(){}
 
-    /**
-     * 添加音视频媒体
-     * @param track 媒体描述
-     */
-    void addTrack(const Track::Ptr & track) ;
-
     /**
      * 获取完整的SDP字符串
      * @return SDP字符串
      */
     const AMFValue &getMetedata() const ;
 
-    /**
-     * 写入帧数据然后打包rtmp
-     * @param frame 帧数据
-     */
-    void inputFrame(const Frame::Ptr &frame) override ;
-
-    /**
-     * 也可以在外部打包好rtmp然后再写入
-     * @param rtmp rtmp包
-     * @param key_pos 是否为关键帧
-     */
-    bool inputRtmp(const RtmpPacket::Ptr &rtmp, bool key_pos = true);
-
     /**
      * 获取rtmp环形缓存
      * @return
      */
     RtmpRingInterface::RingType::Ptr getRtmpRing() const;
-
 protected:
-    virtual void onInited(){};
+    /**
+   * 某track已经准备好，其ready()状态返回true，
+   * 此时代表可以获取其例如sps pps等相关信息了
+   * @param track
+   */
+    void onTrackReady(const Track::Ptr & track) override ;
 private:
-    map<int,Track::Ptr> _track_map;
-    map<int,function<void()> > _trackReadyCallback;
     RtmpRingInterface::RingType::Ptr _rtmpRing;
     AMFValue _metedata;
-    bool  _inited = false;
 };