vlc | branch: master | Steve Lhomme <[email protected]> | Mon Jun 11 14:21:58 2018 +0200| [3bbee120beb711275bbec7be326e5df604e931ef] | committer: Steve Lhomme
demux:adaptive: use SEC_FROM_VLC_TICK() for more explicit conversion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3bbee120beb711275bbec7be326e5df604e931ef --- modules/demux/adaptive/tools/Conversions.cpp | 2 +- modules/demux/dash/DASHManager.cpp | 2 +- modules/demux/dash/mpd/MPD.cpp | 2 +- modules/demux/hls/playlist/Representation.cpp | 2 +- modules/demux/smooth/SmoothManager.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/demux/adaptive/tools/Conversions.cpp b/modules/demux/adaptive/tools/Conversions.cpp index f6478c5e91..698ca849aa 100644 --- a/modules/demux/adaptive/tools/Conversions.cpp +++ b/modules/demux/adaptive/tools/Conversions.cpp @@ -171,7 +171,7 @@ UTCTime::UTCTime(const std::string &str) time_t UTCTime::time() const { - return t / CLOCK_FREQ; + return SEC_FROM_VLC_TICK(t); } vlc_tick_t UTCTime::mtime() const diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp index e9f619df81..3dcf786af8 100644 --- a/modules/demux/dash/DASHManager.cpp +++ b/modules/demux/dash/DASHManager.cpp @@ -82,7 +82,7 @@ void DASHManager::scheduleNextUpdate() minbuffer = std::max(minbuffer, VLC_TICK_FROM_SEC(5)); - nextPlaylistupdate = now + minbuffer / CLOCK_FREQ; + nextPlaylistupdate = now + SEC_FROM_VLC_TICK(minbuffer); msg_Dbg(p_demux, "Updated MPD, next update in %" PRId64 "s", (int64_t) nextPlaylistupdate - now ); } diff --git a/modules/demux/dash/mpd/MPD.cpp b/modules/demux/dash/mpd/MPD.cpp index accd752138..091764f413 100644 --- a/modules/demux/dash/mpd/MPD.cpp +++ b/modules/demux/dash/mpd/MPD.cpp @@ -70,7 +70,7 @@ void MPD::debug() msg_Dbg(p_object, "MPD profile=%s mediaPresentationDuration=%" PRId64 " minBufferTime=%" PRId64, static_cast<std::string>(getProfile()).c_str(), - duration.Get() / CLOCK_FREQ, + SEC_FROM_VLC_TICK(duration.Get()), minBufferTime); msg_Dbg(p_object, "BaseUrl=%s", getUrlSegment().toString().c_str()); diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp index 013078e427..61be13da57 100644 --- a/modules/demux/hls/playlist/Representation.cpp +++ b/modules/demux/hls/playlist/Representation.cpp @@ -124,7 +124,7 @@ void Representation::scheduleNextUpdate(uint64_t number) minbuffer /= 2; } - nextUpdateTime = now + minbuffer / CLOCK_FREQ; + nextUpdateTime = now + SEC_FROM_VLC_TICK(minbuffer); msg_Dbg(playlist->getVLCObject(), "Updated playlist ID %s, next update in %" PRId64 "s", getID().str().c_str(), (int64_t) nextUpdateTime - now); diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp index b933083264..abb13d493d 100644 --- a/modules/demux/smooth/SmoothManager.cpp +++ b/modules/demux/smooth/SmoothManager.cpp @@ -137,7 +137,7 @@ void SmoothManager::scheduleNextUpdate() minbuffer = std::max(minbuffer, VLC_TICK_FROM_SEC(5)); - nextPlaylistupdate = now + minbuffer / CLOCK_FREQ; + nextPlaylistupdate = now + SEC_FROM_VLC_TICK(minbuffer); msg_Dbg(p_demux, "Updated playlist, next update in %" PRId64 "s", (int64_t) nextPlaylistupdate - now ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
