MPEG: 整合复用ts/ps生成代码

src/Rtp/PSEncoder.h

@@ -10,63 +10,17 @@
 
 #ifndef ZLMEDIAKIT_PSENCODER_H
 #define ZLMEDIAKIT_PSENCODER_H
+
 #if defined(ENABLE_RTPPROXY)
-#include "mpeg-ps.h"
+
+#include "Record/MPEG.h"
 #include "Common/MediaSink.h"
 #include "Common/Stamp.h"
 #include "Extension/CommonRtp.h"
+
 namespace mediakit{
 
-//该类实现mpeg-ps容器格式的打包
-class PSEncoder : public MediaSinkInterface {
-public:
-    PSEncoder();
-    ~PSEncoder() override;
-
-    /**
-     * 添加音视频轨道
-     */
-    bool addTrack(const Track::Ptr &track) override;
-
-    /**
-     * 重置音视频轨道
-     */
-    void resetTracks() override;
-
-    /**
-     * 输入帧数据
-     */
-    bool inputFrame(const Frame::Ptr &frame) override;
-
-protected:
-    /**
-     * 输出mpeg-ps的回调函数
-     * @param stamp 时间戳，毫秒
-     * @param packet 数据指针
-     * @param bytes 数据长度
-     */
-    virtual void onPS(uint32_t stamp, void *packet, size_t bytes) = 0;
-
-private:
-    void init();
-    //音视频时间戳同步用
-    void stampSync();
-
-private:
-    struct track_info {
-        int track_id = -1;
-        Stamp stamp;
-    };
-
-private:
-    uint32_t _timestamp = 0;
-    BufferRaw::Ptr _buffer;
-    std::shared_ptr<struct ps_muxer_t> _muxer;
-    unordered_map<int, track_info> _codec_to_trackid;
-    FrameMerger _frame_merger{FrameMerger::h264_prefix};
-};
-
-class PSEncoderImp : public PSEncoder{
+class PSEncoderImp : public MpegMuxer{
 public:
     PSEncoderImp(uint32_t ssrc, uint8_t payload_type = 96);
     ~PSEncoderImp() override;
@@ -76,12 +30,13 @@ protected:
     virtual void onRTP(Buffer::Ptr rtp) = 0;
 
 protected:
-    void onPS(uint32_t stamp, void *packet, size_t bytes) override;
+    void onWrite(std::shared_ptr<Buffer> buffer, uint32_t stamp, bool key_pos) override;
 
 private:
     std::shared_ptr<CommonRtpEncoder> _rtp_encoder;
 };
 
 }//namespace mediakit
+
 #endif //ENABLE_RTPPROXY
 #endif //ZLMEDIAKIT_PSENCODER_H