diff --git a/release/windows/Release/flv.lib b/release/windows/Release/flv.lib deleted file mode 100644 index 15c1d208..00000000 Binary files a/release/windows/Release/flv.lib and /dev/null differ diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h index 8a560997..a54bc8d8 100644 --- a/src/Common/MediaSource.h +++ b/src/Common/MediaSource.h @@ -186,6 +186,14 @@ public: } virtual int readerCount() = 0; + + /** + * 获取track + * @return + */ + virtual vector getTracks(bool trackReady) const{ + return vector(0); + } protected: void regist() ; bool unregist() ; diff --git a/src/Rtmp/RtmpToRtspMediaSource.h b/src/Rtmp/RtmpToRtspMediaSource.h index 98c059f2..4b8138b6 100644 --- a/src/Rtmp/RtmpToRtspMediaSource.h +++ b/src/Rtmp/RtmpToRtspMediaSource.h @@ -96,6 +96,17 @@ public: int readerCount() override { return RtmpMediaSource::readerCount() + (_muxer ? _muxer->readerCount() : 0); } + + /** + * 获取track + * @return + */ + vector getTracks(bool trackReady) const override { + if(!_demuxer){ + return this->RtmpMediaSource::getTracks(trackReady); + } + return _demuxer->getTracks(trackReady); + } private: RtmpDemuxer::Ptr _demuxer; MultiMediaSourceMuxer::Ptr _muxer; diff --git a/src/Rtsp/RtspToRtmpMediaSource.h b/src/Rtsp/RtspToRtmpMediaSource.h index c5a165e4..04980dff 100644 --- a/src/Rtsp/RtspToRtmpMediaSource.h +++ b/src/Rtsp/RtspToRtmpMediaSource.h @@ -88,6 +88,17 @@ public: int readerCount() override { return RtspMediaSource::readerCount() + (_muxer ? _muxer->readerCount() : 0); } + + /** + * 获取track + * @return + */ + vector getTracks(bool trackReady) const override { + if(!_demuxer){ + return this->RtspMediaSource::getTracks(trackReady); + } + return _demuxer->getTracks(trackReady); + } private: RtspDemuxer::Ptr _demuxer; MultiMediaSourceMuxer::Ptr _muxer;