From 0131472ae5bb3684c55b646808cd5fe683ed11ec Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 24 Jul 2020 09:25:30 +0800 Subject: [PATCH] RTC: Rename connection stat --- trunk/src/app/srs_app_rtc_conn.cpp | 8 ++++---- trunk/src/app/srs_app_rtc_conn.hpp | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index e05ec1dd6..b82461c95 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1493,7 +1493,7 @@ void SrsRtcPublishStream::update_send_report_time(uint32_t ssrc, const SrsNtp& n } } -SrsRtcConnectionStat::SrsRtcConnectionStat() +SrsRtcConnectionStatistic::SrsRtcConnectionStatistic() { dead = born = srs_get_system_time(); nn_publishers = nn_subscribers = 0; @@ -1503,11 +1503,11 @@ SrsRtcConnectionStat::SrsRtcConnectionStat() nn_out_twcc = nn_out_rtp = nn_out_audios = nn_out_videos = 0; } -SrsRtcConnectionStat::~SrsRtcConnectionStat() +SrsRtcConnectionStatistic::~SrsRtcConnectionStatistic() { } -string SrsRtcConnectionStat::summary() +string SrsRtcConnectionStatistic::summary() { dead = srs_get_system_time(); @@ -1544,7 +1544,7 @@ SrsRtcConnection::SrsRtcConnection(SrsRtcServer* s, SrsContextId context_id) is_publisher_ = false; encrypt = true; cid = context_id; - stat_ = new SrsRtcConnectionStat(); + stat_ = new SrsRtcConnectionStatistic(); source_ = NULL; publisher_ = NULL; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index de451ab7a..cb1d1c659 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -289,21 +289,19 @@ private: }; // The statistics for RTC connection. -class SrsRtcConnectionStat +class SrsRtcConnectionStatistic { public: - int nn_publishers; - int nn_subscribers; - int nn_rr; int nn_xr; - int nn_sr; int nn_nack; int nn_pli; + int nn_publishers; int nn_subscribers; + int nn_rr; int nn_xr; int nn_sr; int nn_nack; int nn_pli; uint64_t nn_in_twcc; uint64_t nn_in_rtp; uint64_t nn_in_audios; uint64_t nn_in_videos; uint64_t nn_out_twcc; uint64_t nn_out_rtp; uint64_t nn_out_audios; uint64_t nn_out_videos; private: srs_utime_t born; srs_utime_t dead; public: - SrsRtcConnectionStat(); - virtual ~SrsRtcConnectionStat(); + SrsRtcConnectionStatistic(); + virtual ~SrsRtcConnectionStatistic(); public: std::string summary(); }; @@ -316,7 +314,7 @@ class SrsRtcConnection friend class SrsRtcPublishStream; public: bool disposing_; - SrsRtcConnectionStat* stat_; + SrsRtcConnectionStatistic* stat_; private: SrsRtcServer* server_; SrsRtcConnectionStateType state_;