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

Optimized waiting for streams/tracks.

Browse source
This commit is contained in:
Thulinma 2016-06-06 16:30:30 +02:00
parent 326061ca18
commit fcd11f44c4
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/socket.cpp
View file

@ -518,6 +518,7 @@ unsigned int Socket::Connection::iwrite(const void * buffer, int len) {
} }
} }
if (r == 0 && (sock >= 0)) { if (r == 0 && (sock >= 0)) {
DONTEVEN_MSG("Socket closed by remote");
close(); close();
} }
up += r; up += r;
@ -560,6 +561,7 @@ int Socket::Connection::iread(void * buffer, int len, int flags) {
} }
} }
if (r == 0) { if (r == 0) {
DONTEVEN_MSG("Socket closed by remote");
close(); close();
} }
down += r; down += r;

21
src/output/output.cpp
View file

@ -141,7 +141,6 @@ namespace Mist {
onFail(); onFail();
return; return;
} }
selectDefaultTracks();
sought = false; sought = false;
/*LTS-START*/ /*LTS-START*/
if(Triggers::shouldTrigger("CONN_PLAY", streamName)){ if(Triggers::shouldTrigger("CONN_PLAY", streamName)){
@ -213,11 +212,16 @@ namespace Mist {
bool Output::isReadyForPlay() { bool Output::isReadyForPlay() {
if (myMeta.tracks.size()){ if (myMeta.tracks.size()){
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){ if (!selectedTracks.size()){
if (it->second.keys.size() >= 2){ selectDefaultTracks();
return true;
}
} }
if (myMeta.tracks[getMainSelectedTrack()].keys.size() >= 2){
return true;
}else{
HIGH_MSG("NOT READY YET (%lu tracks, %lu = %lu keys)", myMeta.tracks.size(), getMainSelectedTrack(), myMeta.tracks[getMainSelectedTrack()].keys.size());
}
}else{
HIGH_MSG("NOT READY YET (%lu tracks)", myMeta.tracks.size());
} }
return false; return false;
} }
@ -254,10 +258,11 @@ namespace Mist {
} }
stats(true); stats(true);
updateMeta(); updateMeta();
if (myMeta.live && !isReadyForPlay()){ selectDefaultTracks();
if (!myMeta.vod && !isReadyForPlay()){
unsigned long long waitUntil = Util::epoch() + 15; unsigned long long waitUntil = Util::epoch() + 15;
while (!isReadyForPlay()){ while (!myMeta.vod && !isReadyForPlay()){
if (Util::epoch() > waitUntil){ 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()); INFO_MSG("Giving up waiting for playable tracks. Stream: %s, IP: %s", streamName.c_str(), getConnectedHost().c_str());
break; break;
} }

9
src/output/output_rtmp.cpp
View file

@ -158,14 +158,7 @@ namespace Mist {
if (isPushing){ if (isPushing){
return true; return true;
} }
if (myMeta.tracks.size()){ return Output::isReadyForPlay();
for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
if (it->second.keys.size() >= 2){
return true;
}
}
}
return false;
} }
std::string OutRTMP::getStatsName(){ std::string OutRTMP::getStatsName(){