Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-04 09:47:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化解复用器/播放器逻辑，在Track准备就绪后回调播放结果

Browse Source
This commit is contained in:
xiongziliang
2018-11-15 15:14:05 +08:00
parent be81aa7fbb
commit 132468e997
9 changed files with 106 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/RtmpMuxer/RtmpDemuxer.cpp
View File

@@ -112,38 +112,5 @@ void RtmpDemuxer::makeAudioTrack(const AMFValue &audioCodec) {
}
}
vector<Track::Ptr> RtmpDemuxer::getTracks() const {
vector<Track::Ptr> ret;
if(_videoTrack){
ret.emplace_back(_videoTrack);
}
if(_audioTrack){
ret.emplace_back(_audioTrack);
}
return ret;
}
bool RtmpDemuxer::isInited() const {
bool videoReady ,auidoReady;
if(_videoTrack){
videoReady = _videoTrack->ready();
}else{
videoReady = _tryedGetVideoTrack || _tryedGetAudioTrack;
}
if(_audioTrack){
auidoReady = _audioTrack->ready();
}else{
auidoReady = _tryedGetVideoTrack || _tryedGetAudioTrack;
}
return videoReady && auidoReady;
}
float RtmpDemuxer::getDuration() const {
return _fDuration;
}
} /* namespace mediakit */