diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp index a3fcbeaac..1b10a9765 100644 --- a/trunk/src/app/srs_app_ingest.cpp +++ b/trunk/src/app/srs_app_ingest.cpp @@ -62,9 +62,9 @@ string SrsIngesterFFMPEG::uri() return vhost + "/" + id; } -int SrsIngesterFFMPEG::alive() +srs_utime_t SrsIngesterFFMPEG::alive() { - return srsu2msi(srs_get_system_time() - starttime); + return srs_get_system_time() - starttime; } bool SrsIngesterFFMPEG::equals(string v) @@ -454,8 +454,8 @@ void SrsIngester::show_ingest_log_message() // reportable if (pprint->can_print()) { - srs_trace("-> " SRS_CONSTS_LOG_INGESTER " time=%" PRId64 ", ingesters=%d, #%d(alive=%ds, %s)", - pprint->age(), (int)ingesters.size(), index, ingester->alive() / 1000, ingester->uri().c_str()); + srs_trace("-> " SRS_CONSTS_LOG_INGESTER " time=%dms, ingesters=%d, #%d(alive=%dms, %s)", + srsu2msi(pprint->age()), (int)ingesters.size(), index, srsu2msi(ingester->alive()), ingester->uri().c_str()); } } diff --git a/trunk/src/app/srs_app_ingest.hpp b/trunk/src/app/srs_app_ingest.hpp index e8206a143..9e16f6906 100644 --- a/trunk/src/app/srs_app_ingest.hpp +++ b/trunk/src/app/srs_app_ingest.hpp @@ -52,8 +52,8 @@ public: virtual srs_error_t initialize(SrsFFMPEG* ff, std::string v, std::string i); // the ingest uri, [vhost]/[ingest id] virtual std::string uri(); - // the alive in ms. - virtual int alive(); + // the alive in srs_utime_t. + virtual srs_utime_t alive(); virtual bool equals(std::string v, std::string i); virtual bool equals(std::string v); public: diff --git a/trunk/src/app/srs_app_pithy_print.cpp b/trunk/src/app/srs_app_pithy_print.cpp index e87847705..49170707f 100644 --- a/trunk/src/app/srs_app_pithy_print.cpp +++ b/trunk/src/app/srs_app_pithy_print.cpp @@ -224,9 +224,9 @@ bool SrsPithyPrint::can_print() return stage->can_print(); } -int64_t SrsPithyPrint::age() +srs_utime_t SrsPithyPrint::age() { - return srsu2ms(_age); + return _age; } diff --git a/trunk/src/app/srs_app_pithy_print.hpp b/trunk/src/app/srs_app_pithy_print.hpp index ffbfc8b91..ee0f9be52 100644 --- a/trunk/src/app/srs_app_pithy_print.hpp +++ b/trunk/src/app/srs_app_pithy_print.hpp @@ -111,9 +111,9 @@ public: */ virtual bool can_print(); /** - * get the elapsed time in ms. + * get the elapsed time in srs_utime_t. */ - virtual int64_t age(); + virtual srs_utime_t age(); }; #endif