Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-27 04:22:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化getTrack接口相关代码

Browse Source
This commit is contained in:
xiongziliang
2020-09-06 17:54:52 +08:00
parent 28262b158f
commit ac70597216
9 changed files with 34 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Common/MultiMediaSourceMuxer.cpp
View File

@@ -96,7 +96,6 @@ bool MultiMuxerPrivate::setupRecord(MediaSource &sender, Recorder::type type, bo
if (hls_src) {
//设置HlsMediaSource的事件监听器
hls_src->setListener(_listener);
hls_src->setTrackSource(shared_from_this());
}
} else if (!start && _hls) {
//停止录制
@@ -189,19 +188,12 @@ void MultiMuxerPrivate::onTrackFrame(const Frame::Ptr &frame) {
void MultiMuxerPrivate::onAllTrackReady() {
if (_rtmp) {
_rtmp->setTrackSource(shared_from_this());
_rtmp->onAllTrackReady();
}
if (_rtsp) {
_rtsp->setTrackSource(shared_from_this());
_rtsp->onAllTrackReady();
}
auto hls_src = getHlsMediaSource();
if (hls_src) {
hls_src->setTrackSource(shared_from_this());
}
if (_track_listener) {
_track_listener->onAllTrackReady();
}
@@ -243,7 +235,7 @@ void MultiMediaSourceMuxer::setTimeStamp(uint32_t stamp) {
_muxer->setTimeStamp(stamp);
}
vector<Track::Ptr> MultiMediaSourceMuxer::getTracks(bool trackReady) const {
vector<Track::Ptr> MultiMediaSourceMuxer::getTracks(MediaSource &sender, bool trackReady) const {
return _muxer->getTracks(trackReady);
}