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

优化判断h265是否为关键帧的代码

Browse Source
This commit is contained in:
ziyue 2021-06-09 10:18:47 +08:00
parent ca192a4286
commit ad2cd11eec
3 changed files with 10 additions and 21 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]), _buffer.data(), _prefix_size); return isKeyFrame(H265_TYPE(_buffer[_prefix_size]), _buffer.data() + _prefix_size);
} }
bool H265Frame::configFrame() const { bool H265Frame::configFrame() const {
@ -63,22 +63,12 @@ bool H265Frame::configFrame() const {
} }
} }
bool H265Frame::isKeyFrame(int type, const char* ptr, uint32_t prefix_size) { bool H265Frame::isKeyFrame(int type, const char *ptr) {
if (nullptr != ptr) if (!ptr || type != NAL_IDR_W_RADL) {
{
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; return type >= NAL_BLA_W_LP && type <= NAL_RSV_IRAP_VCL23;
} }
return (((*((uint8_t *) ptr + 2)) >> 7) & 0x01) == 1;
}
H265Frame::H265Frame(){ H265Frame::H265Frame(){
_codec_id = CodecH265; _codec_id = CodecH265;
@ -96,7 +86,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]), _ptr, _prefix_size); return H265Frame::isKeyFrame(H265_TYPE(((uint8_t *) _ptr)[_prefix_size]), _ptr + _prefix_size);
} }
bool H265FrameNoCacheAble::configFrame() const { bool H265FrameNoCacheAble::configFrame() const {
@ -165,13 +155,12 @@ 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, frame->data(), frame->prefixSize())) { if (H265Frame::isKeyFrame(type, frame->data() + frame->prefixSize())) {
insertConfigFrame(frame); insertConfigFrame(frame);
VideoTrack::inputFrame(frame); VideoTrack::inputFrame(frame);
_is_idr = true; _is_idr = true;
return; return;
} }
_is_idr = false; _is_idr = false;
//非idr帧 //非idr帧

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, const char* ptr, uint32_t prefix_size); static bool isKeyFrame(int type, const char* ptr);
protected: protected:
friend class FrameImp; friend class FrameImp;

4
src/Extension/H265Rtp.cpp
View File

@ -269,7 +269,7 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
//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, frame->data(), frame->prefixSize())); 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, (const char*)data, prefixSize((const char*)data, len))); 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