mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-22 19:00:01 +08:00
修复回复hls生成的bug
This commit is contained in:
parent
f1ed019437
commit
7f203ce9b7
@ -86,9 +86,11 @@ void HlsMaker::inputData(void *data, uint32_t len, uint32_t timestamp) {
|
||||
addNewFile(timestamp);
|
||||
onWriteFile((char *) data, len);
|
||||
} else {
|
||||
//调用resetTracks触发,这个时候生成直播hls被中断,
|
||||
//我们记录为点播,等待下次拉流再恢复为直播。
|
||||
makeIndexFile(true);
|
||||
_noData = true;
|
||||
_stampInc = _ticker.elapsedTime();
|
||||
_seg_dur_list.push_back(std::make_tuple(_stampInc, _last_file_name));
|
||||
delOldFile();
|
||||
makeIndexFile();
|
||||
}
|
||||
}
|
||||
|
||||
@ -109,6 +111,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();
|
||||
|
@ -92,6 +92,7 @@ protected:
|
||||
protected:
|
||||
uint32_t _seg_number = 0;
|
||||
private:
|
||||
bool _noData = false;
|
||||
int _stampInc = 0;
|
||||
float _seg_duration = 0;
|
||||
uint64_t _file_index = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user