From bc4fa2bc53ab018b112c010f05296deea7aaa253 Mon Sep 17 00:00:00 2001 From: johzzy Date: Mon, 28 Nov 2022 17:52:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(rtcp/bye):=20=E6=94=B6=E5=88=B0rtcp=20bye?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=96=AD=E5=BC=80webrtc=E8=BF=9E=E6=8E=A5=20?= =?UTF-8?q?(#2123)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bye(203) 会在 sender audio track mute 时出现, 不能作为 shutdown 的依据 --- webrtc/WebRtcPusher.cpp | 1 - webrtc/WebRtcTransport.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/webrtc/WebRtcPusher.cpp b/webrtc/WebRtcPusher.cpp index 6efe8698..dbf83c7e 100644 --- a/webrtc/WebRtcPusher.cpp +++ b/webrtc/WebRtcPusher.cpp @@ -160,7 +160,6 @@ void WebRtcPusher::OnDtlsTransportClosed(const RTC::DtlsTransport *dtlsTransport } void WebRtcPusher::onRtcpBye(){ - _push_src = nullptr; WebRtcTransportImp::onRtcpBye(); } diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp index 0ca504ed..fc0612a3 100644 --- a/webrtc/WebRtcTransport.cpp +++ b/webrtc/WebRtcTransport.cpp @@ -794,7 +794,7 @@ void WebRtcTransportImp::onRtcp(const char *buf, size_t len) { _ssrc_to_track.erase(it); } onRtcpBye(); - onShutdown(SockException(Err_eof, "rtcp bye message received")); + // bye 会在 sender audio track mute 时出现, 因此不能作为 shutdown 的依据 break; } case RtcpType::RTCP_PSFB: