Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-23 09:22:21 +08:00
Code Issues 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
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 {
return isKeyFrame(H265_TYPE(_buffer[_prefix_size]));
return isKeyFrame(H265_TYPE(_buffer[_prefix_size]), _buffer.data(), _prefix_size);
}
bool H265Frame::configFrame() const {
@@ -63,9 +63,22 @@ bool H265Frame::configFrame() const {
}
}
bool H265Frame::isKeyFrame(int type) {
return type >= NAL_BLA_W_LP && type <= NAL_RSV_IRAP_VCL23;
}
bool H265Frame::isKeyFrame(int type, const char* ptr, uint32_t prefix_size) {
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(){
_codec_id = CodecH265;
@@ -83,7 +96,7 @@ H265FrameNoCacheAble::H265FrameNoCacheAble(char *ptr, size_t size, uint32_t dts,
}
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 {
@@ -152,7 +165,7 @@ void H265Track::inputFrame(const Frame::Ptr &frame) {
void H265Track::inputFrame_l(const Frame::Ptr &frame) {
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);
VideoTrack::inputFrame(frame);
_is_idr = true;