Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-15 20:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加断流重连是否接着前一次继续写;修复断流重连成功后hls时间戳错误问题

Browse Source
This commit is contained in:
Weiwei.Zhou
2019-10-11 16:51:10 +08:00
parent 7d76a3eb9b
commit d6e60e0919
14 changed files with 109 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/MediaFile/HlsMaker.cpp
View File

@@ -81,8 +81,18 @@ void HlsMaker::makeIndexFile(bool eof) {
void HlsMaker::inputData(void *data, uint32_t len, uint32_t timestamp) {
addNewFile(timestamp);
onWriteFile((char *) data, len);
//分片数据中断结束
if (data && len) {
addNewFile(timestamp);
onWriteFile((char *) data, len);
}
else {
_noData = true;
_stampInc = _ticker.elapsedTime();
_seg_dur_list.push_back(std::make_tuple(_stampInc, _last_file_name));
delOldFile();
makeIndexFile();
}
}
void HlsMaker::delOldFile() {
@@ -102,6 +112,12 @@ void HlsMaker::delOldFile() {
}
void HlsMaker::addNewFile(uint32_t) {
//上次分片数据中断结束，重置时间避免中途的等待
if (_noData) {
_ticker.resetTime();
_last_file_name = onOpenFile(_file_index++);
_noData = false;
}
_stampInc = _ticker.elapsedTime();
if (_file_index == 0 || _stampInc >= _seg_duration * 1000) {
_ticker.resetTime();