Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-05 10:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev

Browse Source
This commit is contained in:
ziyue
2021-06-08 14:41:52 +08:00
parent edf9129f7e 8721c5a62b
commit 9de39de88c
8 changed files with 404 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Extension/H264Rtmp.cpp
View File

@@ -183,7 +183,7 @@ void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
}
}
if(_lastPacket && (_lastPacket->time_stamp != frame->dts() || type == H264Frame::NAL_B_P)) {
if(_lastPacket && (_lastPacket->time_stamp != frame->dts() || pcData[1]&0x80 != 0)) {
RtmpCodec::inputRtmp(_lastPacket);
_lastPacket = nullptr;
}
@@ -214,10 +214,12 @@ void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
_lastPacket->buffer.append((char *) &size, 4);
_lastPacket->buffer.append(pcData, iLen);
_lastPacket->body_size = _lastPacket->buffer.size();
/*
if (type == H264Frame::NAL_B_P) {
RtmpCodec::inputRtmp(_lastPacket);
_lastPacket = nullptr;
}
*/
}
void H264RtmpEncoder::makeVideoConfigPkt() {

5
src/Rtmp/RtmpSession.cpp
View File

@@ -463,7 +463,10 @@ void RtmpSession::onRtmpChunk(RtmpPacket::Ptr packet) {
std::string type = dec.load<std::string>();
if (type == "@setDataFrame") {
setMetaData(dec);
} else {
} else if(type == "onMetaData"){
//setMetaData(dec);
_publisher_metadata = dec.load<AMFValue>();
}else {
TraceP(this) << "unknown notify:" << type;
}
break;