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

添加断流重连是否接着前一次继续写;修复断流重连成功后hls时间戳错误问题

Browse Source
This commit is contained in:
Weiwei.Zhou
2019-10-11 16:51:10 +08:00
parent 7d76a3eb9b
commit d6e60e0919
14 changed files with 109 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Common/MediaSink.cpp
View File

@@ -32,7 +32,7 @@ namespace mediakit{
void MediaSink::addTrack(const Track::Ptr &track_in) {
lock_guard<recursive_mutex> lck(_mtx);
//克隆Track，只拷贝其数据，不拷贝其数据转发关系
//克隆Track，只拷贝其数据，不拷贝其数据转发关系
auto track = track_in->clone();
weak_ptr<MediaSink> weakSelf = shared_from_this();
@@ -60,6 +60,14 @@ void MediaSink::addTrack(const Track::Ptr &track_in) {
}
}
void MediaSink::resetTracks() {
_anyTrackUnReady = true;
_allTrackReady = false;
_track_map.clear();
_trackReadyCallback.clear();
_ticker.resetTime();
}
void MediaSink::inputFrame(const Frame::Ptr &frame) {
lock_guard<recursive_mutex> lck(_mtx);
auto codec_id = frame->getCodecId();