From 203edc5cec9660433c8d583c2628564ae73898da Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Fri, 6 Sep 2019 23:22:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84rtp=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Extension/H264Rtp.cpp | 38 ++++++++++++++++++++------------------ src/Extension/H265Rtp.cpp | 16 ++++++++++------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/src/Extension/H264Rtp.cpp b/src/Extension/H264Rtp.cpp index f79da18e..367b3fce 100644 --- a/src/Extension/H264Rtp.cpp +++ b/src/Extension/H264Rtp.cpp @@ -238,32 +238,34 @@ void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) { auto pcData = frame->data() + frame->prefixSize(); auto uiStamp = frame->stamp(); auto iLen = frame->size() - frame->prefixSize(); - unsigned char naluType = H264_TYPE(pcData[0]); //获取NALU的5bit 帧类型 + //获取NALU的5bit 帧类型 + unsigned char naluType = H264_TYPE(pcData[0]); uiStamp %= cycleMS; int iSize = _ui32MtuSize - 2; - if (iLen > iSize) { //超过MTU - const unsigned char s_e_r_Start = 0x80; - const unsigned char s_e_r_Mid = 0x00; - const unsigned char s_e_r_End = 0x40; - //获取帧头数据，1byte - unsigned char nal_ref_idc = *((unsigned char *) pcData) & 0x60; //获取NALU的2bit 帧重要程度 00 可以丢 11不能丢 - //nal_ref_idc = 0x60; - //组装FU-A帧头数据 2byte - unsigned char f_nri_type = nal_ref_idc + 28;//F为0 1bit,nri上面获取到2bit,28为FU-A分片类型5bit - unsigned char s_e_r_type = naluType; + //超过MTU则按照FU-A模式打包 + if (iLen > iSize) { + //最高位bit为forbidden_zero_bit, + //后面2bit为nal_ref_idc(帧重要程度),00:可以丢,11:不能丢 + //末尾5bit为nalu type，固定为28(FU-A) + unsigned char f_nri_flags = (*((unsigned char *) pcData) & 0x60) | 28; + unsigned char s_e_r_flags; bool bFirst = true; bool mark = false; int nOffset = 1; while (!mark) { - if (iLen < nOffset + iSize) { //是否拆分结束 + if (iLen < nOffset + iSize) { + //已经拆分结束 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; + //FU-A end + s_e_r_flags = (1 << 6) | naluType; + } else if (bFirst) { + //FU-A start + s_e_r_flags = (1 << 7) | naluType; } else { - s_e_r_type = s_e_r_Mid + naluType; + //FU-A mid + s_e_r_flags = naluType; } { @@ -272,9 +274,9 @@ void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) { //rtp payload 负载部分 uint8_t *payload = (uint8_t*)rtp->data() + rtp->offset; //FU-A 第1个字节 - memcpy(payload, &f_nri_type, 1); + payload[0] = f_nri_flags; //FU-A 第2个字节 - memcpy(payload + 1, &s_e_r_type, 1); + payload[1] = s_e_r_flags; //H264 数据 memcpy(payload + 2, (unsigned char *) pcData + nOffset, iSize); //输入到rtp环形缓存 diff --git a/src/Extension/H265Rtp.cpp b/src/Extension/H265Rtp.cpp index e5c701b2..0a345e5f 100644 --- a/src/Extension/H265Rtp.cpp +++ b/src/Extension/H265Rtp.cpp @@ -177,7 +177,8 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) { uiStamp %= cycleMS; int maxSize = _ui32MtuSize - 3; - if (iLen > maxSize) { //超过MTU + //超过MTU,按照FU方式打包 + if (iLen > maxSize) { //获取帧头数据，1byte unsigned char s_e_type; bool bFirst = true; @@ -187,10 +188,13 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) { if (iLen < nOffset + maxSize) { //是否拆分结束 maxSize = iLen - nOffset; mark = true; - s_e_type = 1 << 6 | naluType; + //FU end + s_e_type = (1 << 6) | naluType; } else if (bFirst) { - s_e_type = 1 << 7 | naluType; + //FU start + s_e_type = (1 << 7) | naluType; } else { + //FU mid s_e_type = naluType; } @@ -199,11 +203,11 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) { auto rtp = makeRtp(getTrackType(), nullptr, maxSize + 3, mark, uiStamp); //rtp payload 负载部分 uint8_t *payload = (uint8_t*)rtp->data() + rtp->offset; - //FU-A 第1个字节 + //FU 第1个字节，表明为FU payload[0] = 49 << 1; - //FU-A 第2个字节貌似固定为1 + //FU 第2个字节貌似固定为1 payload[1] = 1; - //FU-A 第3个字节 + //FU 第3个字节 payload[2] = s_e_type; //H265 数据 memcpy(payload + 3,pcData + nOffset, maxSize);