aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-23 01:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

将hls配置项的segKeep有int类型修改为bool类型。

Browse Source
This commit is contained in:
WuPeng 2022-05-09 21:09:01 +08:00
parent 98816aebad
commit 41faf6ba61
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/config.cpp
View File

@ -262,7 +262,7 @@ const string kDeleteDelaySec = HLS_FIELD"deleteDelaySec";
static onceToken token([](){ static onceToken token([](){
mINI::Instance()[kSegmentDuration] = 2; mINI::Instance()[kSegmentDuration] = 2;
mINI::Instance()[kSegmentNum] = 3; mINI::Instance()[kSegmentNum] = 3;
mINI::Instance()[kSegmentKeep] = 0; mINI::Instance()[kSegmentKeep] = false;
mINI::Instance()[kSegmentRetain] = 5; mINI::Instance()[kSegmentRetain] = 5;
mINI::Instance()[kFileBufSize] = 64 * 1024; mINI::Instance()[kFileBufSize] = 64 * 1024;
mINI::Instance()[kFilePath] = "./www"; mINI::Instance()[kFilePath] = "./www";

6
src/Record/HlsMaker.cpp
View File

@ -14,7 +14,7 @@ using namespace std;
namespace mediakit { namespace mediakit {
HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, uint32_t seg_keep) { HlsMaker::HlsMaker(float seg_duration, uint32_t seg_number, bool seg_keep) {
//最小允许设置为0，0个切片代表点播 //最小允许设置为0，0个切片代表点播
_seg_number = seg_number; _seg_number = seg_number;
_seg_duration = seg_duration; _seg_duration = seg_duration;
@ -106,7 +106,7 @@ void HlsMaker::delOldSegment() {
if (_file_index > _seg_number) { if (_file_index > _seg_number) {
_seg_dur_list.pop_front(); _seg_dur_list.pop_front();
} }
if (_seg_keep == 1) { if (_seg_keep) {
//如果设置为一直保存，就不删除 //如果设置为一直保存，就不删除
return; return;
} }
@ -154,7 +154,7 @@ bool HlsMaker::isLive() {
} }
bool HlsMaker::isKeep() { bool HlsMaker::isKeep() {
return _seg_keep == 1; return _seg_keep;
} }
void HlsMaker::clear() { void HlsMaker::clear() {
_file_index = 0; _file_index = 0;

4
src/Record/HlsMaker.h
View File

@ -28,7 +28,7 @@ public:
* @param seg_number 切片个数 * @param seg_number 切片个数
* @param seg_keep 是否保留切片文件 * @param seg_keep 是否保留切片文件
*/ */
HlsMaker(float seg_duration = 5, uint32_t seg_number = 3, uint32_t seg_keep = 0); HlsMaker(float seg_duration = 5, uint32_t seg_number = 3, bool seg_keep = false);
virtual ~HlsMaker(); virtual ~HlsMaker();
/** /**
@ -113,7 +113,7 @@ private:
private: private:
float _seg_duration = 0; float _seg_duration = 0;
uint32_t _seg_number = 0; uint32_t _seg_number = 0;
uint32_t _seg_keep = 0; bool _seg_keep = false;
uint32_t _last_timestamp = 0; uint32_t _last_timestamp = 0;
uint32_t _last_seg_timestamp = 0; uint32_t _last_seg_timestamp = 0;
uint64_t _file_index = 0; uint64_t _file_index = 0;

2
src/Record/HlsMakerImp.cpp
View File

@ -24,7 +24,7 @@ HlsMakerImp::HlsMakerImp(const string &m3u8_file,
uint32_t bufSize, uint32_t bufSize,
float seg_duration, float seg_duration,
uint32_t seg_number, uint32_t seg_number,
uint32_t seg_keep):HlsMaker(seg_duration, seg_number, seg_keep) { bool seg_keep):HlsMaker(seg_duration, seg_number, seg_keep) {
_poller = EventPollerPool::Instance().getPoller(); _poller = EventPollerPool::Instance().getPoller();
_path_prefix = m3u8_file.substr(0, m3u8_file.rfind('/')); _path_prefix = m3u8_file.substr(0, m3u8_file.rfind('/'));
_path_hls = m3u8_file; _path_hls = m3u8_file;

2
src/Record/HlsMakerImp.h
View File

@ -26,7 +26,7 @@ public:
uint32_t bufSize = 64 * 1024, uint32_t bufSize = 64 * 1024,
float seg_duration = 5, float seg_duration = 5,
uint32_t seg_number = 3, uint32_t seg_number = 3,
uint32_t seg_keep = 0); bool seg_keep = false);
~HlsMakerImp() override; ~HlsMakerImp() override;

2
src/Record/HlsRecorder.h
View File

@ -22,7 +22,7 @@ public:
HlsRecorder(const std::string &m3u8_file, const std::string &params) : MpegMuxer(false) { HlsRecorder(const std::string &m3u8_file, const std::string &params) : MpegMuxer(false) {
GET_CONFIG(uint32_t, hlsNum, Hls::kSegmentNum); GET_CONFIG(uint32_t, hlsNum, Hls::kSegmentNum);
GET_CONFIG(uint32_t, hlsKeep, Hls::kSegmentKeep); GET_CONFIG(bool, hlsKeep, Hls::kSegmentKeep);
GET_CONFIG(uint32_t, hlsBufSize, Hls::kFileBufSize); GET_CONFIG(uint32_t, hlsBufSize, Hls::kFileBufSize);
GET_CONFIG(float, hlsDuration, Hls::kSegmentDuration); GET_CONFIG(float, hlsDuration, Hls::kSegmentDuration);
_hls = std::make_shared<HlsMakerImp>(m3u8_file, params, hlsBufSize, hlsDuration, hlsNum, hlsKeep); _hls = std::make_shared<HlsMakerImp>(m3u8_file, params, hlsBufSize, hlsDuration, hlsNum, hlsKeep);