From 571f417db4adea1ec3240af42969a4142e89d1d8 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 11 Aug 2020 09:50:17 +0800 Subject: [PATCH] RTC: Refine RTCP packets parsing --- trunk/src/app/srs_app_rtc_conn.cpp | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index 0f28e4db0..0314170f7 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1725,30 +1725,12 @@ srs_error_t SrsRtcConnection::dispatch_rtcp(SrsRtcpCommon* rtcp) { srs_error_t err = srs_success; - if(SrsRtcpType_sr == rtcp->type()) { - return publisher_->on_rtcp(rtcp); - } else if(SrsRtcpType_rr == rtcp->type()) { - SrsRtcpRR* rr = dynamic_cast(rtcp); - if (rr->get_rb_ssrc()) { - return player_->on_rtcp(rtcp); - } - } else if(SrsRtcpType_rtpfb == rtcp->type()) { - if(1 == rtcp->get_rc()) { - //nack - return player_->on_rtcp(rtcp); - } else if(15 == rtcp->get_rc()) { - // twcc - return on_rtcp_feedback(rtcp->data(), rtcp->size()); - } - } else if(SrsRtcpType_psfb == rtcp->type()) { + if (player_) { return player_->on_rtcp(rtcp); - } else { - if (player_) { - return player_->on_rtcp(rtcp); - } - if (publisher_) { - return publisher_->on_rtcp(rtcp); - } + } + + if (publisher_) { + return publisher_->on_rtcp(rtcp); } return err;