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

修正metadata拼写错误，优化RtmpMediaSource注册机制，修复及时拉流不出画面的bug

Browse Source
This commit is contained in:
xiongziliang
2019-09-23 16:47:20 +08:00
parent 8ae9f56110
commit cb7c72d9d9
14 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Rtmp/RtmpMuxer.cpp
View File

@@ -29,11 +29,11 @@
namespace mediakit {
RtmpMuxer::RtmpMuxer(const TitleMete::Ptr &title) {
RtmpMuxer::RtmpMuxer(const TitleMeta::Ptr &title) {
if(!title){
_metedata = std::make_shared<TitleMete>()->getMetedata();
_metadata = std::make_shared<TitleMeta>()->getMetadata();
}else{
_metedata = title->getMetedata();
_metadata = title->getMetadata();
}
_rtmpRing = std::make_shared<RtmpRingInterface::RingType>();
}
@@ -45,24 +45,24 @@ void RtmpMuxer::onTrackReady(const Track::Ptr &track) {
if (!encoder) {
return;
}
//根据track生产metedata
Metedata::Ptr metedate;
//根据track生产metadata
Metadata::Ptr metadata;
switch (track->getTrackType()){
case TrackVideo:{
metedate = std::make_shared<VideoMete>(dynamic_pointer_cast<VideoTrack>(track));
metadata = std::make_shared<VideoMeta>(dynamic_pointer_cast<VideoTrack>(track));
}
break;
case TrackAudio:{
metedate = std::make_shared<AudioMete>(dynamic_pointer_cast<AudioTrack>(track));
metadata = std::make_shared<AudioMeta>(dynamic_pointer_cast<AudioTrack>(track));
}
break;
default:
return;;
}
//添加其metedata
metedate->getMetedata().object_for_each([&](const std::string &key, const AMFValue &value){
_metedata.set(key,value);
//添加其metadata
metadata->getMetadata().object_for_each([&](const std::string &key, const AMFValue &value){
_metadata.set(key,value);
});
//设置Track的代理，这样输入frame至Track时，最终数据将输出到RtmpEncoder中
track->addDelegate(encoder);
@@ -71,13 +71,13 @@ void RtmpMuxer::onTrackReady(const Track::Ptr &track) {
}
const AMFValue &RtmpMuxer::getMetedata() const {
const AMFValue &RtmpMuxer::getMetadata() const {
if(!isAllTrackReady()){
//尚未就绪
static AMFValue s_amf;
return s_amf;
}
return _metedata;
return _metadata;
}
RtmpRingInterface::RingType::Ptr RtmpMuxer::getRtmpRing() const {