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

增强hls点播功能，每个切片文件夹生成一个m3u8索引文件

Browse Source
This commit is contained in:
xia-chu 2024-10-26 14:26:39 +08:00
parent 5c80c75ed9
commit 30c6f975f1
4 changed files with 63 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
conf/config.ini
View File

@ -139,8 +139,8 @@ listen_ip=::
fileBufSize=65536
#hls最大切片时间
segDur=2
#m3u8索引中,hls保留切片个数(实际保留切片个数大2~3个)
#如果设置为0，则不删除切片，而是保存为点播
#m3u8索引中,hls保留切片个数(实际保留切片个数+segRetain个)
#如果设置为0，则不删除切片且m3u8文件全量记录切片列表
segNum=3
#HLS切片延迟个数，大于0将生成hls_delay.m3u8文件，0则不生成
segDelay=0
@ -150,10 +150,8 @@ segRetain=5
broadcastRecordTs=0
#直播hls文件删除延时，单位秒，issue: #913
deleteDelaySec=10
#是否保留hls文件，此功能部分等效于segNum=0的情况
#不同的是这个保留不会在m3u8文件中体现
#0为不保留，不起作用
#1为保留，则不删除hls文件，如果开启此功能，注意磁盘大小，或者定期手动清理hls文件
#此选项开启后m3u8文件还是表现为直播，但是切片文件会被全部保留为点播用
#segDur设置为0或segKeep设置为1的情况下，每个切片文件夹下会生成一个vod.m3u8文件用于点播该时间段的录像
segKeep=0
#如果设置为1，则第一个切片长度强制设置为1个GOP。当GOP小于segDur，可以提高首屏速度
fastRegister=0

11
src/Record/HlsMaker.cpp
View File

