diff --git a/src/MediaFile/HlsMaker.cpp b/src/MediaFile/HlsMaker.cpp index 883252ca..a9b6f045 100644 --- a/src/MediaFile/HlsMaker.cpp +++ b/src/MediaFile/HlsMaker.cpp @@ -86,10 +86,10 @@ void HlsMaker::delOldFile() { } } -void HlsMaker::addNewFile(uint32_t timestamp) { - int stampInc = timestamp - _stamp_last; +void HlsMaker::addNewFile(uint32_t) { + int stampInc = _ticker.elapsedTime(); if (stampInc >= _seg_duration * 1000) { - _stamp_last = timestamp; + _ticker.resetTime(); auto file_name = onOpenFile(_file_index); if (_file_index++ > 0) { _seg_dur_list.push_back(std::make_tuple(stampInc, _last_file_name)); diff --git a/src/MediaFile/HlsMaker.h b/src/MediaFile/HlsMaker.h index a82d9eae..3c772e28 100644 --- a/src/MediaFile/HlsMaker.h +++ b/src/MediaFile/HlsMaker.h @@ -86,11 +86,10 @@ private: void addNewFile(uint32_t timestamp); void makeIndexFile(bool eof = false); private: - string _file_prefix; float _seg_duration = 0; uint32_t _seg_number = 0; uint64_t _file_index = 0; - uint32_t _stamp_last = 0; + Ticker _ticker; string _last_file_name; std::deque > _seg_dur_list; };