Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 19:51:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

HLS切片间隔以数据时间戳为准:#463

Browse Source
This commit is contained in:
xiongziliang
2020-09-12 20:49:00 +08:00
parent 1b9550cfc4
commit 1e1b3794da
3 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/Record/HlsMaker.cpp
View File

@@ -32,27 +32,27 @@ 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;
snprintf(file_content,sizeof(file_content),
"#EXTM3U\n"
"#EXT-X-VERSION:3\n"
"#EXT-X-ALLOW-CACHE:NO\n"
"#EXT-X-TARGETDURATION:%u\n"
"#EXT-X-MEDIA-SEQUENCE:%llu\n",
(maxSegmentDuration + 999) / 1000,
sequence);
snprintf(file_content, sizeof(file_content),
"#EXTM3U\n"
"#EXT-X-VERSION:3\n"
"#EXT-X-ALLOW-CACHE:NO\n"
"#EXT-X-TARGETDURATION:%u\n"
"#EXT-X-MEDIA-SEQUENCE:%llu\n",
(maxSegmentDuration + 999) / 1000,
sequence);
m3u8.assign(file_content);
for (auto &tp : _seg_dur_list) {
snprintf(file_content,sizeof(file_content), "#EXTINF:%.3f,\n%s\n", std::get<0>(tp) / 1000.0, std::get<1>(tp).data());
snprintf(file_content, sizeof(file_content), "#EXTINF:%.3f,\n%s\n", std::get<0>(tp) / 1000.0, std::get<1>(tp).data());
m3u8.append(file_content);
}
if (eof) {
snprintf(file_content,sizeof(file_content),"#EXT-X-ENDLIST\n");
snprintf(file_content, sizeof(file_content), "#EXT-X-ENDLIST\n");
m3u8.append(file_content);
}
onWriteHls(m3u8.data(), m3u8.size());
@@ -61,20 +61,22 @@ void HlsMaker::makeIndexFile(bool eof) {
void HlsMaker::inputData(void *data, uint32_t len, uint32_t timestamp, bool is_idr_fast_packet) {
if (data && len) {
if(is_idr_fast_packet){
if (is_idr_fast_packet) {
//尝试切片ts
addNewSegment(timestamp);
}
onWriteSegment((char *) data, len);
//记录上次写入数据时间
_ticker_last_data.resetTime();
if (!_last_file_name.empty()) {
//存在切片才写入ts数据
onWriteSegment((char *) data, len);
}
} else {
//resetTracks时触发此逻辑
flushLastSegment(true);
flushLastSegment(timestamp, true);
}
}
void HlsMaker::delOldSegment() {
if(_seg_number == 0){
if (_seg_number == 0) {
//如果设置为保留0个切片，则认为是保存为点播
return;
}
@@ -83,35 +85,35 @@ void HlsMaker::delOldSegment() {
_seg_dur_list.pop_front();
}
GET_CONFIG(uint32_t,segRetain,Hls::kSegmentRetain);
GET_CONFIG(uint32_t, segRetain, Hls::kSegmentRetain);
//但是实际保存的切片个数比m3u8所述多若干个,这样做的目的是防止播放器在切片删除前能下载完毕
if (_file_index > _seg_number + segRetain) {
onDelSegment(_file_index - _seg_number - segRetain - 1);
}
}
void HlsMaker::addNewSegment(uint32_t) {
if(!_last_file_name.empty() && _ticker.elapsedTime() < _seg_duration * 1000){
void HlsMaker::addNewSegment(uint32_t stamp) {
if (!_last_file_name.empty() && stamp - _last_seg_timestamp < _seg_duration * 1000) {
//存在上个切片，并且未到分片时间
return;
}
//关闭并保存上一个切片，如果_seg_number==0,那么是点播。
flushLastSegment(_seg_number == 0);
flushLastSegment(stamp, _seg_number == 0);
//新增切片
_last_file_name = onOpenSegment(_file_index++);
//重置切片计时器
_ticker.resetTime();
//记录本次切片的起始时间戳
_last_seg_timestamp = stamp;
}
void HlsMaker::flushLastSegment(bool eof){
if(_last_file_name.empty()){
void HlsMaker::flushLastSegment(uint32_t timestamp, bool eof){
if (_last_file_name.empty()) {
//不存在上个切片
return;
}
//文件创建到最后一次数据写入的时间即为切片长度
auto seg_dur = _ticker.elapsedTime() - _ticker_last_data.elapsedTime();
if(seg_dur <= 0){
auto seg_dur = timestamp - _last_seg_timestamp;
if (seg_dur <= 0) {
seg_dur = 100;
}
_seg_dur_list.push_back(std::make_tuple(seg_dur, _last_file_name));
@@ -124,13 +126,11 @@ bool HlsMaker::isLive() {
return _seg_number != 0;
}
void HlsMaker::clear(){
void HlsMaker::clear() {
_file_index = 0;
_last_seg_timestamp = 0;
_seg_dur_list.clear();
_last_file_name.clear();
_ticker_last_data.resetTime();
_ticker.resetTime();
_file_index = 0;
}
}//namespace mediakit