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

Merge 4.0release

Browse source
This commit is contained in:
winlin 2021-02-10 16:32:30 +08:00
commit 7a96b28735
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -155,6 +155,7 @@ For previous versions, please read:
## V4 changes ## V4 changes
* v4.0, 2021-02-10, RTC: Refine performance about 700+ streams. 4.0.71
* v4.0, 2021-02-08, RTC: Print stat for pli and timer every 5s. 4.0.70 * v4.0, 2021-02-08, RTC: Print stat for pli and timer every 5s. 4.0.70
* v4.0, 2021-02-07, RTC: Parse PT fast and refine udp handler. 4.0.69 * v4.0, 2021-02-07, RTC: Parse PT fast and refine udp handler. 4.0.69
* v4.0, 2021-02-05, RTC: Refine UDP packet peer fast id. 4.0.68 * v4.0, 2021-02-05, RTC: Refine UDP packet peer fast id. 4.0.68

1
trunk/.gitignore vendored
View file

@ -45,6 +45,7 @@ srs
/janus /janus
*.dump *.dump
bug bug
/research/thread-model/thread-local
*.gcp *.gcp
*.svg *.svg

3
trunk/src/app/srs_app_hybrid.cpp
View file

@ -226,7 +226,8 @@ srs_error_t SrsHybridServer::notify(int event, srs_utime_t interval, srs_utime_t
int memory = (int)(u->rss * 4 / 1024); int memory = (int)(u->rss * 4 / 1024);
_srs_pps_cids_get->update(); _srs_pps_cids_set->update(); _srs_pps_cids_get->update(); _srs_pps_cids_set->update();
_srs_pps_timer->update(); _srs_pps_pub->update(); _srs_pps_conn->update(); _srs_pps_dispose->update(); _srs_pps_timer->update(); _srs_pps_pub->update(); _srs_pps_conn->update();
_srs_pps_dispose->update();
srs_trace("Hybrid cpu=%.2f%%,%dMB, cid=%d,%d, timer=%d,%d,%d, free=%d", srs_trace("Hybrid cpu=%.2f%%,%dMB, cid=%d,%d, timer=%d,%d,%d, free=%d",
u->percent * 100, memory, u->percent * 100, memory,

2
trunk/src/core/srs_core_version4.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION4_HPP #ifndef SRS_CORE_VERSION4_HPP
#define SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP
#define SRS_VERSION4_REVISION 70 #define SRS_VERSION4_REVISION 71
#endif #endif