移除MultiMuxerPrivate对象，修复rtp发送时无sps pps帧的问题

4b34e58d · ziyue · 902c25ae · 4b34e58d · 4b34e58d · 4b34e58d
Commit 4b34e58d authored Jul 20, 2021 by ziyue
--- a/src/Common/MultiMediaSourceMuxer.cpp
+++ b/src/Common/MultiMediaSourceMuxer.cpp
--- a/src/Common/MultiMediaSourceMuxer.h
+++ b/src/Common/MultiMediaSourceMuxer.h
@@ -23,10 +23,10 @@
 namespace mediakit{
-class MultiMuxerPrivate : public MediaSink, public std::enable_shared_from_this<MultiMuxerPrivate>{
+class MultiMediaSourceMuxer : public MediaSourceEventInterceptor, public MediaSink, public std::enable_shared_from_this<MultiMediaSourceMuxer>{
 public:
-    friend class MultiMediaSourceMuxer;
+    typedef std::shared_ptr<MultiMediaSourceMuxer> Ptr;
-    typedef std::shared_ptr<MultiMuxerPrivate> Ptr;
    class Listener{
    public:
        Listener() = default;
@@ -34,43 +34,7 @@ public:
        virtual void onAllTrackReady() = 0;
    };
-    ~MultiMuxerPrivate() override;
+    ~MultiMediaSourceMuxer() override = default;
-private:
-    MultiMuxerPrivate(const string &vhost,const string &app, const string &stream,float dur_sec,
-                      bool enable_rtsp, bool enable_rtmp, bool enable_hls, bool enable_mp4);
-    void resetTracks() override;
-    void setMediaListener(const std::weak_ptr<MediaSourceEvent> &listener);
-    int totalReaderCount() const;
-    void setTimeStamp(uint32_t stamp);
-    void setTrackListener(Listener *listener);
-    bool setupRecord(MediaSource &sender, Recorder::type type, bool start, const string &custom_path, size_t max_second);
-    bool isRecording(MediaSource &sender, Recorder::type type);
-    bool isEnabled();
-    void onTrackReady(const Track::Ptr & track) override;
-    void onTrackFrame(const Frame::Ptr &frame) override;
-    void onAllTrackReady() override;
-private:
-    string _stream_url;
-    Listener *_track_listener = nullptr;
-    RtmpMediaSourceMuxer::Ptr _rtmp;
-    RtspMediaSourceMuxer::Ptr _rtsp;
-    HlsRecorder::Ptr _hls;
-    MediaSinkInterface::Ptr _mp4;
-    TSMediaSourceMuxer::Ptr _ts;
-#if defined(ENABLE_MP4)
-    FMP4MediaSourceMuxer::Ptr _fmp4;
-#endif
-    std::weak_ptr<MediaSourceEvent> _listener;
-};
-class MultiMediaSourceMuxer : public MediaSourceEventInterceptor, public MediaSinkInterface, public MultiMuxerPrivate::Listener, public std::enable_shared_from_this<MultiMediaSourceMuxer>{
-public:
-    typedef MultiMuxerPrivate::Listener Listener;
-    typedef std::shared_ptr<MultiMediaSourceMuxer> Ptr;
-    ~MultiMediaSourceMuxer() override;
    MultiMediaSourceMuxer(const string &vhost, const string &app, const string &stream, float dur_sec = 0.0,
                          bool enable_rtsp = true, bool enable_rtmp = true, bool enable_hls = true, bool enable_mp4 = false);
@@ -84,7 +48,7 @@ public:
      * 随着Track就绪事件监听器
      * @param listener 事件监听器
     */
-    void setTrackListener(const std::weak_ptr<MultiMuxerPrivate::Listener> &listener);
+    void setTrackListener(const std::weak_ptr<Listener> &listener);
    /**
     * 返回总的消费者个数
@@ -105,13 +69,6 @@ public:
    /////////////////////////////////MediaSourceEvent override/////////////////////////////////
    /**
-     * 获取所有Track
-     * @param trackReady 是否筛选过滤未就绪的track
-     * @return 所有Track
-     */
-    vector<Track::Ptr> getTracks(MediaSource &sender, bool trackReady = true) const override;
-    /**
     * 观看总人数
     * @param sender 事件发送者
     * @return 观看总人数
@@ -150,48 +107,52 @@ public:
     */
    bool stopSendRtp(MediaSource &sender, const string &ssrc) override;
-    /////////////////////////////////MediaSinkInterface override/////////////////////////////////
    /**
-    * 添加track，内部会调用Track的clone方法
+     * 重置track
-    * 只会克隆sps pps这些信息 ，而不会克隆Delegate相关关系
-    * @param track 添加音频或视频轨道
     */
-    void addTrack(const Track::Ptr &track) override;
+    void resetTracks() override;
-    /**
+protected:
-     * 添加track完毕
+    /////////////////////////////////MediaSink override/////////////////////////////////
-     */
-    void addTrackCompleted() override;
    /**
-     * 重置track
+    * 某track已经准备好，其ready()状态返回true，
+    * 此时代表可以获取其例如sps pps等相关信息了
+    * @param track
    */
-    void resetTracks() override;
+    void onTrackReady(const Track::Ptr & track) override;
    /**
-     * 写入帧数据
+     * 所有Track已经准备好，
-     * @param frame 帧
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    void onAllTrackReady() override;
-    /////////////////////////////////MultiMuxerPrivate::Listener override/////////////////////////////////
    /**
-     * 所有track全部就绪
+     * 某Track输出frame，在onAllTrackReady触发后才会调用此方法
+     * @param frame
     */
-    void onAllTrackReady() override;
+    void onTrackFrame(const Frame::Ptr &frame) override;
 private:
    bool _is_enable = false;
+    string _stream_url;
    Ticker _last_check;
    Stamp _stamp[2];
-    MultiMuxerPrivate::Ptr _muxer;
+    std::weak_ptr<Listener> _track_listener;
-    std::weak_ptr<MultiMuxerPrivate::Listener> _track_listener;
 #if defined(ENABLE_RTPPROXY)
    mutex _rtp_sender_mtx;
 	unordered_map<string, RtpSender::Ptr> _rtp_sender;
 #endif //ENABLE_RTPPROXY
+#if defined(ENABLE_MP4)
+    FMP4MediaSourceMuxer::Ptr _fmp4;
+#endif
+    RtmpMediaSourceMuxer::Ptr _rtmp;
+    RtspMediaSourceMuxer::Ptr _rtsp;
+    TSMediaSourceMuxer::Ptr _ts;
+    MediaSinkInterface::Ptr _mp4;
+    HlsRecorder::Ptr _hls;
    //对象个数统计
    ObjectStatistic<MultiMediaSourceMuxer> _statistic;
 };

--- a/src/Rtmp/RtmpMediaSourceImp.h
+++ b/src/Rtmp/RtmpMediaSourceImp.h
@@ -127,7 +127,7 @@ public:
        if (_recreate_metadata) {
            //更新metadata
-            for (auto &track : _muxer->getTracks(*this)) {
+            for (auto &track : _muxer->MediaSink::getTracks()) {
                Metadata::addTrack(_metadata, track);
            }
            RtmpMediaSource::updateMetaData(_metadata);