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 SRS_CONSTS_RTMP_PULSE_TMMS in time unit

Browse source
This commit is contained in:
winlin 2019-04-11 08:43:42 +08:00
parent 695d430dcf
commit 5b0e0d0838
9 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -193,7 +193,7 @@ srs_error_t SrsDynamicHttpConn::do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecod
srs_freep(sdk); srs_freep(sdk);
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t sto = SRS_CONSTS_RTMP_PULSE_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(output, cto, sto); sdk = new SrsSimpleRtmpClient(output, cto, sto);
if ((err = sdk->connect()) != srs_success) { if ((err = sdk->connect()) != srs_success) {

4
trunk/src/app/srs_app_edge.cpp
View file

@ -115,7 +115,7 @@ srs_error_t SrsEdgeRtmpUpstream::connect(SrsRequest* r, SrsLbRoundRobin* lb)
srs_freep(sdk); srs_freep(sdk);
int64_t cto = srsu2ms(SRS_EDGE_INGESTER_TMMS); int64_t cto = srsu2ms(SRS_EDGE_INGESTER_TMMS);
int64_t sto = SRS_CONSTS_RTMP_PULSE_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(url, cto, sto); sdk = new SrsSimpleRtmpClient(url, cto, sto);
if ((err = sdk->connect()) != srs_success) { if ((err = sdk->connect()) != srs_success) {
@ -532,7 +532,7 @@ srs_error_t SrsEdgeForwarder::do_cycle()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
sdk->set_recv_timeout(SRS_CONSTS_RTMP_PULSE_TMMS); sdk->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_PULSE));
SrsPithyPrint* pprint = SrsPithyPrint::create_edge(); SrsPithyPrint* pprint = SrsPithyPrint::create_edge();
SrsAutoFree(SrsPithyPrint, pprint); SrsAutoFree(SrsPithyPrint, pprint);

2
trunk/src/app/srs_app_forward.cpp
View file

@ -241,7 +241,7 @@ srs_error_t SrsForwarder::forward()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
sdk->set_recv_timeout(SRS_CONSTS_RTMP_PULSE_TMMS); sdk->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_PULSE));
SrsPithyPrint* pprint = SrsPithyPrint::create_forwarder(); SrsPithyPrint* pprint = SrsPithyPrint::create_forwarder();
SrsAutoFree(SrsPithyPrint, pprint); SrsAutoFree(SrsPithyPrint, pprint);

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

@ -155,9 +155,9 @@ srs_error_t SrsBufferCache::cycle()
} }
if (count <= 0) { if (count <= 0) {
srs_info("http: sleep %dms for no msg", SRS_CONSTS_RTMP_PULSE_TMMS); srs_info("http: sleep %dms for no msg", srsu2msi(SRS_CONSTS_RTMP_PULSE));
// directly use sleep, donot use consumer wait. // directly use sleep, donot use consumer wait.
srs_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * SRS_UTIME_MILLISECONDS); srs_usleep(SRS_CONSTS_RTMP_PULSE);
// ignore when nothing got. // ignore when nothing got.
continue; continue;
@ -165,7 +165,7 @@ srs_error_t SrsBufferCache::cycle()
if (pprint->can_print()) { if (pprint->can_print()) {
srs_trace("-> " SRS_CONSTS_LOG_HTTP_STREAM_CACHE " http: got %d msgs, age=%d, min=%d, mw=%d", srs_trace("-> " SRS_CONSTS_LOG_HTTP_STREAM_CACHE " http: got %d msgs, age=%d, min=%d, mw=%d",
count, pprint->age(), SRS_PERF_MW_MIN_MSGS, SRS_CONSTS_RTMP_PULSE_TMMS); count, pprint->age(), SRS_PERF_MW_MIN_MSGS, srsu2msi(SRS_CONSTS_RTMP_PULSE));
} }
// free the messages. // free the messages.

2
trunk/src/app/srs_app_mpegts_udp.cpp
View file

@ -616,7 +616,7 @@ srs_error_t SrsMpegtsOverUdp::connect()
} }
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t sto = SRS_CONSTS_RTMP_PULSE_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(output, cto, sto); sdk = new SrsSimpleRtmpClient(output, cto, sto);
if ((err = sdk->connect()) != srs_success) { if ((err = sdk->connect()) != srs_success) {

2
trunk/src/app/srs_app_rtsp.cpp
View file

@ -650,7 +650,7 @@ srs_error_t SrsRtspConn::connect()
// connect host. // connect host.
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t sto = SRS_CONSTS_RTMP_PULSE_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(url, cto, sto); sdk = new SrsSimpleRtmpClient(url, cto, sto);
if ((err = sdk->connect()) != srs_success) { if ((err = sdk->connect()) != srs_success) {

2
trunk/src/app/srs_app_source.cpp
View file

@ -536,7 +536,7 @@ srs_error_t SrsConsumer::dump_packets(SrsMessageArray* msgs, int& count)
void SrsConsumer::wait(int nb_msgs, srs_utime_t msgs_duration) void SrsConsumer::wait(int nb_msgs, srs_utime_t msgs_duration)
{ {
if (paused) { if (paused) {
srs_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000); srs_usleep(SRS_CONSTS_RTMP_PULSE);
return; return;
} }

2
trunk/src/kernel/srs_kernel_consts.hpp
View file

@ -77,7 +77,7 @@
// if timeout, we generally ignore and send the data to client, // if timeout, we generally ignore and send the data to client,
// generally, it's the pulse time for data seding. // generally, it's the pulse time for data seding.
// @remark, recomment to 500ms. // @remark, recomment to 500ms.
#define SRS_CONSTS_RTMP_PULSE_TMMS (500) #define SRS_CONSTS_RTMP_PULSE (500 * SRS_UTIME_MILLISECONDS)
/** /**
* max rtmp header size: * max rtmp header size:

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

@ -1277,7 +1277,7 @@ int SrsIngestHlsOutput::connect()
// connect host. // connect host.
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t sto = SRS_CONSTS_RTMP_PULSE_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsBasicRtmpClient(url, cto, sto); sdk = new SrsBasicRtmpClient(url, cto, sto);
if ((err = sdk->connect()) != srs_success) { if ((err = sdk->connect()) != srs_success) {