From c7b0ac984b29324780262050bddfcfc34ac58eda Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Thu, 19 Jul 2018 17:16:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8DZLToolKit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- c_wrapper/src/common.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c_wrapper/src/common.cpp b/c_wrapper/src/common.cpp index a86699ea..59b1096d 100755 --- a/c_wrapper/src/common.cpp +++ b/c_wrapper/src/common.cpp @@ -136,7 +136,7 @@ public: _cb = cb; } virtual ~LogoutChannel(){} - void write(const LogInfo_ptr &logInfo){ + void write(const LogInfoPtr &logInfo){ if (level() > logInfo->_level) { return; } From 3a5bf616fffd0d760bc7f94a88d1937d4dab7a0b Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Mon, 30 Jul 2018 11:58:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drtp=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81csrc=E3=80=81ext=E5=AD=97=E6=AE=B5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RTP/RtpMakerAAC.cpp | 2 +- src/RTP/RtpMakerH264.cpp | 3 ++- src/Rtsp/RtpParser.cpp | 27 ++++++++++++++------------- src/Rtsp/Rtsp.cpp | 4 ++-- src/Rtsp/Rtsp.h | 5 +++-- src/Rtsp/RtspPlayer.cpp | 20 ++++++++++++++++++++ 6 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/RTP/RtpMakerAAC.cpp b/src/RTP/RtpMakerAAC.cpp index b40cc42a..a8af0bb2 100644 --- a/src/RTP/RtpMakerAAC.cpp +++ b/src/RTP/RtpMakerAAC.cpp @@ -91,7 +91,7 @@ inline void RtpMaker_AAC::makeAACRtp(const void *pData, unsigned int uiLen, bool rtppkt.timeStamp = m_ui32TimeStamp; rtppkt.ssrc = m_ui32Ssrc; rtppkt.type = TrackAudio; - + rtppkt.offset = 16; memcpy(rtppkt.payload + 16, pData, uiLen); onMakeRtp(pRtppkt, false); m_ui16Sequence++; diff --git a/src/RTP/RtpMakerH264.cpp b/src/RTP/RtpMakerH264.cpp index 2ca2e5f3..dbbcf41a 100644 --- a/src/RTP/RtpMakerH264.cpp +++ b/src/RTP/RtpMakerH264.cpp @@ -108,8 +108,9 @@ inline void RtpMaker_H264::makeH264Rtp(const void* data, unsigned int len, bool rtppkt.timeStamp = m_ui32TimeStamp; rtppkt.ssrc = m_ui32Ssrc; rtppkt.type = TrackVideo; - uint8_t type = ((uint8_t *) (data))[0] & 0x1F; + rtppkt.offset = 16; memcpy(rtppkt.payload + 16, data, len); + uint8_t type = ((uint8_t *) (data))[0] & 0x1F; onMakeRtp(pRtppkt, type == 5); m_ui16Sequence++; //InfoL< 0 && nal.type < 24) { + if (nal.type >= 0 && nal.type < 24) { //a full frame m_h264frame.data.assign("\x0\x0\x0\x1", 4); - m_h264frame.data.append(frame, length); + m_h264frame.data.append((char *)frame, length); m_h264frame.type = nal.type; m_h264frame.timeStamp = rtppack.timeStamp / 90; m_h264frame.sequence = rtppack.sequence; @@ -139,7 +139,7 @@ inline bool RtpParser::inputVideo(const RtpPacket& rtppack, char tmp = (nal.forbidden_zero_bit << 7 | nal.nal_ref_idc << 5 | fu.type); m_h264frame.data.assign("\x0\x0\x0\x1", 4); m_h264frame.data.push_back(tmp); - m_h264frame.data.append(frame + 2, length - 2); + m_h264frame.data.append((char *)frame + 2, length - 2); m_h264frame.type = fu.type; m_h264frame.timeStamp = rtppack.timeStamp / 90; m_h264frame.sequence = rtppack.sequence; @@ -154,17 +154,17 @@ inline bool RtpParser::inputVideo(const RtpPacket& rtppack, m_h264frame.sequence = rtppack.sequence; if (fu.E == 1) { //FU-A end - m_h264frame.data.append(frame + 2, length - 2); + m_h264frame.data.append((char *)frame + 2, length - 2); m_h264frame.timeStamp = rtppack.timeStamp / 90; _onGetH264(m_h264frame); m_h264frame.data.clear(); return false; } //FU-A mid - m_h264frame.data.append(frame + 2, length - 2); + m_h264frame.data.append((char *)frame + 2, length - 2); return false; } - WarnL << nal.type; + WarnL << nal.type << " " << rtppack.sequence; return false; // 29 FU-B 单NAL单元B模式 // 24 STAP-A 单一时间的组合包 @@ -239,8 +239,8 @@ inline void RtpParser::onGetVideoTrack(const RtspTrack& video) { inline bool RtpParser::inputAudio(const RtpPacket& rtppack, const RtspTrack& track) { - char *frame = (char *) rtppack.payload + 16; - int length = rtppack.length - 16; + char *frame = (char *) rtppack.payload + rtppack.offset; + int length = rtppack.length - rtppack.offset; if (m_adts.aac_frame_length + length - 4 > sizeof(AdtsFrame::data)) { m_adts.aac_frame_length = 7; @@ -271,9 +271,8 @@ inline void RtpParser::_onGetH264(H264Frame& frame) { insertedFrame.timeStamp = frame.timeStamp; insertedFrame.data = m_strPPS; onGetH264(insertedFrame); - } - case 1: //P onGetH264(frame); + } break; case 7: {//SPS m_strSPS = frame.data; @@ -284,8 +283,10 @@ inline void RtpParser::_onGetH264(H264Frame& frame) { } break; case 8://PPS - m_strPPS=frame.data;break; + m_strPPS=frame.data; + break; default: + onGetH264(frame); break; } } diff --git a/src/Rtsp/Rtsp.cpp b/src/Rtsp/Rtsp.cpp index 75b75f8a..1c43379d 100644 --- a/src/Rtsp/Rtsp.cpp +++ b/src/Rtsp/Rtsp.cpp @@ -99,7 +99,7 @@ int parserSDP(const string& sdp, RtspTrack Track[2]) { // parserSDP(str,track); // track[0].inited=true; //}); -bool MakeNalu(char in, NALU &nal) { +bool MakeNalu(uint8_t in, NALU &nal) { nal.forbidden_zero_bit = in >> 7; if (nal.forbidden_zero_bit) { return false; @@ -108,7 +108,7 @@ bool MakeNalu(char in, NALU &nal) { nal.type = in & 0x1f; return true; } -bool MakeFU(char in, FU &fu) { +bool MakeFU(uint8_t in, FU &fu) { fu.S = in >> 7; fu.E = (in >> 6) & 0x01; fu.R = (in >> 5) & 0x01; diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h index 31f29d51..40c2a991 100644 --- a/src/Rtsp/Rtsp.h +++ b/src/Rtsp/Rtsp.h @@ -64,6 +64,7 @@ public: uint16_t sequence; uint32_t ssrc; uint8_t payload[1560]; + uint8_t offset; TrackType type; }; @@ -211,8 +212,8 @@ typedef struct { unsigned type :5; } FU; -bool MakeNalu(char in, NALU &nal) ; -bool MakeFU(char in, FU &fu) ; +bool MakeNalu(uint8_t in, NALU &nal) ; +bool MakeFU(uint8_t in, FU &fu) ; #endif //RTSP_RTSP_H_ diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index 4f89538c..90a5fbbe 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -583,6 +583,12 @@ void RtspPlayer::splitRtp(unsigned char* pucRtp, unsigned int uiLen) { } } + +# define AV_RB16(x) \ + ((((const uint8_t*)(x))[0] << 8) | \ + ((const uint8_t*)(x))[1]) + + bool RtspPlayer::handleOneRtp(int iTrackidx, unsigned char *pucData, unsigned int uiLen) { auto &track = m_aTrackInfo[iTrackidx]; auto pt_ptr=m_pktPool.obtain(); @@ -620,6 +626,20 @@ bool RtspPlayer::handleOneRtp(int iTrackidx, unsigned char *pucData, unsigned in rtppt.payload[1] = rtppt.interleaved; rtppt.payload[2] = (uiLen & 0xFF00) >> 8; rtppt.payload[3] = (uiLen & 0x00FF); + + rtppt.offset = 16; + int csrc = pucData[0] & 0x0f; + int ext = pucData[0] & 0x10; + rtppt.offset += 4 * csrc; + if (ext) { + if(uiLen < rtppt.offset){ + return false; + } + /* calculate the header extension length (stored as number of 32-bit words) */ + ext = (AV_RB16(pucData + rtppt.offset - 2) + 1) << 2; + rtppt.offset += ext; + } + memcpy(rtppt.payload + 4, pucData, uiLen); /////////////////////////////////RTP排序逻辑///////////////////////////////////