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

Merge pull request #99

Browse Source
This commit is contained in:
xiongziliang 2019-09-30 09:13:19 +08:00
parent 39a528cc02
commit c6270aa1f9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MediaFile/HlsMaker.cpp
View File

@ -44,8 +44,8 @@ void HlsMaker::makeIndexFile(bool eof) {
int maxSegmentDuration = 0;
//停止写之后将最后的片段也写进m3u8文件中
if (eof && stampInc > 0) {
_seg_dur_list.push_back(std::make_tuple(stampInc, _last_file_name));
if (eof && _stampInc > 0) {
_seg_dur_list.push_back(std::make_tuple(_stampInc, _last_file_name));
}
for (auto &tp : _seg_dur_list) {
@ -102,12 +102,12 @@ void HlsMaker::delOldFile() {
}
void HlsMaker::addNewFile(uint32_t) {
stampInc = _ticker.elapsedTime();
if (stampInc >= _seg_duration * 1000) {
_stampInc = _ticker.elapsedTime();
if (_stampInc >= _seg_duration * 1000) {
_ticker.resetTime();
auto file_name = onOpenFile(_file_index);
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));
delOldFile();
makeIndexFile();
}

2
src/MediaFile/HlsMaker.h
View File

@ -92,7 +92,7 @@ protected:
protected:
uint32_t _seg_number = 0;
private:
int stampInc = 0;
int _stampInc = 0;
float _seg_duration = 0;
uint64_t _file_index = 0;
Ticker _ticker;