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

Improved incoming push accept timing

Browse source
This commit is contained in:
Thulinma 2022-07-05 15:21:04 +02:00
parent c37aac8898
commit 4084768a3e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/output/output.cpp
View file

@ -2050,7 +2050,7 @@ namespace Mist{
INFO_MSG("Waiting for stream reset before attempting push input accept (%" PRIu64 " <= %" PRIu64 "+500)", twoTime, oneTime); INFO_MSG("Waiting for stream reset before attempting push input accept (%" PRIu64 " <= %" PRIu64 "+500)", twoTime, oneTime);
while (streamStatus != STRMSTAT_OFF && keepGoing()){ while (streamStatus != STRMSTAT_OFF && keepGoing()){
userSelect.clear(); userSelect.clear();
Util::wait(1000); Util::wait(250);
streamStatus = Util::getStreamStatus(streamName); streamStatus = Util::getStreamStatus(streamName);
} }
reconnect(); reconnect();
@ -2059,14 +2059,15 @@ namespace Mist{
while (((streamStatus != STRMSTAT_WAIT && streamStatus != STRMSTAT_READY) || !meta) && keepGoing()){ while (((streamStatus != STRMSTAT_WAIT && streamStatus != STRMSTAT_READY) || !meta) && keepGoing()){
INFO_MSG("Waiting for %s buffer to be ready... (%u)", streamName.c_str(), streamStatus); INFO_MSG("Waiting for %s buffer to be ready... (%u)", streamName.c_str(), streamStatus);
disconnect(); disconnect();
Util::wait(1000);
streamStatus = Util::getStreamStatus(streamName); streamStatus = Util::getStreamStatus(streamName);
if (streamStatus == STRMSTAT_OFF || streamStatus == STRMSTAT_WAIT || streamStatus == STRMSTAT_READY){ if (streamStatus == STRMSTAT_OFF || streamStatus == STRMSTAT_WAIT || streamStatus == STRMSTAT_READY){
INFO_MSG("Reconnecting to %s buffer... (%u)", streamName.c_str(), streamStatus); INFO_MSG("Reconnecting to %s buffer... (%u)", streamName.c_str(), streamStatus);
Util::wait(500);
reconnect(); reconnect();
streamStatus = Util::getStreamStatus(streamName); streamStatus = Util::getStreamStatus(streamName);
} }
if (((streamStatus != STRMSTAT_WAIT && streamStatus != STRMSTAT_READY) || !meta) && keepGoing()){
Util::wait(100);
}
} }
if (streamStatus == STRMSTAT_READY || streamStatus == STRMSTAT_WAIT){reconnect();} if (streamStatus == STRMSTAT_READY || streamStatus == STRMSTAT_WAIT){reconnect();}
if (!meta){ if (!meta){