@ -122,9 +122,9 @@ void HlsMaker::inputData(const char *data, size_t len, uint64_t timestamp, bool
void HlsMaker::delOldSegment() {
GET_CONFIG(uint32_t, segDelay, Hls::kSegmentDelay);
if (_seg_number == 0) {
// 如果设置为保留0个切片，则认为是保存为点播 [AUTO-TRANSLATED:5bf20108]
// If set to keep 0 slices, it is considered to be saved as on-demand
if (_seg_number == 0 || _seg_keep) {
// 如果设置为保留0个切片，则认为是保存为点播；或者设置为一直保存，就不删除 [AUTO-TRANSLATED:5bf20108]
// If set to keep 0 or all slices, it is considered to be saved as on-demand
return;
}
// 在hls m3u8索引文件中,我们保存的切片个数跟_seg_number相关设置一致 [AUTO-TRANSLATED:b14b5b98]
@ -132,11 +132,6 @@ void HlsMaker::delOldSegment() {
if (_file_index > _seg_number + segDelay) {
_seg_dur_list.pop_front();
}
// 如果设置为一直保存，就不删除 [AUTO-TRANSLATED:7c622e24]
// If set to always save, it will not be deleted
if (_seg_keep) {
return;
}
GET_CONFIG(uint32_t, segRetain, Hls::kSegmentRetain);
// 但是实际保存的切片个数比m3u8所述多若干个,这样做的目的是防止播放器在切片删除前能下载完毕 [AUTO-TRANSLATED:1688f857]
// However, the actual number of slices saved is a few more than what is stated in the m3u8, this is done to prevent the player from downloading the slices before they are deleted

60
src/Record/HlsMakerImp.cpp
View File

@ -105,11 +105,54 @@ string HlsMakerImp::onOpenSegment(uint64_t index) {
auto strDate = getTimeStr("%Y-%m-%d");
auto strHour = getTimeStr("%H");
auto strTime = getTimeStr("%M-%S");
segment_name = StrPrinter << strDate + "/" + strHour + "/" + strTime << "_" << index << (isFmp4() ? ".mp4" : ".ts");
auto current_dir = strDate + "/" + strHour + "/";
segment_name = current_dir + strTime + "_" + std::to_string(index) + (isFmp4() ? ".mp4" : ".ts");
segment_path = _path_prefix + "/" + segment_name;
if (isLive()) {
// 直播
_segment_file_paths.emplace(index, segment_path);
}
if (!isLive() || isKeep()) {
// 目录将发生变更，保留ts切片时，每个目录都生成一个m3u8文件
if (!_current_dir.empty() && current_dir != _current_dir) {
/** 写入该目录的init.mp4文件以及m3u8文件 **/
if (isFmp4()) {
// 写入init.mp4文件
File::saveFile(_current_dir_init_file, _path_prefix + "/" + _current_dir + "init.mp4");
}
int maxSegmentDuration = 0;
for (auto &tp : _current_dir_seg_list) {
int dur = std::get<0>(tp);
if (dur > maxSegmentDuration) {
maxSegmentDuration = dur;
}
}
string index_str;
index_str.reserve(2048);
index_str += "#EXTM3U\n";
index_str += (isFmp4() ? "#EXT-X-VERSION:7\n" : "#EXT-X-VERSION:4\n");
index_str += "#EXT-X-ALLOW-CACHE:YES\n";
index_str += "#EXT-X-TARGETDURATION:" + std::to_string((maxSegmentDuration + 999) / 1000) + "\n";
index_str += "#EXT-X-MEDIA-SEQUENCE:0\n";
if (isFmp4()) {
index_str += "#EXT-X-MAP:URI=\"init.mp4\"\n";
}
stringstream ss;
for (auto &t : _current_dir_seg_list) {
ss << "#EXTINF:" << std::setprecision(3) << std::get<0>(t) / 1000.0 << ",\n" << std::get<1>(t) << "\n";
}
_current_dir_seg_list.clear();
index_str += ss.str();
index_str += "#EXT-X-ENDLIST\n";
/** 写入该目录的m3u8文件 **/
File::saveFile(index_str, _path_prefix + "/" + _current_dir + (isFmp4() ? "vod.fmp4.m3u8" : "vod.m3u8"));
}
_current_dir = std::move(current_dir);
}
}
_file = makeFile(segment_path, true);
@ -139,13 +182,14 @@ void HlsMakerImp::onDelSegment(uint64_t index) {
}
void HlsMakerImp::onWriteInitSegment(const char *data, size_t len) {
if (!isLive() || isKeep()) {
_current_dir_init_file.assign(data, len);
}
string init_seg_path = _path_prefix + "/init.mp4";
_file = makeFile(init_seg_path);
if (_file) {
fwrite(data, len, 1, _file.get());
auto file = makeFile(init_seg_path);
if (file) {
fwrite(data, len, 1, file.get());
_path_init = std::move(init_seg_path);
_file = nullptr;
} else {
WarnL << "Create file failed," << init_seg_path << " " << get_uv_errmsg();
}
@ -178,7 +222,9 @@ void HlsMakerImp::onFlushLastSegment(uint64_t duration_ms) {
// 关闭并flush文件到磁盘 [AUTO-TRANSLATED:9798ec4d]
// Close and flush file to disk
_file = nullptr;
if (!isLive() || isKeep()) {
_current_dir_seg_list.emplace_back(duration_ms, _info.file_name.erase(0, _current_dir.size()));
}
GET_CONFIG(bool, broadcastRecordTs, Hls::kBroadcastRecordTs);
if (broadcastRecordTs) {
_info.time_len = duration_ms / 1000.0f;

3
src/Record/HlsMakerImp.h
View File

@ -71,12 +71,15 @@ private:
std::string _path_hls_delay;
std::string _path_init;
std::string _path_prefix;
std::string _current_dir;
std::string _current_dir_init_file;
RecordInfo _info;
std::shared_ptr<FILE> _file;
std::shared_ptr<char> _file_buf;
HlsMediaSource::Ptr _media_src;
toolkit::EventPoller::Ptr _poller;
std::map<uint64_t/*index*/,std::string/*file_path*/> _segment_file_paths;
std::deque<std::tuple<int,std::string> > _current_dir_seg_list;
};
}//namespace mediakit