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的rtmp流

Browse Source
This commit is contained in:
xiongziliang
2019-09-21 19:27:34 +08:00
parent 9d43c38e09
commit 8da9aee11a
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Rtmp/RtmpSession.cpp
View File

@@ -262,10 +262,16 @@ void RtmpSession::sendPlayResponse(const string &err,const RtmpMediaSource::Ptr
status.set("clientid", "0");
sendReply("onStatus", nullptr, status);
// onMetaData
invoke.clear();
invoke << "onMetaData" << src->getMetaData();
sendResponse(MSG_DATA, invoke.data());
auto &metadata = src->getMetaData();
if(metadata){
//在有metadata的情况下才发送metadata
//其实metadata没什么用，有些推流器不产生metadata
// onMetaData
invoke.clear();
invoke << "onMetaData" << metadata;
sendResponse(MSG_DATA, invoke.data());
}
src->getConfigFrame([&](const RtmpPacket::Ptr &pkt) {
//DebugP(this)<<"send initial frame";
@@ -423,7 +429,9 @@ void RtmpSession::setMetaData(AMFDecoder &dec) {
if (type != "onMetaData") {
throw std::runtime_error("can only set metadata");
}
_pPublisherSrc->onGetMetaData(dec.load<AMFValue>());
auto metadata = dec.load<AMFValue>();
//dumpMetadata(metadata);
_pPublisherSrc->onGetMetaData(metadata);
}
void RtmpSession::onProcessCmd(AMFDecoder &dec) {
@@ -542,4 +550,16 @@ void RtmpSession::setSocketFlags(){
(*this) << SocketFlags(SOCKET_DEFAULE_FLAGS | FLAG_MORE);
}
}
void RtmpSession::dumpMetadata(const AMFValue &metadata) {
if(metadata.type() != AMF_OBJECT && metadata.type() != AMF_ECMA_ARRAY){
WarnL << "invalid metedata type:" << metadata.type();
return ;
}
_StrPrinter printer;
metadata.object_for_each([&](const string &key, const AMFValue &val){
printer << "\r\n" << key << "\t:" << val.to_string() ;
});
InfoL << _mediaInfo._vhost << " " << _mediaInfo._app << " " << _mediaInfo._streamid << (string)printer;
}
} /* namespace mediakit */