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

完善rtsp画面秒开机制

Browse Source
This commit is contained in:
xiongziliang
2018-11-19 16:15:47 +08:00
parent cc1a784384
commit 26dd99d159
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/RtspMuxer/H264RtpCodec.cpp
View File

@@ -206,27 +206,25 @@ void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) {
iSize = iLen - nOffset;
mark = true;
s_e_r_type = s_e_r_End + naluType;
} else if (bFirst) {
s_e_r_type = s_e_r_Start + naluType;
} else {
if (bFirst == true) {
s_e_r_type = s_e_r_Start + naluType;
bFirst = false;
} else {
s_e_r_type = s_e_r_Mid + naluType;
}
s_e_r_type = s_e_r_Mid + naluType;
}
memcpy(_aucSectionBuf, &f_nri_type, 1);
memcpy(_aucSectionBuf + 1, &s_e_r_type, 1);
memcpy(_aucSectionBuf + 2, (unsigned char *) pcData + nOffset, iSize);
nOffset += iSize;
makeH264Rtp(naluType,_aucSectionBuf, iSize + 2, mark, uiStamp);
makeH264Rtp(naluType,_aucSectionBuf, iSize + 2, mark,bFirst, uiStamp);
bFirst = false;
}
} else {
makeH264Rtp(naluType,pcData, iLen, true, uiStamp);
makeH264Rtp(naluType,pcData, iLen, true, true, uiStamp);
}
}
void H264RtpEncoder::makeH264Rtp(int nal_type,const void* data, unsigned int len, bool mark, uint32_t uiStamp) {
RtpCodec::inputRtp(makeRtp(getTrackType(),data,len,mark,uiStamp),nal_type == H264Frame::NAL_SPS);
void H264RtpEncoder::makeH264Rtp(int nal_type,const void* data, unsigned int len, bool mark, bool first_packet, uint32_t uiStamp) {
RtpCodec::inputRtp(makeRtp(getTrackType(),data,len,mark,uiStamp),first_packet && nal_type == H264Frame::NAL_IDR);
}
}//namespace mediakit