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

修复重复拷贝的bug

Browse Source
This commit is contained in:
xiongziliang 2018-08-20 10:18:04 +08:00
parent 076c45105c
commit 36d1d3aa16
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/RTP/RtpMakerAAC.cpp
View File

@ -82,7 +82,9 @@ inline void RtpMaker_AAC::makeAACRtp(const void *pData, unsigned int uiLen, bool
memcpy(&pucRtp[8], &ts, 4); memcpy(&pucRtp[8], &ts, 4);
//ssrc //ssrc
memcpy(&pucRtp[12], &sc, 4); memcpy(&pucRtp[12], &sc, 4);
//playload
memcpy(&pucRtp[16], pData, uiLen); memcpy(&pucRtp[16], pData, uiLen);
rtppkt.PT = m_ui8PlayloadType; rtppkt.PT = m_ui8PlayloadType;
rtppkt.interleaved = m_ui8Interleaved; rtppkt.interleaved = m_ui8Interleaved;
rtppkt.mark = bMark; rtppkt.mark = bMark;
@ -92,7 +94,7 @@ inline void RtpMaker_AAC::makeAACRtp(const void *pData, unsigned int uiLen, bool
rtppkt.ssrc = m_ui32Ssrc; rtppkt.ssrc = m_ui32Ssrc;
rtppkt.type = TrackAudio; rtppkt.type = TrackAudio;
rtppkt.offset = 16; rtppkt.offset = 16;
memcpy(rtppkt.payload + 16, pData, uiLen);
onMakeRtp(pRtppkt, false); onMakeRtp(pRtppkt, false);
m_ui16Sequence++; m_ui16Sequence++;
} }

4
src/RTP/RtpMakerH264.cpp
View File

@ -99,7 +99,9 @@ inline void RtpMaker_H264::makeH264Rtp(const void* data, unsigned int len, bool
memcpy(&pucRtp[8], &ts, 4); memcpy(&pucRtp[8], &ts, 4);
//ssrc //ssrc
memcpy(&pucRtp[12], &sc, 4); memcpy(&pucRtp[12], &sc, 4);
//playload
memcpy(&pucRtp[16], data, len); memcpy(&pucRtp[16], data, len);
rtppkt.PT = m_ui8PlayloadType; rtppkt.PT = m_ui8PlayloadType;
rtppkt.interleaved = m_ui8Interleaved; rtppkt.interleaved = m_ui8Interleaved;
rtppkt.mark = mark; rtppkt.mark = mark;
@ -109,7 +111,7 @@ inline void RtpMaker_H264::makeH264Rtp(const void* data, unsigned int len, bool
rtppkt.ssrc = m_ui32Ssrc; rtppkt.ssrc = m_ui32Ssrc;
rtppkt.type = TrackVideo; rtppkt.type = TrackVideo;
rtppkt.offset = 16; rtppkt.offset = 16;
memcpy(rtppkt.payload + 16, data, len);
uint8_t type = ((uint8_t *) (data))[0] & 0x1F; uint8_t type = ((uint8_t *) (data))[0] & 0x1F;
onMakeRtp(pRtppkt, type == 5); onMakeRtp(pRtppkt, type == 5);
m_ui16Sequence++; m_ui16Sequence++;