amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 04:31:37 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

hls切片以系统时间戳为准

Browse Source
This commit is contained in:
xiongziliang 2019-04-29 11:26:14 +08:00
parent ebfcd86875
commit 5979752fa1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MediaFile/HlsMaker.cpp
View File

@ -86,10 +86,10 @@ void HlsMaker::delOldFile() {
} }
} }
void HlsMaker::addNewFile(uint32_t timestamp) { void HlsMaker::addNewFile(uint32_t) {
int stampInc = timestamp - _stamp_last; int stampInc = _ticker.elapsedTime();
if (stampInc >= _seg_duration * 1000) { if (stampInc >= _seg_duration * 1000) {
_stamp_last = timestamp; _ticker.resetTime();
auto file_name = onOpenFile(_file_index); auto file_name = onOpenFile(_file_index);
if (_file_index++ > 0) { if (_file_index++ > 0) {
_seg_dur_list.push_back(std::make_tuple(stampInc, _last_file_name)); _seg_dur_list.push_back(std::make_tuple(stampInc, _last_file_name));

3
src/MediaFile/HlsMaker.h
View File

@ -86,11 +86,10 @@ private:
void addNewFile(uint32_t timestamp); void addNewFile(uint32_t timestamp);
void makeIndexFile(bool eof = false); void makeIndexFile(bool eof = false);
private: private:
string _file_prefix;
float _seg_duration = 0; float _seg_duration = 0;
uint32_t _seg_number = 0; uint32_t _seg_number = 0;
uint64_t _file_index = 0; uint64_t _file_index = 0;
uint32_t _stamp_last = 0; Ticker _ticker;
string _last_file_name; string _last_file_name;
std::deque<tuple<int,string> > _seg_dur_list; std::deque<tuple<int,string> > _seg_dur_list;
}; };