From 130c411ae4636848230fb84033ee23c8e6f39a84 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Tue, 20 Oct 2020 10:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0track?= =?UTF-8?q?=E5=A4=AA=E6=99=9A=E5=AF=BC=E8=87=B4=E7=9A=84bug:=20#528?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Common/MediaSink.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Common/MediaSink.cpp b/src/Common/MediaSink.cpp index 13b9ab40..02bf904a 100644 --- a/src/Common/MediaSink.cpp +++ b/src/Common/MediaSink.cpp @@ -13,19 +13,21 @@ //最多等待未初始化的Track 10秒,超时之后会忽略未初始化的Track #define MAX_WAIT_MS_READY 10000 -//如果添加Track,最多等待3秒 -#define MAX_WAIT_MS_ADD_TRACK 3000 - +//如果添加Track,最多等待5秒 +#define MAX_WAIT_MS_ADD_TRACK 5000 namespace mediakit{ void MediaSink::addTrack(const Track::Ptr &track_in) { lock_guard lck(_mtx); + if (_all_track_ready) { + WarnL << "all track is ready, add this track too late!"; + return; + } //克隆Track,只拷贝其数据,不拷贝其数据转发关系 auto track = track_in->clone(); auto codec_id = track->getCodecId(); _track_map[codec_id] = track; - _all_track_ready = false; _track_ready_callback[codec_id] = [this, track]() { onTrackReady(track); };