diff --git a/src/Extension/H265.h b/src/Extension/H265.h index 186b24a1..6533c1d9 100644 --- a/src/Extension/H265.h +++ b/src/Extension/H265.h @@ -252,7 +252,7 @@ public: _vpsFrame = insertFrame; } _vpsFrame->timeStamp = frame->stamp(); - // VideoTrack::inputFrame(_vpsFrame); + VideoTrack::inputFrame(_vpsFrame); } if (!_sps.empty()) { if (!_spsFrame) { @@ -265,7 +265,7 @@ public: _spsFrame = insertFrame; } _spsFrame->timeStamp = frame->stamp(); - // VideoTrack::inputFrame(_spsFrame); + VideoTrack::inputFrame(_spsFrame); } if (!_pps.empty()) { @@ -279,7 +279,7 @@ public: _ppsFrame = insertFrame; } _ppsFrame->timeStamp = frame->stamp(); - //VideoTrack::inputFrame(_ppsFrame); + VideoTrack::inputFrame(_ppsFrame); } VideoTrack::inputFrame(frame); return; diff --git a/src/RtspMuxer/H265RtpCodec.cpp b/src/RtspMuxer/H265RtpCodec.cpp index 775a7048..6284c4ca 100644 --- a/src/RtspMuxer/H265RtpCodec.cpp +++ b/src/RtspMuxer/H265RtpCodec.cpp @@ -146,7 +146,6 @@ bool H265RtpDecoder::decodeRtp(const RtpPacket::Ptr &rtppack) { void H265RtpDecoder::onGetH265(const H265Frame::Ptr &frame) { //写入环形缓存 auto lastSeq = _h265frame->sequence; - DebugL << (int)frame->type; RtpCodec::inputFrame(frame); _h265frame = obtainFrame(); _h265frame->sequence = lastSeq; @@ -177,7 +176,6 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) { unsigned char naluType = H265_TYPE(pcData[0]); //获取NALU的5bit 帧类型 uiStamp %= cycleMS; - WarnL << (int)naluType; int maxSize = _ui32MtuSize - 3; if (iLen > maxSize) { //超过MTU //获取帧头数据,1byte @@ -189,10 +187,10 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) { if (iLen < nOffset + maxSize) { //是否拆分结束 maxSize = iLen - nOffset; mark = true; - s_e_type = 1 << 7 | naluType; + s_e_type = 1 << 6 | naluType; } else { if (bFirst == true) { - s_e_type = 1 << 6 | naluType; + s_e_type = 1 << 7 | naluType; bFirst = false; } else { s_e_type = naluType;