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

精简代码

Browse Source
This commit is contained in:
ziyue 2021-06-25 17:10:27 +08:00
parent 423dd454ca
commit 89ef183647
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/WebRtcTransport.cpp
View File

@ -560,9 +560,6 @@ SdpAttrCandidate::Ptr WebRtcTransportImp::getIceCandidate() const{
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
class RtpChannel : public RtpTrackImp { class RtpChannel : public RtpTrackImp {
public:
uint32_t rtp_ssrc;
public: public:
RtpChannel(RtpTrackImp::OnSorted cb, function<void(const FCI_NACK &nack)> on_nack) { RtpChannel(RtpTrackImp::OnSorted cb, function<void(const FCI_NACK &nack)> on_nack) {
setOnSorted(std::move(cb)); setOnSorted(std::move(cb));
@ -585,7 +582,7 @@ public:
Buffer::Ptr createRtcpRR(RtcpHeader *sr, uint32_t ssrc) { Buffer::Ptr createRtcpRR(RtcpHeader *sr, uint32_t ssrc) {
_rtcp_context.onRtcp(sr); _rtcp_context.onRtcp(sr);
return _rtcp_context.createRtcpRR(ssrc, rtp_ssrc); return _rtcp_context.createRtcpRR(ssrc, getSSRC());
} }
private: private:
@ -695,8 +692,6 @@ void WebRtcTransportImp::createRtpChannel(const string &rid, uint32_t ssrc, cons
}, [info, this, ssrc](const FCI_NACK &nack) mutable { }, [info, this, ssrc](const FCI_NACK &nack) mutable {
onSendNack(*info, nack, ssrc); onSendNack(*info, nack, ssrc);
}); });
//rid --> rtp ssrc
ref->rtp_ssrc = ssrc;
InfoL << "create rtp receiver of ssrc:" << ssrc << ", rid:" << rid << ", codec:" << info->plan_rtp->codec; InfoL << "create rtp receiver of ssrc:" << ssrc << ", rid:" << rid << ", codec:" << info->plan_rtp->codec;
} }
@ -756,7 +751,7 @@ void WebRtcTransportImp::onRtp(const char *buf, size_t len) {
//rtx 转换为 rtp //rtx 转换为 rtp
rtp->pt = info->plan_rtp->pt; rtp->pt = info->plan_rtp->pt;
rtp->seq = htons(origin_seq); rtp->seq = htons(origin_seq);
rtp->ssrc = htonl(ref->rtp_ssrc); rtp->ssrc = htonl(ref->getSSRC());
memmove((uint8_t *) buf + 2, buf, payload - (uint8_t *) buf); memmove((uint8_t *) buf + 2, buf, payload - (uint8_t *) buf);
buf += 2; buf += 2;