Support multi audio/video track

src/Extension/AAC.cpp

@@ -275,6 +275,7 @@ static Frame::Ptr addADTSHeader(const Frame::Ptr &frame_in, const std::string &a
     frame->_dts = frame_in->dts();
     frame->_buffer.assign(adts_header, size);
     frame->_buffer.append(frame_in->data(), frame_in->size());
+    frame->setIndex(frame_in->getIndex());
     return frame;
 }
 

src/Extension/Frame.cpp

@@ -42,6 +42,7 @@ Frame::Ptr Frame::getCacheAbleFrame(const Frame::Ptr &frame){
 
 FrameStamp::FrameStamp(Frame::Ptr frame, Stamp &stamp, int modify_stamp)
 {
+    setIndex(frame->getIndex());
     _frame = std::move(frame);
     // kModifyStampSystem时采用系统时间戳，kModifyStampRelative采用相对时间戳
     stamp.revise(_frame->dts(), _frame->pts(), _dts, _pts, modify_stamp == ProtocolOption::kModifyStampSystem);

src/Extension/Frame.h

@@ -123,7 +123,24 @@ public:
      * 获取音视频类型
      */
     TrackType getTrackType() const;
+
+    /**
+     * 获取音视频类型描述
+     */
     std::string getTrackTypeStr() const;
+
+    /**
+     * 设置track index, 用于支持多track
+     */
+    void setIndex(int index) { _index = index; }
+
+    /**
+     * 获取track index, 用于支持多track
+     */
+    int getIndex() const { return _index < 0 ? (int)getTrackType() : _index; }
+
+private:
+    int _index = -1;
 };
 
 /**
@@ -302,6 +319,7 @@ public:
     FrameInternalBase(Frame::Ptr parent_frame, char *ptr, size_t size, uint64_t dts, uint64_t pts = 0, size_t prefix_size = 0)
         : Parent(parent_frame->getCodecId(), ptr, size, dts, pts, prefix_size) {
         _parent_frame = std::move(parent_frame);
+        this->setIndex(_parent_frame->getIndex());
     }
 
     bool cacheAble() const override { return _parent_frame->cacheAble(); }
@@ -353,6 +371,7 @@ public:
     using Ptr = std::shared_ptr<FrameCacheAble>;
 
     FrameCacheAble(const Frame::Ptr &frame, bool force_key_frame = false, toolkit::Buffer::Ptr buf = nullptr) {
+        setIndex(frame->getIndex());
         if (frame->cacheAble()) {
             _ptr = frame->data();
             _buffer = frame;

src/Extension/H264.cpp

@@ -285,6 +285,7 @@ void H264Track::insertConfigFrame(const Frame::Ptr &frame) {
         spsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
         spsFrame->_buffer.append(_sps);
         spsFrame->_dts = frame->dts();
+        spsFrame->setIndex(frame->getIndex());
         VideoTrack::inputFrame(spsFrame);
     }
 
@@ -294,6 +295,7 @@ void H264Track::insertConfigFrame(const Frame::Ptr &frame) {
         ppsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
         ppsFrame->_buffer.append(_pps);
         ppsFrame->_dts = frame->dts();
+        ppsFrame->setIndex(frame->getIndex());
         VideoTrack::inputFrame(ppsFrame);
     }
 }

src/Extension/H265.cpp

@@ -195,6 +195,7 @@ void H265Track::insertConfigFrame(const Frame::Ptr &frame) {
         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()) {
@@ -203,6 +204,7 @@ void H265Track::insertConfigFrame(const Frame::Ptr &frame) {
         spsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
         spsFrame->_buffer.append(_sps);
         spsFrame->_dts = frame->dts();
+        spsFrame->setIndex(frame->getIndex());
         VideoTrack::inputFrame(spsFrame);
     }
 
@@ -212,6 +214,7 @@ void H265Track::insertConfigFrame(const Frame::Ptr &frame) {
         ppsFrame->_buffer.assign("\x00\x00\x00\x01", 4);
         ppsFrame->_buffer.append(_pps);
         ppsFrame->_dts = frame->dts();
+        ppsFrame->setIndex(frame->getIndex());
         VideoTrack::inputFrame(ppsFrame);
     }
 }

src/Extension/Track.h

@@ -34,7 +34,10 @@ public:
      * 复制拷贝，只能拷贝派生类的信息，
      * 环形缓存和代理关系不能拷贝，否则会关系紊乱
      */
-    Track(const Track &that) { _bit_rate = that._bit_rate; }
+    Track(const Track &that) {
+        _bit_rate = that._bit_rate;
+        setIndex(that.getIndex());
+    }
 
     /**
      * 是否准备好，准备好才能获取譬如sps pps等信息