hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added pushdelay option for outward pushes, fixed negative starttime for RTMP output

Browse source
This commit is contained in:
Thulinma 2019-08-22 16:14:27 +02:00
parent 2475955125
commit 2cb20efa7a
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/output/output.cpp
View file

@ -1093,11 +1093,28 @@ namespace Mist{
seekPos = startRec; seekPos = startRec;
} }
}else{ }else{
if (myMeta.live && targetParams.count("pushdelay")){
INFO_MSG("Converting pushdelay syntax into corresponding startunix+realtime options");
targetParams["startunix"] = std::string("-")+targetParams["pushdelay"];
targetParams["realtime"] = "1";
}
if (myMeta.live && (targetParams.count("startunix") || targetParams.count("stopunix"))){ if (myMeta.live && (targetParams.count("startunix") || targetParams.count("stopunix"))){
uint64_t unixStreamBegin = Util::epoch() - (liveTime() / 1000); uint64_t unixStreamBegin = Util::epoch() - (liveTime() / 1000);
if (targetParams.count("startunix")){ if (targetParams.count("startunix")){
long long startUnix = atoll(targetParams["startunix"].c_str()); long long startUnix = atoll(targetParams["startunix"].c_str());
if (startUnix < 0){startUnix += Util::epoch();} if (startUnix < 0){
long long origStartUnix = startUnix;
startUnix += Util::epoch();
if (startUnix < unixStreamBegin){
INFO_MSG("Waiting for stream to reach intended starting point");
while (startUnix < Util::epoch() - (liveTime() / 1000) && keepGoing()){
Util::wait(1000);
updateMeta();
stats();
startUnix = origStartUnix + Util::epoch();
}
}
}
if (startUnix < unixStreamBegin){ if (startUnix < unixStreamBegin){
WARN_MSG("Start time is earlier than stream begin - starting earliest possible"); WARN_MSG("Start time is earlier than stream begin - starting earliest possible");
targetParams["start"] = "-1"; targetParams["start"] = "-1";

5
src/output/output_rtmp.cpp
View file

@ -43,8 +43,9 @@ namespace Mist{
streamOut = streamName; streamOut = streamName;
} }
} }
initialize();
INFO_MSG("About to push stream %s out. Host: %s, port: %d, app: %s, stream: %s", streamName.c_str(), pushUrl.host.c_str(), pushUrl.getPort(), app.c_str(), streamOut.c_str()); INFO_MSG("About to push stream %s out. Host: %s, port: %d, app: %s, stream: %s", streamName.c_str(), pushUrl.host.c_str(), pushUrl.getPort(), app.c_str(), streamOut.c_str());
initialize();
initialSeek();
startPushOut(""); startPushOut("");
}else{ }else{
setBlocking(true); setBlocking(true);
@ -1094,7 +1095,7 @@ namespace Mist{
sendCommand(amfReply, 20, 1); sendCommand(amfReply, 20, 1);
} }
HIGH_MSG("Publish starting"); HIGH_MSG("Publish starting");
realTime = 0; if (!targetParams.count("realtime")){realTime = 0;}
parseData = true; parseData = true;
return; return;
} }