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

Fix pushdelay option

Browse source
This commit is contained in:
Thulinma 2022-02-09 12:15:12 +01:00
parent 82883d39ea
commit 4d1046f72a
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/output/output.cpp
View file

@ -1022,7 +1022,8 @@ namespace Mist{
if (M.getLive() && targetParams.count("pushdelay")){ if (M.getLive() && targetParams.count("pushdelay")){
INFO_MSG("Converting pushdelay syntax into corresponding startunix+realtime options"); INFO_MSG("Converting pushdelay syntax into corresponding startunix+realtime options");
targetParams["startunix"] = std::string("-") + targetParams["pushdelay"]; targetParams["startunix"] = std::string("-") + targetParams["pushdelay"];
targetParams["realtime"] = "1"; targetParams["realtime"] = "1"; //force real-time speed
targetParams["noskip"] = "1"; //disable rate control / skipping forward
} }
if (M.getLive() && (targetParams.count("startunix") || targetParams.count("stopunix"))){ if (M.getLive() && (targetParams.count("startunix") || targetParams.count("stopunix"))){
uint64_t unixStreamBegin = Util::epoch() - endTime()/1000; uint64_t unixStreamBegin = Util::epoch() - endTime()/1000;
@ -1136,8 +1137,9 @@ namespace Mist{
/// Aborts if not live, there is no main track or it has no keyframes. /// Aborts if not live, there is no main track or it has no keyframes.
bool Output::liveSeek(bool rateOnly){ bool Output::liveSeek(bool rateOnly){
if (!realTime){return false;}//Makes no sense when playing in turbo mode if (!realTime){return false;}//Makes no sense when playing in turbo mode
uint64_t seekPos = 0; if (maxSkipAhead == 1){return false;}//A skipAhead of 1 signifies disabling the skipping/rate control system entirely.
if (!meta.getLive()){return false;} if (!meta.getLive()){return false;}
uint64_t seekPos = 0;
size_t mainTrack = getMainSelectedTrack(); size_t mainTrack = getMainSelectedTrack();
if (mainTrack == INVALID_TRACK_ID){return false;} if (mainTrack == INVALID_TRACK_ID){return false;}
uint64_t lMs = meta.getLastms(mainTrack); uint64_t lMs = meta.getLastms(mainTrack);
@ -1296,9 +1298,6 @@ namespace Mist{
return 3; return 3;
} }
if (config->getString("target") == "-"){ if (config->getString("target") == "-"){
parseData = true;
wantRequest = false;
if (!targetParams.count("realtime")){realTime = 0;}
INFO_MSG("Outputting %s to stdout with %s format", streamName.c_str(), INFO_MSG("Outputting %s to stdout with %s format", streamName.c_str(),
capa["name"].asString().c_str()); capa["name"].asString().c_str());
}else{ }else{
@ -1306,12 +1305,18 @@ namespace Mist{
onFail("Could not connect to the target for recording", true); onFail("Could not connect to the target for recording", true);
return 3; return 3;
} }
parseData = true;
wantRequest = false;
if (!targetParams.count("realtime")){realTime = 0;}
INFO_MSG("Recording %s to %s with %s format", streamName.c_str(), INFO_MSG("Recording %s to %s with %s format", streamName.c_str(),
config->getString("target").c_str(), capa["name"].asString().c_str()); config->getString("target").c_str(), capa["name"].asString().c_str());
} }
parseData = true;
wantRequest = false;
if (!targetParams.count("realtime")){
realTime = 0;
}
if (targetParams.count("noskip")){
//Disable rate control systems for pushes; we want real-time speed
maxSkipAhead = 1;
}
} }
// Handle CONN_OPEN trigger, if needed // Handle CONN_OPEN trigger, if needed
if (Triggers::shouldTrigger("CONN_OPEN", streamName)){ if (Triggers::shouldTrigger("CONN_OPEN", streamName)){