amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

H265 I帧多slice情况下导致花屏问题

Browse Source 
H265 I帧分片多包情况下，GPO缓冲只保存了I帧最后一个分片导致花屏
This commit is contained in:
baiyfcu 2021-06-09 09:51:28 +08:00
parent b0af056356
commit ca192a4286
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Extension/H265.cpp
View File

@ -51,7 +51,7 @@ bool getHEVCInfo(const string &strVps, const string &strSps, int &iVideoWidth, i
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool H265Frame::keyFrame() const { bool H265Frame::keyFrame() const {
return isKeyFrame(H265_TYPE(_buffer[_prefix_size])); return isKeyFrame(H265_TYPE(_buffer[_prefix_size]), _buffer.data(), _prefix_size);
} }
bool H265Frame::configFrame() const { bool H265Frame::configFrame() const {
@ -63,9 +63,22 @@ bool H265Frame::configFrame() const {
} }
} }
bool H265Frame::isKeyFrame(int type) { bool H265Frame::isKeyFrame(int type, const char* ptr, uint32_t prefix_size) {
return type >= NAL_BLA_W_LP && type <= NAL_RSV_IRAP_VCL23; if (nullptr != ptr)
} {
if (type == NAL_IDR_W_RADL)
{
uint32_t r = 0;
r = ((*((uint8_t*)ptr + prefix_size + 2)) >> 7) & 0x01;
if (r == 1)
return true;
else
return false;
}else
return type >= NAL_BLA_W_LP && type <= NAL_RSV_IRAP_VCL23;
}
return type >= NAL_BLA_W_LP && type <= NAL_RSV_IRAP_VCL23;
}
H265Frame::H265Frame(){ H265Frame::H265Frame(){
_codec_id = CodecH265; _codec_id = CodecH265;
@ -83,7 +96,7 @@ H265FrameNoCacheAble::H265FrameNoCacheAble(char *ptr, size_t size, uint32_t dts,
} }
bool H265FrameNoCacheAble::keyFrame() const { bool H265FrameNoCacheAble::keyFrame() const {
return H265Frame::isKeyFrame(H265_TYPE(((uint8_t *) _ptr)[_prefix_size])); return H265Frame::isKeyFrame(H265_TYPE(((uint8_t *) _ptr)[_prefix_size]), _ptr, _prefix_size);
} }
bool H265FrameNoCacheAble::configFrame() const { bool H265FrameNoCacheAble::configFrame() const {
@ -152,7 +165,7 @@ void H265Track::inputFrame(const Frame::Ptr &frame) {
void H265Track::inputFrame_l(const Frame::Ptr &frame) { void H265Track::inputFrame_l(const Frame::Ptr &frame) {
int type = H265_TYPE(((uint8_t *) frame->data() + frame->prefixSize())[0]); int type = H265_TYPE(((uint8_t *) frame->data() + frame->prefixSize())[0]);
if (H265Frame::isKeyFrame(type)) { if (H265Frame::isKeyFrame(type, frame->data(), frame->prefixSize())) {
insertConfigFrame(frame); insertConfigFrame(frame);
VideoTrack::inputFrame(frame); VideoTrack::inputFrame(frame);
_is_idr = true; _is_idr = true;

2
src/Extension/H265.h
View File

@ -61,7 +61,7 @@ public:
bool keyFrame() const override; bool keyFrame() const override;
bool configFrame() const override; bool configFrame() const override;
static bool isKeyFrame(int type); static bool isKeyFrame(int type, const char* ptr, uint32_t prefix_size);
protected: protected:
friend class FrameImp; friend class FrameImp;

6
src/Extension/H265Rtp.cpp
View File

@ -263,13 +263,13 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
//FU 第1个字节，表明为FU //FU 第1个字节，表明为FU
payload[0] = 49 << 1; payload[0] = 49 << 1;
//FU 第2个字节貌似固定为1 //FU 第2个字节貌似固定为1
payload[1] = 1; payload[1] = ptr[1];// 1;
//FU 第3个字节 //FU 第3个字节
payload[2] = s_e_flags; payload[2] = s_e_flags;
//H265 数据 //H265 数据
memcpy(payload + 3, ptr + offset, max_size); memcpy(payload + 3, ptr + offset, max_size);
//输入到rtp环形缓存 //输入到rtp环形缓存
RtpCodec::inputRtp(rtp, fu_start && H265Frame::isKeyFrame(nal_type)); RtpCodec::inputRtp(rtp, fu_start && H265Frame::isKeyFrame(nal_type, frame->data(), frame->prefixSize()));
} }
offset += max_size; offset += max_size;
@ -281,7 +281,7 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
} }
void H265RtpEncoder::makeH265Rtp(int nal_type,const void* data, size_t len, bool mark, bool first_packet, uint32_t uiStamp) { void H265RtpEncoder::makeH265Rtp(int nal_type,const void* data, size_t len, bool mark, bool first_packet, uint32_t uiStamp) {
RtpCodec::inputRtp(makeRtp(getTrackType(),data,len,mark,uiStamp),first_packet && H265Frame::isKeyFrame(nal_type)); RtpCodec::inputRtp(makeRtp(getTrackType(),data,len,mark,uiStamp),first_packet && H265Frame::isKeyFrame(nal_type, (const char*)data, prefixSize((const char*)data, len)));
} }
}//namespace mediakit }//namespace mediakit

1
src/Rtmp/RtmpSession.cpp
View File

@ -499,7 +499,6 @@ void RtmpSession::onRtmpChunk(RtmpPacket::Ptr packet) {
void RtmpSession::onCmd_seek(AMFDecoder &dec) { void RtmpSession::onCmd_seek(AMFDecoder &dec) {
dec.load<AMFValue>();/* NULL */ dec.load<AMFValue>();/* NULL */
AMFValue status(AMF_OBJECT); AMFValue status(AMF_OBJECT);
AMFEncoder invoke;
status.set("level", "status"); status.set("level", "status");
status.set("code", "NetStream.Seek.Notify"); status.set("code", "NetStream.Seek.Notify");
status.set("description", "Seeking."); status.set("description", "Seeking.");