diff --git a/src/MediaFile/HlsMaker.cpp b/src/MediaFile/HlsMaker.cpp index f58b4f41..a7faa643 100644 --- a/src/MediaFile/HlsMaker.cpp +++ b/src/MediaFile/HlsMaker.cpp @@ -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(); } diff --git a/src/MediaFile/HlsMaker.h b/src/MediaFile/HlsMaker.h index 6b611fba..3e288b73 100644 --- a/src/MediaFile/HlsMaker.h +++ b/src/MediaFile/HlsMaker.h @@ -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;