From 1591318792073a4aa2f7a2bfebf0edfc517d097f Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 10 Aug 2020 18:35:32 +0800 Subject: [PATCH] Fix build fail --- trunk/src/app/srs_app_rtc_conn.hpp | 6 ------ trunk/src/kernel/srs_kernel_rtc_rtcp.cpp | 15 +++++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index a711851cf..5b1637c08 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -72,12 +72,6 @@ const uint8_t kRtpFb = 205; const uint8_t kPsFb = 206; const uint8_t kXR = 207; -// @see: https://tools.ietf.org/html/rfc4585#section-6.3 -const uint8_t kPLI = 1; -const uint8_t kSLI = 2; -const uint8_t kRPSI = 3; -const uint8_t kAFB = 15; - enum SrsRtcConnectionStateType { // TODO: FIXME: Should prefixed by enum name. diff --git a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp index ee4201ba3..c11450099 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp @@ -826,11 +826,6 @@ srs_error_t SrsRtcpTWCC::decode(SrsBuffer *buffer) data_ = buffer->head(); nb_data_ = buffer->left(); - uint16_t base_sn_; - uint16_t packet_count_; - int32_t reference_time_; - uint8_t fb_pkt_count_; - if(srs_success != (err = decode_header(buffer))) { return srs_error_wrap(err, "decode header"); } @@ -1470,6 +1465,10 @@ srs_error_t SrsRtcpPli::encode(SrsBuffer *buffer) SrsRtcpSli::SrsRtcpSli(uint32_t sender_ssrc/*= 0*/) { + first_ = 0; + number_ = 0; + picture_ = 0; + header_.padding = 0; header_.type = SrsRtcpType_psfb; header_.rc = kSLI; @@ -1535,6 +1534,11 @@ srs_error_t SrsRtcpSli::encode(SrsBuffer *buffer) SrsRtcpRpsi::SrsRtcpRpsi(uint32_t sender_ssrc/* = 0*/) { + pb_ = 0; + payload_type_ = 0; + native_rpsi_ = NULL; + nb_native_rpsi_ = 0; + header_.padding = 0; header_.type = SrsRtcpType_psfb; header_.rc = kRPSI; @@ -1544,7 +1548,6 @@ SrsRtcpRpsi::SrsRtcpRpsi(uint32_t sender_ssrc/* = 0*/) SrsRtcpRpsi::~SrsRtcpRpsi() { - } srs_error_t SrsRtcpRpsi::decode(SrsBuffer *buffer)