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

Refine in time unit. 3.0.49

Browse source
This commit is contained in:
winlin 2019-04-22 08:12:17 +08:00
parent b2f598dede
commit 394cdb5f04
6 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -154,6 +154,8 @@ Please select according to languages:
- [ ] Support H.265 by pushing H.265 over RTMP, deliverying in HLS, read [#465][bug #465]. - [ ] Support H.265 by pushing H.265 over RTMP, deliverying in HLS, read [#465][bug #465].
- [ ] Support HLS+, the HLS edge server, please read [#466][bug #466] and [#468][bug #468]. - [ ] Support HLS+, the HLS edge server, please read [#466][bug #466] and [#468][bug #468].
- [ ] Support UDP protocol such as QUIC or KCP in cluster. - [ ] Support UDP protocol such as QUIC or KCP in cluster.
- [ ] Support H.264+Opus codec for WebRTC.
- [ ] Support publishing stream by WebRTC.
> Remark: About the milestone and product plan, please read ([CN][v1_CN_Product], [EN][v1_EN_Product]) wiki. > Remark: About the milestone and product plan, please read ([CN][v1_CN_Product], [EN][v1_EN_Product]) wiki.
@ -162,6 +164,7 @@ Please select according to languages:
### V3 changes ### V3 changes
* v3.0, 2019-04-22, Refine in time unit. 3.0.49
* v3.0, 2019-04-07, Cover ST Coroutine and time unit. 3.0.48 * v3.0, 2019-04-07, Cover ST Coroutine and time unit. 3.0.48
* v3.0, 2019-04-06, Merge [#1304][bug #1304], Fix ST coroutine pull error. 3.0.47 * v3.0, 2019-04-06, Merge [#1304][bug #1304], Fix ST coroutine pull error. 3.0.47
* v3.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 3.0.46 * v3.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 3.0.46

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

@ -27,7 +27,7 @@
// current release version // current release version
#define VERSION_MAJOR 3 #define VERSION_MAJOR 3
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 48 #define VERSION_REVISION 49
// generated by configure, only macros. // generated by configure, only macros.
#include <srs_auto_headers.hpp> #include <srs_auto_headers.hpp>

2
trunk/src/main/srs_main_server.cpp
View file

@ -341,7 +341,7 @@ void show_macro_features()
#ifdef SRS_PERF_MERGED_READ #ifdef SRS_PERF_MERGED_READ
possible_mr_latency = srsu2msi(SRS_PERF_MR_SLEEP); possible_mr_latency = srsu2msi(SRS_PERF_MR_SLEEP);
#endif #endif
srs_trace("system default latency in ms: mw(0-%d) + mr(0-%d) + play-queue(0-%d)", srs_trace("system default latency(ms): mw(0-%d) + mr(0-%d) + play-queue(0-%d)",
srsu2msi(SRS_PERF_MW_SLEEP), possible_mr_latency, srsu2msi(SRS_PERF_PLAY_QUEUE)); srsu2msi(SRS_PERF_MW_SLEEP), possible_mr_latency, srsu2msi(SRS_PERF_PLAY_QUEUE));
#ifdef SRS_AUTO_MEM_WATCH #ifdef SRS_AUTO_MEM_WATCH

2
trunk/src/protocol/srs_rtmp_msg_array.cpp
View file

@ -39,7 +39,7 @@ SrsMessageArray::~SrsMessageArray()
{ {
// we just free the msgs itself, // we just free the msgs itself,
// both delete and delete[] is ok, // both delete and delete[] is ok,
// for each msg in msgs is already freed by send_and_free_messages. // for all msgs is already freed by send_and_free_messages.
srs_freepa(msgs); srs_freepa(msgs);
} }

2
trunk/src/protocol/srs_rtmp_msg_array.hpp
View file

@ -41,7 +41,7 @@ class SrsMessageArray
{ {
public: public:
/** /**
* when user already send the msg in msgs, please set to NULL, * when user already send all msgs, please set to NULL,
* for instance, msg= msgs.msgs[i], msgs.msgs[i]=NULL, send(msg), * for instance, msg= msgs.msgs[i], msgs.msgs[i]=NULL, send(msg),
* where send(msg) will always send and free it. * where send(msg) will always send and free it.
*/ */

4
trunk/src/utest/srs_utest_protocol.hpp
View file

@ -72,8 +72,8 @@ public:
class MockBufferIO : public ISrsProtocolReadWriter class MockBufferIO : public ISrsProtocolReadWriter
{ {
public: public:
// The send/recv timeout in ms. // The send/recv timeout in srs_utime_t.
int64_t rtm; srs_utime_t rtm;
srs_utime_t stm; srs_utime_t stm;
// The send/recv data in bytes. // The send/recv data in bytes.
int64_t rbytes; int64_t rbytes;