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

兼容一些不规范的rtmp推流:#190

Browse Source
This commit is contained in:
xiongziliang
2019-12-25 10:13:59 +08:00
parent 9dc1f3a804
commit bb4e8b73b5
3 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Rtmp/RtmpSession.cpp
View File

@@ -437,8 +437,7 @@ void RtmpSession::setMetaData(AMFDecoder &dec) {
throw std::runtime_error("can only set metadata");
}
auto metadata = dec.load<AMFValue>();
//dumpMetadata(metadata);
_metadata_got = true;
// dumpMetadata(metadata);
_pPublisherSrc->onGetMetaData(metadata);
}
@@ -496,11 +495,6 @@ void RtmpSession::onRtmpChunk(RtmpPacket &chunkData) {
_stamp[chunkData.typeId % 2].revise(chunkData.timeStamp, chunkData.timeStamp, dts_out, dts_out, true);
chunkData.timeStamp = dts_out;
}
if(!_metadata_got && !chunkData.isCfgFrame()){
//有些rtmp推流客户端不产生metadata，我们产生一个默认的metadata，目的是为了触发注册操作
_metadata_got = true;
_pPublisherSrc->onGetMetaData(TitleMeta().getMetadata());
}
_pPublisherSrc->onWrite(std::make_shared<RtmpPacket>(std::move(chunkData)));
}
break;