Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 19:51:49 +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

8
src/Rtmp/RtmpSession.cpp
View File

@@ -431,6 +431,7 @@ void RtmpSession::setMetaData(AMFDecoder &dec) {
}
auto metadata = dec.load<AMFValue>();
//dumpMetadata(metadata);
_metadata_got = true;
_pPublisherSrc->onGetMetaData(metadata);
}
@@ -488,6 +489,11 @@ void RtmpSession::onRtmpChunk(RtmpPacket &chunkData) {
_stamp[chunkData.typeId % 2].revise(0, 0, dts_out, dts_out);
chunkData.timeStamp = dts_out;
}
if(!_metadata_got){
//有些rtmp推流客户端不产生metadata，我们产生一个默认的metadata，目的是为了触发注册操作
_metadata_got = true;
_pPublisherSrc->onGetMetaData(TitleMeta().getMetadata());
}
_pPublisherSrc->onWrite(std::make_shared<RtmpPacket>(std::move(chunkData)));
}
break;
@@ -553,7 +559,7 @@ void RtmpSession::setSocketFlags(){
void RtmpSession::dumpMetadata(const AMFValue &metadata) {
if(metadata.type() != AMF_OBJECT && metadata.type() != AMF_ECMA_ARRAY){
WarnL << "invalid metedata type:" << metadata.type();
WarnL << "invalid metadata type:" << metadata.type();
return ;
}
_StrPrinter printer;