Refine SrsPithyPrint.age or SrsIngesterFFMPEG.alive in time unit.

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)",
+        srs_trace("-> " SRS_CONSTS_LOG_INGESTER " time=%dms, ingesters=%d, #%d(alive=%dms, %s)",
-                  pprint->age(), (int)ingesters.size(), index, ingester->alive() / 1000, ingester->uri().c_str());
+                  srsu2msi(pprint->age()), (int)ingesters.size(), index, srsu2msi(ingester->alive()), ingester->uri().c_str());
     }
 }
 

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.
+    // the alive in srs_utime_t.
-    virtual int alive();
+    virtual srs_utime_t alive();
     virtual bool equals(std::string v, std::string i);
     virtual bool equals(std::string v);
 public:

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;
 }
 
 

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