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_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
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);
int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t cto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
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.
srs_freep(sdk);
// TODO: FIXME: Should switch cto with sto?
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);
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);
// TODO: FIXME: Should switch cto with sto?
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);
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;
}
int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t cto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
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
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TMMS);
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TMMS);
rtmp->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
rtmp->set_send_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
if ((err = rtmp->handshake()) != srs_success) {
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.
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TMMS);
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TMMS);
rtmp->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
rtmp->set_send_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
// find a source to serve.
SrsSource* source = NULL;
@ -1183,8 +1183,8 @@ srs_error_t SrsRtmpConn::do_token_traverse_auth(SrsRtmpClient* client)
SrsRequest* req = info->req;
srs_assert(client);
client->set_recv_timeout(SRS_CONSTS_RTMP_TMMS);
client->set_send_timeout(SRS_CONSTS_RTMP_TMMS);
client->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
client->set_send_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
if ((err = client->handshake()) != srs_success) {
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.
int64_t cto = SRS_CONSTS_RTMP_TMMS;
int64_t cto = srsu2ms(SRS_CONSTS_RTMP_TIMEOUT);
int64_t sto = srsu2ms(SRS_CONSTS_RTMP_PULSE);
sdk = new SrsSimpleRtmpClient(url, cto, sto);