diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index 3af888282..3911b84bf 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -48,7 +48,7 @@ using namespace std; #include // when edge timeout, retry next. -#define SRS_EDGE_INGESTER_TMMS (5 * SRS_UTIME_MILLISECONDS) +#define SRS_EDGE_INGESTER_TMMS (5 * SRS_UTIME_SECONDS) // when edge error, wait for quit #define SRS_EDGE_FORWARDER_TMMS (150 * SRS_UTIME_MILLISECONDS) @@ -218,7 +218,7 @@ string SrsEdgeIngester::get_curr_origin() } // when error, edge ingester sleep for a while and retry. -#define SRS_EDGE_INGESTER_CIMS (3 * SRS_UTIME_MILLISECONDS) +#define SRS_EDGE_INGESTER_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsEdgeIngester::cycle() { @@ -506,7 +506,7 @@ void SrsEdgeForwarder::stop() } // when error, edge ingester sleep for a while and retry. -#define SRS_EDGE_FORWARDER_CIMS (3 * SRS_UTIME_MILLISECONDS) +#define SRS_EDGE_FORWARDER_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsEdgeForwarder::cycle() { diff --git a/trunk/src/app/srs_app_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp index a1cb485ee..d3d2c9f5f 100644 --- a/trunk/src/app/srs_app_encoder.cpp +++ b/trunk/src/app/srs_app_encoder.cpp @@ -87,7 +87,7 @@ void SrsEncoder::on_unpublish() } // when error, encoder sleep for a while and retry. -#define SRS_RTMP_ENCODER_CIMS (3000 * SRS_UTIME_MILLISECONDS) +#define SRS_RTMP_ENCODER_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsEncoder::cycle() { diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp index c4a30a5e1..7b54d6080 100755 --- a/trunk/src/app/srs_app_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -174,7 +174,7 @@ srs_error_t SrsForwarder::on_video(SrsSharedPtrMessage* shared_video) } // when error, forwarder sleep for a while and retry. -#define SRS_FORWARDER_CIMS (3000 * SRS_UTIME_MILLISECONDS) +#define SRS_FORWARDER_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsForwarder::cycle() { diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index f78400403..6052ca854 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -46,7 +46,7 @@ using namespace std; #define SRS_HTTP_BODY_BUFFER (32 * 1024) // the timeout for hls notify, in ms. -#define SRS_HLS_NOTIFY_TMMS (10 * SRS_UTIME_MILLISECONDS) +#define SRS_HLS_NOTIFY_TMMS (10 * SRS_UTIME_SECONDS) SrsHttpHooks::SrsHttpHooks() { diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp index 3518cb789..a3fcbeaac 100644 --- a/trunk/src/app/srs_app_ingest.cpp +++ b/trunk/src/app/srs_app_ingest.cpp @@ -168,7 +168,7 @@ void SrsIngester::fast_stop() // when error, ingester sleep for a while and retry. // ingest never sleep a long time, for we must start the stream ASAP. -#define SRS_AUTO_INGESTER_CIMS (3000 * SRS_UTIME_MILLISECONDS) +#define SRS_AUTO_INGESTER_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsIngester::cycle() { diff --git a/trunk/src/app/srs_app_kafka.cpp b/trunk/src/app/srs_app_kafka.cpp index 2e656b69c..6ce886dc9 100644 --- a/trunk/src/app/srs_app_kafka.cpp +++ b/trunk/src/app/srs_app_kafka.cpp @@ -485,7 +485,7 @@ srs_error_t SrsKafkaProducer::on_close(int key) return worker->execute(new SrsKafkaMessage(this, key, obj)); } -#define SRS_KAKFA_CIMS (3000 * SRS_UTIME_MILLISECONDS) +#define SRS_KAKFA_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsKafkaProducer::cycle() { diff --git a/trunk/src/app/srs_app_ng_exec.cpp b/trunk/src/app/srs_app_ng_exec.cpp index 585989796..35190480d 100644 --- a/trunk/src/app/srs_app_ng_exec.cpp +++ b/trunk/src/app/srs_app_ng_exec.cpp @@ -76,7 +76,7 @@ void SrsNgExec::on_unpublish() } // when error, ng-exec sleep for a while and retry. -#define SRS_RTMP_EXEC_CIMS (3000 * SRS_UTIME_MILLISECONDS) +#define SRS_RTMP_EXEC_CIMS (3 * SRS_UTIME_SECONDS) srs_error_t SrsNgExec::cycle() { srs_error_t err = srs_success;