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

hls 录像支持直播时移 (#1275)

Browse Source 
* hls live record support seek

* 调整代码风格

Co-authored-by: 夏楚 <771730766@qq.com>
This commit is contained in:
xiongguangjie 2021-12-15 16:43:49 +08:00 committed by GitHub
parent 254bc6889e
commit 5bffc98541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Record/HlsMaker.cpp
View File

@ -35,6 +35,17 @@ void HlsMaker::makeIndexFile(bool eof) {
auto sequence = _seg_number ? (_file_index > _seg_number ? _file_index - _seg_number : 0LL) : 0LL; auto sequence = _seg_number ? (_file_index > _seg_number ? _file_index - _seg_number : 0LL) : 0LL;
string m3u8; string m3u8;
if (_seg_number == 0) {
// 录像点播支持时移
snprintf(file_content, sizeof(file_content),
"#EXTM3U\n"
"#EXT-X-PLAYLIST-TYPE:EVENT\n"
"#EXT-X-VERSION:4\n"
"#EXT-X-TARGETDURATION:%u\n"
"#EXT-X-MEDIA-SEQUENCE:%llu\n",
(maxSegmentDuration + 999) / 1000,
sequence);
} else {
snprintf(file_content, sizeof(file_content), snprintf(file_content, sizeof(file_content),
"#EXTM3U\n" "#EXTM3U\n"
"#EXT-X-VERSION:3\n" "#EXT-X-VERSION:3\n"
@ -43,6 +54,7 @@ void HlsMaker::makeIndexFile(bool eof) {
"#EXT-X-MEDIA-SEQUENCE:%llu\n", "#EXT-X-MEDIA-SEQUENCE:%llu\n",
(maxSegmentDuration + 999) / 1000, (maxSegmentDuration + 999) / 1000,
sequence); sequence);
}
m3u8.assign(file_content); m3u8.assign(file_content);
@ -100,7 +112,7 @@ void HlsMaker::addNewSegment(uint32_t stamp) {
} }
//关闭并保存上一个切片，如果_seg_number==0,那么是点播。 //关闭并保存上一个切片，如果_seg_number==0,那么是点播。
flushLastSegment(_seg_number == 0); flushLastSegment(false);
//新增切片 //新增切片
_last_file_name = onOpenSegment(_file_index++); _last_file_name = onOpenSegment(_file_index++);
//记录本次切片的起始时间戳 //记录本次切片的起始时间戳