THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复添加track太晚导致的bug: #528

This commit is contained in:
xiongziliang 2020-10-20 10:21:35 +08:00
parent b7d6442870
commit 130c411ae4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Common/MediaSink.cpp
View File

@ -13,19 +13,21 @@
//最多等待未初始化的Track 10秒，超时之后会忽略未初始化的Track //最多等待未初始化的Track 10秒，超时之后会忽略未初始化的Track
#define MAX_WAIT_MS_READY 10000 #define MAX_WAIT_MS_READY 10000
//如果添加Track，最多等待3秒 //如果添加Track，最多等待5秒
#define MAX_WAIT_MS_ADD_TRACK 3000 #define MAX_WAIT_MS_ADD_TRACK 5000
namespace mediakit{ namespace mediakit{
void MediaSink::addTrack(const Track::Ptr &track_in) { void MediaSink::addTrack(const Track::Ptr &track_in) {
lock_guard<recursive_mutex> lck(_mtx); lock_guard<recursive_mutex> lck(_mtx);
if (_all_track_ready) {
WarnL << "all track is ready, add this track too late!";
return;
}
//克隆Track，只拷贝其数据，不拷贝其数据转发关系 //克隆Track，只拷贝其数据，不拷贝其数据转发关系
auto track = track_in->clone(); auto track = track_in->clone();
auto codec_id = track->getCodecId(); auto codec_id = track->getCodecId();
_track_map[codec_id] = track; _track_map[codec_id] = track;
_all_track_ready = false;
_track_ready_callback[codec_id] = [this, track]() { _track_ready_callback[codec_id] = [this, track]() {
onTrackReady(track); onTrackReady(track);
}; };