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

增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等

Browse Source
This commit is contained in:
qiuzhouwei
2020-09-28 10:45:59 +08:00
parent bae52db6ba
commit 4132df89cd
5 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/FFmpegSource.cpp
View File

@@ -198,7 +198,8 @@ void FFmpegSource::startTimer(int timeout_ms) {
//同步查找流
if (!src) {
//流不在线，重新拉流
if(strongSelf->_replay_ticker.elapsedTime() > 10 * 1000){
//@子悦，这里原先是10秒超时，实际发现10秒不够，我改成20秒了
if(strongSelf->_replay_ticker.elapsedTime() > 20 * 1000){
//上次重试时间超过10秒，那么再重试FFmpeg拉流
strongSelf->_replay_ticker.resetTime();
strongSelf->play(strongSelf->_src_url, strongSelf->_dst_url, timeout_ms, [](const SockException &) {});