From 406c5477e0cb9545fdb4f4259dd4330b6c145d10 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Thu, 28 May 2020 18:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0metadata=E4=B8=94=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96Track=E7=9A=84rtmp=E7=A1=AE=E4=BF=9D=E8=83=BD?= =?UTF-8?q?=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Rtmp/RtmpMediaSource.h | 8 ++++++++ src/Rtmp/RtmpMediaSourceImp.h | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h index 0e0c7091..5718c94f 100644 --- a/src/Rtmp/RtmpMediaSource.h +++ b/src/Rtmp/RtmpMediaSource.h @@ -107,6 +107,14 @@ public: } } + /** + * 更新metadata + */ + void updateMetaData(const AMFValue &metadata) { + lock_guard lock(_mtx); + _metadata = metadata; + } + /** * 输入rtmp包 * @param pkt rtmp包 diff --git a/src/Rtmp/RtmpMediaSourceImp.h b/src/Rtmp/RtmpMediaSourceImp.h index 4e8aae87..d2a1267a 100644 --- a/src/Rtmp/RtmpMediaSourceImp.h +++ b/src/Rtmp/RtmpMediaSourceImp.h @@ -53,9 +53,8 @@ public: //该metadata无效,需要重新生成 _metadata = metadata; _recreate_metadata = true; - }else{ - RtmpMediaSource::setMetaData(metadata); } + RtmpMediaSource::setMetaData(metadata); } /** @@ -158,8 +157,8 @@ public: _all_track_ready = true; if(_recreate_metadata){ - //需要重新生成metadata - RtmpMediaSource::setMetaData(_metadata); + //更新metadata + RtmpMediaSource::updateMetaData(_metadata); } }