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: Support empty RR, ignore it

Browse source
This commit is contained in:
winlin 2020-08-17 11:30:28 +08:00
parent fd69635052
commit 1800d9d71b
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/kernel/srs_kernel_error.hpp
View file

@ -360,6 +360,7 @@
#define ERROR_RTC_NO_PUBLISHER 5029 #define ERROR_RTC_NO_PUBLISHER 5029
#define ERROR_RTC_DUPLICATED_SSRC 5030 #define ERROR_RTC_DUPLICATED_SSRC 5030
#define ERROR_RTC_NO_TRACK 5031 #define ERROR_RTC_NO_TRACK 5031
#define ERROR_RTC_RTCP_EMPTY_RR 5032
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
// GB28181 API error. // GB28181 API error.

27
trunk/src/kernel/srs_kernel_rtc_rtcp.cpp
View file

@ -69,9 +69,10 @@ int SrsRtcpCommon::size()
srs_error_t SrsRtcpCommon::decode_header(SrsBuffer *buffer) srs_error_t SrsRtcpCommon::decode_header(SrsBuffer *buffer)
{ {
if(! buffer->require(sizeof(SrsRtcpHeader) + 4)) { if (!buffer->require(sizeof(SrsRtcpHeader) + 4)) {
return srs_error_new(ERROR_RTC_RTCP, "require %d", sizeof(SrsRtcpHeader) + 4); return srs_error_new(ERROR_RTC_RTCP, "require %d", sizeof(SrsRtcpHeader) + 4);
} }
buffer->read_bytes((char*)(&header_), sizeof(SrsRtcpHeader)); buffer->read_bytes((char*)(&header_), sizeof(SrsRtcpHeader));
header_.length = ntohs(header_.length); header_.length = ntohs(header_.length);
@ -482,6 +483,7 @@ SrsRtcpRR::SrsRtcpRR(uint32_t sender_ssrc)
header_.version = kRtcpVersion; header_.version = kRtcpVersion;
header_.length = 7; header_.length = 7;
ssrc_ = sender_ssrc; ssrc_ = sender_ssrc;
memset(&rb_, 0, sizeof(SrsRtcpRB));
} }
SrsRtcpRR::~SrsRtcpRR() SrsRtcpRR::~SrsRtcpRR()
@ -608,9 +610,15 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
return srs_error_wrap(err, "decode header"); return srs_error_wrap(err, "decode header");
} }
if(header_.rc < 1) { // @doc https://tools.ietf.org/html/rfc3550#section-6.4.2
return err; // An empty RR packet (RC = 0) MUST be put at the head of a compound
// RTCP packet when there is no data transmission or reception to
// report. e.g. {80 c9 00 01 00 00 00 01}
if(header_.rc == 0) {
return srs_error_new(ERROR_RTC_RTCP_EMPTY_RR, "rc=0");
} }
// TODO: FIXME: Security check for read.
rb_.ssrc = buffer->read_4bytes(); rb_.ssrc = buffer->read_4bytes();
rb_.fraction_lost = buffer->read_1bytes(); rb_.fraction_lost = buffer->read_1bytes();
rb_.lost_packets = buffer->read_3bytes(); rb_.lost_packets = buffer->read_3bytes();
@ -619,6 +627,7 @@ block +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
rb_.lsr = buffer->read_4bytes(); rb_.lsr = buffer->read_4bytes();
rb_.dlsr = buffer->read_4bytes(); rb_.dlsr = buffer->read_4bytes();
// TODO: FIXME: Security check for read.
if(header_.rc > 1) { if(header_.rc > 1) {
char buf[1500]; char buf[1500];
buffer->read_bytes(buf, (header_.rc -1 ) * 24); buffer->read_bytes(buf, (header_.rc -1 ) * 24);
@ -1725,10 +1734,22 @@ srs_error_t SrsRtcpCompound::decode(SrsBuffer *buffer)
} else { } else {
rtcp = new SrsRtcpCommon(); rtcp = new SrsRtcpCommon();
} }
if(srs_success != (err = rtcp->decode(buffer))) { if(srs_success != (err = rtcp->decode(buffer))) {
srs_freep(rtcp); srs_freep(rtcp);
// @doc https://tools.ietf.org/html/rfc3550#section-6.4.2
// An empty RR packet (RC = 0) MUST be put at the head of a compound
// RTCP packet when there is no data transmission or reception to
// report. e.g. {80 c9 00 01 00 00 00 01}
if (ERROR_RTC_RTCP_EMPTY_RR == srs_error_code(err)) {
srs_freep(err);
continue;
}
return srs_error_wrap(err, "decode rtcp type=%u rc=%u", header->type, header->rc); return srs_error_wrap(err, "decode rtcp type=%u rc=%u", header->type, header->rc);
} }
rtcps_.push_back(rtcp); rtcps_.push_back(rtcp);
} }