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

Browse source
This commit is contained in:
winlin 2019-04-17 08:31:53 +08:00
parent 38bbf6b111
commit d3dc45f357
20 changed files with 45 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,7 @@ srs_error_t SrsBandwidth::do_bandwidth_check(SrsKbpsLimit* limit)
// timeout for a packet.
_rtmp->set_send_timeout(play_sample.duration_ms * 2 * SRS_UTIME_MILLISECONDS);
_rtmp->set_recv_timeout(publish_sample.duration_ms * 2);
_rtmp->set_recv_timeout(publish_sample.duration_ms * 2 * SRS_UTIME_MILLISECONDS);
// start test.
srs_utime_t start_time = srs_update_system_time();

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

@ -144,7 +144,7 @@ void SrsEdgeRtmpUpstream::close()
srs_freep(sdk);
}
void SrsEdgeRtmpUpstream::set_recv_timeout(int64_t tm)
void SrsEdgeRtmpUpstream::set_recv_timeout(srs_utime_t tm)
{
sdk->set_recv_timeout(tm);
}
@ -294,7 +294,7 @@ srs_error_t SrsEdgeIngester::ingest()
SrsAutoFree(SrsPithyPrint, pprint);
// set to larger timeout to read av data from origin.
upstream->set_recv_timeout(srsu2ms(SRS_EDGE_INGESTER_TMMS));
upstream->set_recv_timeout(SRS_EDGE_INGESTER_TMMS);
while (true) {
srs_error_t err = srs_success;
@ -533,7 +533,7 @@ srs_error_t SrsEdgeForwarder::do_cycle()
{
srs_error_t err = srs_success;
sdk->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_PULSE));
sdk->set_recv_timeout(SRS_CONSTS_RTMP_PULSE);
SrsPithyPrint* pprint = SrsPithyPrint::create_edge();
SrsAutoFree(SrsPithyPrint, pprint);

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

@ -86,7 +86,7 @@ public:
virtual srs_error_t decode_message(SrsCommonMessage* msg, SrsPacket** ppacket) = 0;
virtual void close() = 0;
public:
virtual void set_recv_timeout(int64_t tm) = 0;
virtual void set_recv_timeout(srs_utime_t tm) = 0;
virtual void kbps_sample(const char* label, int64_t age) = 0;
};
@ -107,7 +107,7 @@ public:
virtual srs_error_t decode_message(SrsCommonMessage* msg, SrsPacket** ppacket);
virtual void close();
public:
virtual void set_recv_timeout(int64_t tm);
virtual void set_recv_timeout(srs_utime_t tm);
virtual void kbps_sample(const char* label, int64_t age);
};

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

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

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

@ -116,7 +116,7 @@ srs_error_t SrsRecvThread::cycle()
}
// reset the timeout to pulse mode.
rtmp->set_recv_timeout(timeout * 1000);
rtmp->set_recv_timeout(timeout * SRS_UTIME_MILLISECONDS);
pumper->on_stop();

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

@ -166,7 +166,7 @@ srs_error_t SrsRtmpConn::do_cycle()
}
#endif
rtmp->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT);
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT);
if ((err = rtmp->handshake()) != srs_success) {
@ -411,7 +411,7 @@ srs_error_t SrsRtmpConn::service_cycle()
if (srs_error_code(err) == ERROR_CONTROL_REPUBLISH) {
// set timeout to a larger value, wait for encoder to republish.
rtmp->set_send_timeout(SRS_REPUBLISH_RECV_TMMS);
rtmp->set_recv_timeout(srsu2ms(SRS_REPUBLISH_SEND_TMMS));
rtmp->set_recv_timeout(SRS_REPUBLISH_SEND_TMMS);
srs_trace("rtmp: retry for republish");
srs_freep(err);
@ -425,7 +425,7 @@ srs_error_t SrsRtmpConn::service_cycle()
// @see: https://github.com/ossrs/srs/issues/39
// set timeout to a larger value, for user paused.
rtmp->set_recv_timeout(SRS_PAUSED_RECV_TMMS);
rtmp->set_send_timeout(srsu2ms(SRS_PAUSED_SEND_TMMS));
rtmp->set_send_timeout(SRS_PAUSED_SEND_TMMS);
srs_trace("rtmp: retry for close");
srs_freep(err);
@ -498,7 +498,7 @@ srs_error_t SrsRtmpConn::stream_service_cycle()
}
// client is identified, set the timeout to service timeout.
rtmp->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
rtmp->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT);
rtmp->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT);
// find a source to serve.
@ -1183,7 +1183,7 @@ srs_error_t SrsRtmpConn::do_token_traverse_auth(SrsRtmpClient* client)
SrsRequest* req = info->req;
srs_assert(client);
client->set_recv_timeout(srsu2ms(SRS_CONSTS_RTMP_TIMEOUT));
client->set_recv_timeout(SRS_CONSTS_RTMP_TIMEOUT);
client->set_send_timeout(SRS_CONSTS_RTMP_TIMEOUT);
if ((err = client->handshake()) != srs_success) {