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

MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output.

Browse source
This commit is contained in:
Thulinma 2017-06-09 20:31:20 +02:00
parent 7fae3e6739
commit 26f74accdf
8 changed files with 75 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/output/output.cpp
View file

@ -186,7 +186,7 @@ namespace Mist{
return;
}
}else{
if (!Util::startInput(streamName)){
if (!Util::startInput(streamName, "", true, isPushing())){
FAIL_MSG("Opening stream %s failed - aborting initialization", streamName.c_str());
onFail();
return;
@ -224,8 +224,8 @@ namespace Mist{
updateMeta();
selectDefaultTracks();
if (!myMeta.vod && !isReadyForPlay()){
unsigned long long waitUntil = Util::epoch() + 15;
while (!myMeta.vod && !isReadyForPlay()){
unsigned long long waitUntil = Util::epoch() + 30;
while (!myMeta.vod && !isReadyForPlay() && nProxy.userClient.isAlive()){
if (Util::epoch() > waitUntil + 45 || (!selectedTracks.size() && Util::epoch() > waitUntil)){
INFO_MSG("Giving up waiting for playable tracks. Stream: %s, IP: %s", streamName.c_str(), getConnectedHost().c_str());
break;