diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 72e133ce6..da06432d7 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -252,9 +252,9 @@ string SrsHlsMuxer::ts_url() return current? current->uri:""; } -double SrsHlsMuxer::duration() +srs_utime_t SrsHlsMuxer::duration() { - return current? srsu2ms(current->duration())/1000.0:0; + return current? current->duration():0; } int SrsHlsMuxer::deviation() @@ -838,7 +838,7 @@ string SrsHlsController::ts_url() return muxer->ts_url(); } -double SrsHlsController::duration() +srs_utime_t SrsHlsController::duration() { return muxer->duration(); } @@ -1278,9 +1278,9 @@ void SrsHls::hls_show_mux_log() // the run time is not equals to stream time, // @see: https://github.com/ossrs/srs/issues/81#issuecomment-48100994 // it's ok. - srs_trace("-> " SRS_CONSTS_LOG_HLS " time=%" PRId64 ", sno=%d, ts=%s, dur=%.2f, dva=%dp", + srs_trace("-> " SRS_CONSTS_LOG_HLS " time=%dms, sno=%d, ts=%s, dur=%.2f, dva=%dp", pprint->age(), controller->sequence_no(), controller->ts_url().c_str(), - controller->duration(), controller->deviation()); + srsu2msi(controller->duration()), controller->deviation()); } diff --git a/trunk/src/app/srs_app_hls.hpp b/trunk/src/app/srs_app_hls.hpp index 1a340b16b..f6529b0b7 100644 --- a/trunk/src/app/srs_app_hls.hpp +++ b/trunk/src/app/srs_app_hls.hpp @@ -189,7 +189,7 @@ public: public: virtual int sequence_no(); virtual std::string ts_url(); - virtual double duration(); + virtual srs_utime_t duration(); virtual int deviation(); public: /** @@ -274,7 +274,7 @@ public: virtual void dispose(); virtual int sequence_no(); virtual std::string ts_url(); - virtual double duration(); + virtual srs_utime_t duration(); virtual int deviation(); public: /**