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

优化hls生成

Browse Source
This commit is contained in:
xiongziliang
2019-10-12 10:29:40 +08:00
parent 7f203ce9b7
commit c4aaaa11c7
5 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Common/MediaSink.cpp
View File

@@ -35,16 +35,6 @@ void MediaSink::addTrack(const Track::Ptr &track_in) {
//克隆Track，只拷贝其数据，不拷贝其数据转发关系
auto track = track_in->clone();
weak_ptr<MediaSink> weakSelf = shared_from_this();
track->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([weakSelf](const Frame::Ptr &frame){
auto strongSelf = weakSelf.lock();
if(!strongSelf){
return;
}
if(!strongSelf->_anyTrackUnReady){
strongSelf->onTrackFrame(frame);
}
}));
auto codec_id = track->getCodecId();
_track_map[codec_id] = track;
auto lam = [this,track](){
@@ -58,6 +48,17 @@ void MediaSink::addTrack(const Track::Ptr &track_in) {
_trackReadyCallback[codec_id] = lam;
_ticker.resetTime();
}
weak_ptr<MediaSink> weakSelf = shared_from_this();
track->addDelegate(std::make_shared<FrameWriterInterfaceHelper>([weakSelf](const Frame::Ptr &frame){
auto strongSelf = weakSelf.lock();
if(!strongSelf){
return;
}
if(!strongSelf->_anyTrackUnReady){
strongSelf->onTrackFrame(frame);
}
}));
}
void MediaSink::resetTracks() {