external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Refine SRS_CONSTS_RTMP_TMMS in time unit

Browse source
This commit is contained in:
winlin 2019-04-11 09:18:20 +08:00
parent 5b0e0d0838
commit 92980a0ca2
10 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,7 +192,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 = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE); int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(output, cto, sto); sdk = new SrsSimpleRtmpClient(output, cto, sto);

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

@ -474,8 +474,9 @@ srs_error_t SrsEdgeForwarder::start()
// open socket. // open socket.
srs_freep(sdk); srs_freep(sdk);
// TODO: FIXME: Should switch cto with sto?
int64_t cto = srsu2ms(SRS_EDGE_FORWARDER_TMMS); int64_t cto = srsu2ms(SRS_EDGE_FORWARDER_TMMS);
int64_t sto = SRS_CONSTS_RTMP_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
sdk = new SrsSimpleRtmpClient(url, cto, sto); sdk = new SrsSimpleRtmpClient(url, cto, sto);
if ((err = sdk->connect()) != srs_success) { if ((err = sdk->connect()) != srs_success) {

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

@ -213,8 +213,9 @@ srs_error_t SrsForwarder::do_cycle()
} }
srs_freep(sdk); srs_freep(sdk);
// TODO: FIXME: Should switch cto with sto?
int64_t cto = srsu2ms(SRS_FORWARDER_CIMS); int64_t cto = srsu2ms(SRS_FORWARDER_CIMS);
int64_t sto = SRS_CONSTS_RTMP_TMMS; int64_t sto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
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_mpegts_udp.cpp
View file

@ -615,7 +615,7 @@ srs_error_t SrsMpegtsOverUdp::connect()
return err; return err;
} }
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE); int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(output, cto, sto); sdk = new SrsSimpleRtmpClient(output, cto, sto);

12
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -166,8 +166,8 @@ srs_error_t SrsRtmpConn::do_cycle()
} }
#endif #endif
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TMMS); rtmp->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TMMS); rtmp->set_send_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
if ((err = rtmp->handshake()) != srs_success) { if ((err = rtmp->handshake()) != srs_success) {
return srs_error_wrap(err, "rtmp handshake"); return srs_error_wrap(err, "rtmp handshake");
@ -498,8 +498,8 @@ srs_error_t SrsRtmpConn::stream_service_cycle()
} }
// client is identified, set the timeout to service timeout. // client is identified, set the timeout to service timeout.
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TMMS); rtmp->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TMMS); rtmp->set_send_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
// find a source to serve. // find a source to serve.
SrsSource* source = NULL; SrsSource* source = NULL;
@ -1183,8 +1183,8 @@ srs_error_t SrsRtmpConn::do_token_traverse_auth(SrsRtmpClient* client)
SrsRequest* req = info->req; SrsRequest* req = info->req;
srs_assert(client); srs_assert(client);
client->set_recv_timeout(SRS_CONSTS_RTMP_TMMS); client->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
client->set_send_timeout(SRS_CONSTS_RTMP_TMMS); client->set_send_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
if ((err = client->handshake()) != srs_success) { if ((err = client->handshake()) != srs_success) {
return srs_error_wrap(err, "rtmp: handshake"); return srs_error_wrap(err, "rtmp: handshake");

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

@ -649,7 +649,7 @@ srs_error_t SrsRtspConn::connect()
} }
// connect host. // connect host.
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE); int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(url, cto, sto); sdk = new SrsSimpleRtmpClient(url, cto, sto);

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

@ -69,9 +69,9 @@
// @see ST_UTIME_NO_TIMEOUT // @see ST_UTIME_NO_TIMEOUT
#define SRS_CONSTS_NO_TMMS ((int64_t) -1LL) #define SRS_CONSTS_NO_TMMS ((int64_t) -1LL)
// the common io timeout, for both recv and send. // the common io timeout, for connect, recv or send.
// TODO: FIXME: use ms for timeout. // TODO: FIXME: Maybe change to larger value, such as 90ms?
#define SRS_CONSTS_RTMP_TMMS (30*1000) #define SRS_CONSTS_RTMP_TIMEOUT (30 * SRS_UTIME_MILLISECONDS)
// the timeout to wait for client control message, // the timeout to wait for client control message,
// if timeout, we generally ignore and send the data to client, // if timeout, we generally ignore and send the data to client,

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

@ -1276,7 +1276,7 @@ int SrsIngestHlsOutput::connect()
srs_trace("connect output=%s", url.c_str()); srs_trace("connect output=%s", url.c_str());
// connect host. // connect host.
int64_t cto = SRS_CONSTS_RTMP_TMMS; int64_t cto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE); int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsBasicRtmpClient(url, cto, sto); sdk = new SrsBasicRtmpClient(url, cto, sto);

1
trunk/src/protocol/srs_rtmp_stack.hpp
View file

@ -307,6 +307,7 @@ public:
* set/get the recv timeout in ms. * set/get the recv timeout in ms.
* if timeout, recv/send message return ERROR_SOCKET_TIMEOUT. * if timeout, recv/send message return ERROR_SOCKET_TIMEOUT.
*/ */
// TODO: FIXME: Refine tm in time unit.
virtual void set_recv_timeout(int64_t tm); virtual void set_recv_timeout(int64_t tm);
virtual int64_t get_recv_timeout(); virtual int64_t get_recv_timeout();
/** /**

1
trunk/src/service/srs_service_st.cpp
View file

@ -104,6 +104,7 @@ srs_thread_t srs_thread_self()
return (srs_thread_t)st_thread_self(); return (srs_thread_t)st_thread_self();
} }
// TODO: FXIME: Refine tm in time unit.
srs_error_t srs_socket_connect(string server, int port, int64_t tm, srs_netfd_t* pstfd) srs_error_t srs_socket_connect(string server, int port, int64_t tm, srs_netfd_t* pstfd)
{ {
st_utime_t timeout = ST_UTIME_NO_TIMEOUT; st_utime_t timeout = ST_UTIME_NO_TIMEOUT;