From eb0667ba08f23cb4c9549893b2304001ca3d3be9 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 19 May 2020 20:47:01 +0800 Subject: [PATCH] RTC: Fix build failed --- trunk/src/app/srs_app_rtc_api.cpp | 2 +- trunk/src/kernel/srs_kernel_rtc_rtp.hpp | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_api.cpp b/trunk/src/app/srs_app_rtc_api.cpp index d20c8ec99..c690f597f 100644 --- a/trunk/src/app/srs_app_rtc_api.cpp +++ b/trunk/src/app/srs_app_rtc_api.cpp @@ -386,7 +386,7 @@ srs_error_t SrsGoApiRtcPlay::exchange_sdp(SrsRequest* req, const SrsSdp& remote_ SrsSSRCInfo ssrc_info; ssrc_info.ssrc_ = ++ssrc_num; // TODO:use formated cname - ssrc_info.cname_ = "test_sdp_cname"; + ssrc_info.cname_ = "stream"; local_media_desc.ssrc_infos_.push_back(ssrc_info); } } diff --git a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp index 20044c40b..fd9b76e5d 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp @@ -82,19 +82,25 @@ bool srs_seq_is_newer(uint16_t value, uint16_t pre_value); bool srs_seq_is_rollback(uint16_t value, uint16_t pre_value); int32_t srs_seq_distance(uint16_t value, uint16_t pre_value); -enum SrsRtpExtensionType : int { +enum SrsRtpExtensionType +{ kRtpExtensionNone, kRtpExtensionTransportSequenceNumber, kRtpExtensionNumberOfExtensions // Must be the last entity in the enum. }; -struct SrsExtensionInfo { + +struct SrsExtensionInfo +{ SrsRtpExtensionType type; std::string uri; }; + const SrsExtensionInfo kExtensions[] = { {kRtpExtensionTransportSequenceNumber, std::string("http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01")} }; -class SrsRtpHeaderExtensionMap{ + +class SrsRtpHeaderExtensionMap +{ public: static const SrsRtpExtensionType kInvalidType = kRtpExtensionNone; static const int kInvalidId = 0; @@ -109,7 +115,9 @@ private: private: uint8_t ids_[kRtpExtensionNumberOfExtensions]; }; -class SrsRtpHeaderExtension{ + +class SrsRtpHeaderExtension +{ public: bool has_transport_sequence_number; uint16_t transport_sequence_number; @@ -117,6 +125,7 @@ public: SrsRtpHeaderExtension(); virtual ~SrsRtpHeaderExtension(); }; + class SrsRtpHeader { private: