external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTC: Fix RTCP feedback bug

Browse source
This commit is contained in:
winlin 2020-08-11 15:42:08 +08:00
parent f702d8bcd7
commit 00582e0c36
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -1167,6 +1167,9 @@ srs_error_t SrsRtcPublishStream::on_rtcp(SrsRtcpCommon* rtcp)
} else if(SrsRtcpType_xr == rtcp->type()) { } else if(SrsRtcpType_xr == rtcp->type()) {
SrsRtcpXr* xr = dynamic_cast<SrsRtcpXr*>(rtcp); SrsRtcpXr* xr = dynamic_cast<SrsRtcpXr*>(rtcp);
return on_rtcp_xr(xr); return on_rtcp_xr(xr);
} else if(SrsRtcpType_sdes == rtcp->type()) {
//ignore RTCP SDES
return srs_success;
} else { } else {
return srs_error_new(ERROR_RTC_RTCP_CHECK, "unknown rtcp type=%u", rtcp->type()); return srs_error_new(ERROR_RTC_RTCP_CHECK, "unknown rtcp type=%u", rtcp->type());
} }
@ -1798,13 +1801,18 @@ srs_error_t SrsRtcConnection::dispatch_rtcp(SrsRtcpCommon* rtcp)
} }
} else if(15 == rtcp->get_rc()) { } else if(15 == rtcp->get_rc()) {
// twcc // twcc
if(srs_success != (err = on_rtcp_feedback(rtcp->data(), rtcp->size()))) { if(srs_success != (err = on_rtcp_feedback_twcc(rtcp->data(), rtcp->size()))) {
return srs_error_wrap(err, "handle twcc feedback"); return srs_error_wrap(err, "handle twcc feedback");
} }
} }
} else if(SrsRtcpType_psfb == rtcp->type()) { } else if(SrsRtcpType_psfb == rtcp->type()) {
SrsRtcpPsfbCommon* psfb = dynamic_cast<SrsRtcpPsfbCommon*>(rtcp); SrsRtcpPsfbCommon* psfb = dynamic_cast<SrsRtcpPsfbCommon*>(rtcp);
srs_assert(psfb != NULL); srs_assert(psfb != NULL);
//TODO: user const to replace 15
if(15 == psfb->get_rc()) {
return on_rtcp_feedback_remb(psfb);
}
it_player = players_ssrc_map_.find(psfb->get_media_ssrc()); it_player = players_ssrc_map_.find(psfb->get_media_ssrc());
if(players_ssrc_map_.end() == it_player) { if(players_ssrc_map_.end() == it_player) {
srs_warn("psfb: ssrc %d is unknown", psfb->get_media_ssrc()); srs_warn("psfb: ssrc %d is unknown", psfb->get_media_ssrc());
@ -1838,11 +1846,17 @@ srs_error_t SrsRtcConnection::dispatch_rtcp(SrsRtcpCommon* rtcp)
return err; return err;
} }
srs_error_t SrsRtcConnection::on_rtcp_feedback(char* data, int nb_data) srs_error_t SrsRtcConnection::on_rtcp_feedback_twcc(char* data, int nb_data)
{ {
return srs_success; return srs_success;
} }
srs_error_t SrsRtcConnection::on_rtcp_feedback_remb(SrsRtcpPsfbCommon *rtcp)
{
//ignore REMB
return srs_success;
}
void SrsRtcConnection::set_hijacker(ISrsRtcConnectionHijacker* h) void SrsRtcConnection::set_hijacker(ISrsRtcConnectionHijacker* h)
{ {
hijacker_ = h; hijacker_ = h;

3
trunk/src/app/srs_app_rtc_conn.hpp
View file

@ -448,7 +448,8 @@ public:
private: private:
srs_error_t dispatch_rtcp(SrsRtcpCommon* rtcp); srs_error_t dispatch_rtcp(SrsRtcpCommon* rtcp);
public: public:
srs_error_t on_rtcp_feedback(char* buf, int nb_buf); srs_error_t on_rtcp_feedback_twcc(char* buf, int nb_buf);
srs_error_t on_rtcp_feedback_remb(SrsRtcpPsfbCommon *rtcp);
void set_hijacker(ISrsRtcConnectionHijacker* h); void set_hijacker(ISrsRtcConnectionHijacker* h);
public: public:
srs_error_t on_connection_established(); srs_error_t on_connection_established();