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

Stat: Refine stat bug for timer

Browse source
This commit is contained in:
winlin 2021-02-19 19:12:40 +08:00
parent 5b8eea8cc5
commit 3a83a74dfc
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -1434,11 +1434,15 @@ srs_error_t SrsRtcPublishStream::notify(int type, srs_utime_t interval, srs_utim
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
++_srs_pps_pub->sugar;
if (!is_started) { if (!is_started) {
return err; return err;
} }
if (type == SRS_TICKID_RTCP) { if (type == SRS_TICKID_RTCP) {
++_srs_pps_rr->sugar;
if ((err = send_rtcp_rr()) != srs_success) { if ((err = send_rtcp_rr()) != srs_success) {
srs_warn("RR err %s", srs_error_desc(err).c_str()); srs_warn("RR err %s", srs_error_desc(err).c_str());
srs_freep(err); srs_freep(err);
@ -1451,6 +1455,8 @@ srs_error_t SrsRtcPublishStream::notify(int type, srs_utime_t interval, srs_utim
} }
if (twcc_enabled_ && type == SRS_TICKID_TWCC) { if (twcc_enabled_ && type == SRS_TICKID_TWCC) {
++_srs_pps_twcc->sugar;
// We should not depends on the received packet, // We should not depends on the received packet,
// instead we should send feedback every Nms. // instead we should send feedback every Nms.
if ((err = send_periodic_twcc()) != srs_success) { if ((err = send_periodic_twcc()) != srs_success) {

5
trunk/src/app/srs_app_rtc_server.cpp
View file

@ -57,10 +57,6 @@ extern SrsPps* _srs_pps_pli;
extern SrsPps* _srs_pps_twcc; extern SrsPps* _srs_pps_twcc;
extern SrsPps* _srs_pps_rr; extern SrsPps* _srs_pps_rr;
extern SrsPps* _srs_pps_timer;
extern SrsPps* _srs_pps_pub;
extern SrsPps* _srs_pps_conn;
extern SrsPps* _srs_pps_snack; extern SrsPps* _srs_pps_snack;
extern SrsPps* _srs_pps_snack2; extern SrsPps* _srs_pps_snack2;
extern SrsPps* _srs_pps_sanack; extern SrsPps* _srs_pps_sanack;
@ -666,7 +662,6 @@ srs_error_t SrsRtcServer::notify(int type, srs_utime_t interval, srs_utime_t tic
_srs_pps_pkts->update(); _srs_pps_addrs->update(); _srs_pps_fast_addrs->update(); _srs_pps_pkts->update(); _srs_pps_addrs->update(); _srs_pps_fast_addrs->update();
_srs_pps_ids->update(); _srs_pps_fids->update(); _srs_pps_fids_level0->update(); _srs_pps_ids->update(); _srs_pps_fids->update(); _srs_pps_fids_level0->update();
_srs_pps_pli->update(); _srs_pps_twcc->update(); _srs_pps_rr->update(); _srs_pps_pli->update(); _srs_pps_twcc->update(); _srs_pps_rr->update();
_srs_pps_timer->update(); _srs_pps_pub->update(); _srs_pps_conn->update();
_srs_pps_snack->update(); _srs_pps_snack2->update(); _srs_pps_sanack->update(); _srs_pps_svnack->update(); _srs_pps_snack->update(); _srs_pps_snack2->update(); _srs_pps_sanack->update(); _srs_pps_svnack->update();
_srs_pps_rnack->update(); _srs_pps_rnack2->update(); _srs_pps_rnack->update(); _srs_pps_rnack2->update();