From 89ef18364753ceb6226716500d9cd42faf919624 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Fri, 25 Jun 2021 17:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webrtc/WebRtcTransport.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 0d08da17..8015b10b 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -560,9 +560,6 @@ SdpAttrCandidate::Ptr WebRtcTransportImp::getIceCandidate() const{ /////////////////////////////////////////////////////////////////// class RtpChannel : public RtpTrackImp { -public: - uint32_t rtp_ssrc; - public: RtpChannel(RtpTrackImp::OnSorted cb, function on_nack) { setOnSorted(std::move(cb)); @@ -585,7 +582,7 @@ public: Buffer::Ptr createRtcpRR(RtcpHeader *sr, uint32_t ssrc) { _rtcp_context.onRtcp(sr); - return _rtcp_context.createRtcpRR(ssrc, rtp_ssrc); + return _rtcp_context.createRtcpRR(ssrc, getSSRC()); } private: @@ -695,8 +692,6 @@ void WebRtcTransportImp::createRtpChannel(const string &rid, uint32_t ssrc, cons }, [info, this, ssrc](const FCI_NACK &nack) mutable { 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; } @@ -756,7 +751,7 @@ void WebRtcTransportImp::onRtp(const char *buf, size_t len) { //rtx 转换为 rtp rtp->pt = info->plan_rtp->pt; 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); buf += 2;