From 8e22508057419659325a4c14cef3126e7f3a31e7 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 30 Jul 2020 18:54:16 +0800 Subject: [PATCH] Refine utest --- trunk/src/kernel/srs_kernel_rtc_rtcp.cpp | 60 ++++++++++++------------ trunk/src/kernel/srs_kernel_rtc_rtcp.hpp | 60 ++++++++++++------------ trunk/src/utest/srs_utest.cpp | 2 +- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp index d6aa1eee4..ef51e4ff3 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp @@ -37,7 +37,7 @@ SrsRtcpCommon::~SrsRtcpCommon() { } -const uint8_t SrsRtcpCommon::type() const +uint8_t SrsRtcpCommon::type() const { return header_.type; } @@ -90,27 +90,27 @@ SrsRtcpApp::~SrsRtcpApp() { } -const uint8_t SrsRtcpApp::type() const +uint8_t SrsRtcpApp::type() const { return SrsRtcpType_app; } -const uint32_t SrsRtcpApp::get_ssrc() const +uint32_t SrsRtcpApp::get_ssrc() const { return ssrc_; } -const uint8_t SrsRtcpApp::get_subtype() const +uint8_t SrsRtcpApp::get_subtype() const { return header_.rc; } -const string SrsRtcpApp::get_name() const +string SrsRtcpApp::get_name() const { return string((char*)name_); } -const srs_error_t SrsRtcpApp::get_payload(uint8_t*& payload, int& len) +srs_error_t SrsRtcpApp::get_payload(uint8_t*& payload, int& len) { len = payload_len_; payload = payload_; @@ -213,37 +213,37 @@ SrsRtcpSR::~SrsRtcpSR() { } -const uint8_t SrsRtcpSR::get_rc() const +uint8_t SrsRtcpSR::get_rc() const { return header_.rc; } -const uint8_t SrsRtcpSR::type() const +uint8_t SrsRtcpSR::type() const { return SrsRtcpType_sr; } -const uint32_t SrsRtcpSR::get_sender_ssrc() const +uint32_t SrsRtcpSR::get_sender_ssrc() const { return sender_ssrc_; } -const uint64_t SrsRtcpSR::get_ntp() const +uint64_t SrsRtcpSR::get_ntp() const { return ntp_; } -const uint32_t SrsRtcpSR::get_rtp_ts() const +uint32_t SrsRtcpSR::get_rtp_ts() const { return rtp_ts_; } -const uint32_t SrsRtcpSR::get_rtp_send_packets() const +uint32_t SrsRtcpSR::get_rtp_send_packets() const { return send_rtp_packets_; } -const uint32_t SrsRtcpSR::get_rtp_send_bytes() const +uint32_t SrsRtcpSR::get_rtp_send_bytes() const { return send_rtp_bytes_; } @@ -334,42 +334,42 @@ SrsRtcpRR::~SrsRtcpRR() { } -const uint8_t SrsRtcpRR::type() const +uint8_t SrsRtcpRR::type() const { return SrsRtcpType_rr; } -const uint32_t SrsRtcpRR::get_rb_ssrc() const +uint32_t SrsRtcpRR::get_rb_ssrc() const { return rb_.ssrc; } -const float SrsRtcpRR::get_lost_rate() const +float SrsRtcpRR::get_lost_rate() const { return rb_.fraction_lost / 256; } -const uint32_t SrsRtcpRR::get_lost_packets() const +uint32_t SrsRtcpRR::get_lost_packets() const { return rb_.lost_packets; } -const uint32_t SrsRtcpRR::get_highest_sn() const +uint32_t SrsRtcpRR::get_highest_sn() const { return rb_.highest_sn; } -const uint32_t SrsRtcpRR::get_jitter() const +uint32_t SrsRtcpRR::get_jitter() const { return rb_.jitter; } -const uint32_t SrsRtcpRR::get_lsr() const +uint32_t SrsRtcpRR::get_lsr() const { return rb_.lsr; } -const uint32_t SrsRtcpRR::get_dlsr() const +uint32_t SrsRtcpRR::get_dlsr() const { return rb_.dlsr; } @@ -493,36 +493,36 @@ void SrsRtcpTWCC::clear() recv_sns_.clear(); } -const uint32_t SrsRtcpTWCC::get_media_ssrc() const +uint32_t SrsRtcpTWCC::get_media_ssrc() const { return media_ssrc_; } -const uint16_t SrsRtcpTWCC::get_base_sn() const +uint16_t SrsRtcpTWCC::get_base_sn() const { return base_sn_; } -const uint32_t SrsRtcpTWCC::get_reference_time() const +uint32_t SrsRtcpTWCC::get_reference_time() const { return reference_time_; } -const uint8_t SrsRtcpTWCC::get_feedback_count() const +uint8_t SrsRtcpTWCC::get_feedback_count() const { return fb_pkt_count_; } -const uint16_t SrsRtcpTWCC::get_packet_status_count() const +uint16_t SrsRtcpTWCC::get_packet_status_count() const { return packet_count_; } -const vector SrsRtcpTWCC::get_packet_chucks() const +vector SrsRtcpTWCC::get_packet_chucks() const { return encoded_chucks_; } -const vector SrsRtcpTWCC::get_recv_deltas() const +vector SrsRtcpTWCC::get_recv_deltas() const { return pkt_deltas_; } @@ -887,12 +887,12 @@ SrsRtcpNack::~SrsRtcpNack() { } -const uint32_t SrsRtcpNack::get_media_ssrc() const +uint32_t SrsRtcpNack::get_media_ssrc() const { return media_ssrc_; } -const vector SrsRtcpNack::get_lost_sns() const +vector SrsRtcpNack::get_lost_sns() const { vector sn; for(set::iterator it = lost_sns_.begin(); it != lost_sns_.end(); ++it) { diff --git a/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp index acb04ec24..de311305b 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp @@ -73,7 +73,7 @@ protected: public: SrsRtcpCommon(); virtual ~SrsRtcpCommon(); - virtual const uint8_t type() const; + virtual uint8_t type() const; // interface ISrsCodec public: virtual srs_error_t decode(SrsBuffer *buffer); @@ -93,12 +93,12 @@ public: SrsRtcpApp(); virtual ~SrsRtcpApp(); - virtual const uint8_t type() const; + virtual uint8_t type() const; - const uint32_t get_ssrc() const; - const uint8_t get_subtype() const; - const std::string get_name() const; - const srs_error_t get_payload(uint8_t*& payload, int& len); + uint32_t get_ssrc() const; + uint8_t get_subtype() const; + std::string get_name() const; + srs_error_t get_payload(uint8_t*& payload, int& len); void set_ssrc(uint32_t ssrc); srs_error_t set_subtype(uint8_t type); @@ -134,14 +134,14 @@ public: SrsRtcpSR(); virtual ~SrsRtcpSR(); - const uint8_t get_rc() const; + uint8_t get_rc() const; // overload SrsRtcpCommon - virtual const uint8_t type() const; - const uint32_t get_sender_ssrc() const; - const uint64_t get_ntp() const; - const uint32_t get_rtp_ts() const; - const uint32_t get_rtp_send_packets() const; - const uint32_t get_rtp_send_bytes() const; + virtual uint8_t type() const; + uint32_t get_sender_ssrc() const; + uint64_t get_ntp() const; + uint32_t get_rtp_ts() const; + uint32_t get_rtp_send_packets() const; + uint32_t get_rtp_send_bytes() const; void set_sender_ssrc(uint32_t ssrc); void set_ntp(uint64_t ntp); @@ -165,15 +165,15 @@ public: virtual ~SrsRtcpRR(); // overload SrsRtcpCommon - virtual const uint8_t type() const; + virtual uint8_t type() const; - const uint32_t get_rb_ssrc() const; - const float get_lost_rate() const; - const uint32_t get_lost_packets() const; - const uint32_t get_highest_sn() const; - const uint32_t get_jitter() const; - const uint32_t get_lsr() const; - const uint32_t get_dlsr() const; + uint32_t get_rb_ssrc() const; + float get_lost_rate() const; + uint32_t get_lost_packets() const; + uint32_t get_highest_sn() const; + uint32_t get_jitter() const; + uint32_t get_lsr() const; + uint32_t get_dlsr() const; void set_rb_ssrc(uint32_t ssrc); void set_lost_rate(float rate); @@ -271,13 +271,13 @@ public: SrsRtcpTWCC(uint32_t sender_ssrc = 0); virtual ~SrsRtcpTWCC(); - const uint32_t get_media_ssrc() const; - const uint16_t get_base_sn() const; - const uint16_t get_packet_status_count() const; - const uint32_t get_reference_time() const; - const uint8_t get_feedback_count() const; - const std::vector get_packet_chucks() const; - const std::vector get_recv_deltas() const; + uint32_t get_media_ssrc() const; + uint16_t get_base_sn() const; + uint16_t get_packet_status_count() const; + uint32_t get_reference_time() const; + uint8_t get_feedback_count() const; + std::vector get_packet_chucks() const; + std::vector get_recv_deltas() const; void set_media_ssrc(uint32_t ssrc); void set_base_sn(uint16_t sn); @@ -313,8 +313,8 @@ public: SrsRtcpNack(uint32_t sender_ssrc = 0); virtual ~SrsRtcpNack(); - const uint32_t get_media_ssrc() const; - const std::vector get_lost_sns() const; + uint32_t get_media_ssrc() const; + std::vector get_lost_sns() const; void set_media_ssrc(uint32_t ssrc); void add_lost_sn(uint16_t sn); diff --git a/trunk/src/utest/srs_utest.cpp b/trunk/src/utest/srs_utest.cpp index 20a691a15..286b925e6 100644 --- a/trunk/src/utest/srs_utest.cpp +++ b/trunk/src/utest/srs_utest.cpp @@ -43,7 +43,7 @@ srs_utime_t _srs_tmp_timeout = (100 * SRS_UTIME_MILLISECONDS); ISrsLog* _srs_log = new MockEmptyLog(SrsLogLevelDisabled); ISrsContext* _srs_context = new SrsThreadContext(); // app module. -SrsConfig* _srs_config = NULL; +SrsConfig* _srs_config = new SrsConfig(); SrsServer* _srs_server = NULL; bool _srs_in_docker = false;