support get config frames from video track

ext-codec/H264.cpp

@@ -117,7 +117,7 @@ size_t prefixSize(const char *ptr, size_t len) {
 H264Track::H264Track(const string &sps, const string &pps, int sps_prefix_len, int pps_prefix_len) {
     _sps = sps.substr(sps_prefix_len);
     _pps = pps.substr(pps_prefix_len);
-    update();
+    H264Track::update();
 }
 
 CodecId H264Track::getCodecId() const {
@@ -235,6 +235,10 @@ void H264Track::setExtraData(const uint8_t *data, size_t bytes) {
 }
 
 bool H264Track::update() {
+    _config_frames = std::vector<Frame::Ptr>{
+        createConfigFrame<H264Frame>(_sps),
+        createConfigFrame<H264Frame>(_pps)
+    };
     return getAVCInfo(_sps, _width, _height, _fps);
 }
 
@@ -284,23 +288,11 @@ bool H264Track::inputFrame_l(const Frame::Ptr &frame) {
 
 void H264Track::insertConfigFrame(const Frame::Ptr &frame) {
     if (!_sps.empty()) {
-        auto spsFrame = FrameImp::create<H264Frame>();
+        VideoTrack::inputFrame(createConfigFrame<H264Frame>(_sps, frame->dts(), frame->getIndex()));
-        spsFrame->_prefix_size = 4;
-        spsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
-        spsFrame->_buffer.append(_sps);
-        spsFrame->_dts = frame->dts();
-        spsFrame->setIndex(frame->getIndex());
-        VideoTrack::inputFrame(spsFrame);
     }
 
     if (!_pps.empty()) {
-        auto ppsFrame = FrameImp::create<H264Frame>();
+        VideoTrack::inputFrame(createConfigFrame<H264Frame>(_pps, frame->dts(), frame->getIndex()));
-        ppsFrame->_prefix_size = 4;
-        ppsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
-        ppsFrame->_buffer.append(_pps);
-        ppsFrame->_dts = frame->dts();
-        ppsFrame->setIndex(frame->getIndex());
-        VideoTrack::inputFrame(ppsFrame);
     }
 }
 

ext-codec/H264.h

@@ -115,6 +115,7 @@ public:
     toolkit::Buffer::Ptr getExtraData() const override;
     void setExtraData(const uint8_t *data, size_t size) override;
     bool update() override;
+    std::vector<Frame::Ptr> getConfigFrames() const override { return _config_frames; }
 
 private:
     Sdp::Ptr getSdp(uint8_t payload_type) const override;
@@ -129,7 +130,20 @@ private:
     float _fps = 0;
     std::string _sps;
     std::string _pps;
+    std::vector<Frame::Ptr> _config_frames;
 };
 
+template <typename FrameType>
+Frame::Ptr createConfigFrame(const std::string &data, uint64_t dts = 0, int index = 0) {
+    auto frame = FrameType::create();
+    frame->_prefix_size = 4;
+    frame->_buffer.assign("\x00\x00\x00\x01", 4);
+    frame->_buffer.append(data);
+    frame->_dts = dts;
+    frame->setIndex(index);
+    return frame;
+}
+
 }//namespace mediakit
+
 #endif //ZLMEDIAKIT_H264_H

ext-codec/H265.cpp

@@ -66,7 +66,7 @@ H265Track::H265Track(const string &vps,const string &sps, const string &pps,int
     _vps = vps.substr(vps_prefix_len);
     _sps = sps.substr(sps_prefix_len);
     _pps = pps.substr(pps_prefix_len);
-    update();
+    H265Track::update();
 }
 
 CodecId H265Track::getCodecId() const {
@@ -182,6 +182,11 @@ void H265Track::setExtraData(const uint8_t *data, size_t bytes) {
 }
 
 bool H265Track::update() {
+    _config_frames = std::vector<Frame::Ptr>{
+        createConfigFrame<H265Frame>(_vps),
+        createConfigFrame<H265Frame>(_sps),
+        createConfigFrame<H265Frame>(_pps)
+    };
     return getHEVCInfo(_vps, _sps, _width, _height, _fps);
 }
 
@@ -194,32 +199,13 @@ void H265Track::insertConfigFrame(const Frame::Ptr &frame) {
         return;
     }
     if (!_vps.empty()) {
-        auto vpsFrame = FrameImp::create<H265Frame>();
+        VideoTrack::inputFrame(createConfigFrame<H265Frame>(_vps));
-        vpsFrame->_prefix_size = 4;
-        vpsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
-        vpsFrame->_buffer.append(_vps);
-        vpsFrame->_dts = frame->dts();
-        vpsFrame->setIndex(frame->getIndex());
-        VideoTrack::inputFrame(vpsFrame);
     }
     if (!_sps.empty()) {
-        auto spsFrame = FrameImp::create<H265Frame>();
+        VideoTrack::inputFrame(createConfigFrame<H265Frame>(_sps));
-        spsFrame->_prefix_size = 4;
-        spsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
-        spsFrame->_buffer.append(_sps);
-        spsFrame->_dts = frame->dts();
-        spsFrame->setIndex(frame->getIndex());
-        VideoTrack::inputFrame(spsFrame);
     }
-
     if (!_pps.empty()) {
-        auto ppsFrame = FrameImp::create<H265Frame>();
+        VideoTrack::inputFrame(createConfigFrame<H265Frame>(_pps));
-        ppsFrame->_prefix_size = 4;
-        ppsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
-        ppsFrame->_buffer.append(_pps);
-        ppsFrame->_dts = frame->dts();
-        ppsFrame->setIndex(frame->getIndex());
-        VideoTrack::inputFrame(ppsFrame);
     }
 }
 

ext-codec/H265.h

@@ -142,6 +142,7 @@ public:
     toolkit::Buffer::Ptr getExtraData() const override;
     void setExtraData(const uint8_t *data, size_t size) override;
     bool update() override;
+    std::vector<Frame::Ptr> getConfigFrames() const override { return _config_frames; }
 
 private:
     Sdp::Ptr getSdp(uint8_t payload_type) const override;
@@ -157,6 +158,7 @@ private:
     std::string _vps;
     std::string _sps;
     std::string _pps;
+    std::vector<Frame::Ptr> _config_frames;
 };
 
 }//namespace mediakit

src/Extension/Track.h

@@ -109,6 +109,11 @@ public:
      * 返回视频fps
      */
     virtual float getVideoFps() const { return 0; }
+
+    /**
+     * 返回相关 sps/pps 等
+     */
+    virtual std::vector<Frame::Ptr> getConfigFrames() const { return std::vector<Frame::Ptr>{}; }
 };
 
 class VideoTrackImp : public VideoTrack {