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

src/Common/MediaSink.cpp

@@ -0,0 +1,87 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2016 xiongziliang <771730766@qq.com>
+ *
+ * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "MediaSink.h"
+
+
+namespace mediakit{
+
+void MediaSink::addTrack(const Track::Ptr &track_in) {
+    lock_guard<mutex> lck(_mtx);
+//克隆Track，只拷贝其数据，不拷贝其数据转发关系
+    auto track = track_in->clone();
+
+    weak_ptr<MediaSink> weakSelf = shared_from_this();
+    track->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([weakSelf](const Frame::Ptr &frame){
+        auto strongSelf = weakSelf.lock();
+        if(!strongSelf){
+            return;
+        }
+        if(strongSelf->_allTrackReady){
+            strongSelf->onTrackFrame(frame);
+        }
+    }));
+    auto codec_id = track->getCodecId();
+    _track_map[codec_id] = track;
+    auto lam = [this,track](){
+        onTrackReady(track);
+    };
+    if(track->ready()){
+        lam();
+    }else{
+        _allTrackReady = false;
+        _trackReadyCallback[codec_id] = lam;
+    }
+}
+
+void MediaSink::inputFrame(const Frame::Ptr &frame) {
+    lock_guard<mutex> lck(_mtx);
+    auto codec_id = frame->getCodecId();
+    auto it = _track_map.find(codec_id);
+    if (it == _track_map.end()) {
+        return;
+    }
+    it->second->inputFrame(frame);
+    if(!_allTrackReady && !_trackReadyCallback.empty() && it->second->ready()){
+        //Track由未就绪状态装换成就绪状态，我们就生成sdp以及rtp编码器
+        auto it_callback = _trackReadyCallback.find(codec_id);
+        if(it_callback != _trackReadyCallback.end()){
+            it_callback->second();
+            _trackReadyCallback.erase(it_callback);
+        }
+    }
+
+    if(!_allTrackReady && _trackReadyCallback.empty()){
+        _allTrackReady = true;
+        onAllTrackReady();
+    }
+}
+
+bool MediaSink::isAllTrackReady() const {
+    return _allTrackReady;
+}
+
+
+}//namespace mediakit

src/Common/MediaSink.h

@@ -0,0 +1,107 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2016 xiongziliang <771730766@qq.com>
+ *
+ * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef ZLMEDIAKIT_MEDIASINK_H
+#define ZLMEDIAKIT_MEDIASINK_H
+
+#include <mutex>
+#include <memory>
+#include "Player/Frame.h"
+#include "Player/Track.h"
+
+using namespace std;
+using namespace toolkit;
+
+namespace mediakit{
+
+class MediaSink : public FrameWriterInterface , public std::enable_shared_from_this<MediaSink>{
+public:
+    typedef std::shared_ptr<MediaSink> Ptr;
+    MediaSink(){}
+    virtual ~MediaSink(){}
+
+    /**
+     * 输入frame
+     * @param frame
+     */
+    void inputFrame(const Frame::Ptr &frame) override ;
+
+    /**
+     * 添加track，内部会调用Track的clone方法
+     * 只会克隆sps pps这些信息 ，而不会克隆Delegate相关关系
+     * @param track
+     */
+    void addTrack(const Track::Ptr & track);
+
+
+    /**
+     * 全部Track是否都准备好了
+     * @return
+     */
+    bool isAllTrackReady() const ;
+protected:
+    /**
+     * 某track已经准备好，其ready()状态返回true，
+     * 此时代表可以获取其例如sps pps等相关信息了
+     * @param track
+     */
+    virtual void onTrackReady(const Track::Ptr & track) {};
+
+    /**
+     * 所有Track已经准备好，
+     */
+    virtual void onAllTrackReady() {};
+
+    /**
+     * 某Track输出frame，在onAllTrackReady触发后才会调用此方法
+     * @param frame
+     */
+    virtual void onTrackFrame(const Frame::Ptr &frame) {};
+private:
+    mutex _mtx;
+    map<int,Track::Ptr> _track_map;
+    map<int,function<void()> > _trackReadyCallback;
+    bool _allTrackReady = false;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}//namespace mediakit
+
+#endif //ZLMEDIAKIT_MEDIASINK_H

src/Common/MultiMediaSourceMuxer.h

@@ -30,7 +30,7 @@
 #include "RtspMuxer/RtspMediaSourceMuxer.h"
 #include "RtmpMuxer/RtmpMediaSourceMuxer.h"
 
-class MultiMediaSourceMuxer : public FrameRingWriterInterface{
+class MultiMediaSourceMuxer : public FrameWriterInterface{
 public:
     typedef std::shared_ptr<MultiMediaSourceMuxer> Ptr;