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 hls muxer duration in time duration.

Browse source
This commit is contained in:
winlin 2019-04-15 07:47:37 +08:00
parent 41d1e91540
commit 5f3d09c8a0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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());
}

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

@ -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:
/**