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

Fix stopping behaviour for outgoing pushes when streams end.

Browse source
This commit is contained in:
Thulinma 2016-05-26 12:48:52 +02:00
parent 4dffb10eb9
commit 9e245c2b51
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/output/output.cpp
View file

@ -547,7 +547,9 @@ namespace Mist {
} }
MEDIUM_MSG("Seeking to %llums", pos); MEDIUM_MSG("Seeking to %llums", pos);
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){ for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
seek(*it, pos); if (myMeta.tracks.count(*it)){
seek(*it, pos);
}
} }
} }
@ -954,7 +956,7 @@ namespace Mist {
return 0; return 0;
} }
for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){ for (std::set<long unsigned int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++){
if (myMeta.tracks[*it].type == "video"){ if (myMeta.tracks.count(*it) && myMeta.tracks[*it].type == "video"){
return *it; return *it;
} }
} }
@ -962,11 +964,16 @@ namespace Mist {
} }
void Output::prepareNext(){ void Output::prepareNext(){
if (!myConn){return;}//stop if connection was closed
static bool atLivePoint = false; static bool atLivePoint = false;
static int nonVideoCount = 0; static int nonVideoCount = 0;
if (!sought){ if (!sought){
if (myMeta.live){ if (myMeta.live){
long unsigned int mainTrack = getMainSelectedTrack(); long unsigned int mainTrack = getMainSelectedTrack();
if (!myMeta.tracks.count(mainTrack)){
myConn.close();
return;
}
if (myMeta.tracks[mainTrack].keys.size() < 2){ if (myMeta.tracks[mainTrack].keys.size() < 2){
if (!myMeta.tracks[mainTrack].keys.size()){ if (!myMeta.tracks[mainTrack].keys.size()){
myConn.close(); myConn.close();
@ -1002,6 +1009,12 @@ namespace Mist {
sortedPageInfo nxt = *(buffer.begin()); sortedPageInfo nxt = *(buffer.begin());
buffer.erase(buffer.begin()); buffer.erase(buffer.begin());
if (!myMeta.tracks.count(nxt.tid)){
MEDIUM_MSG("Track %s@%u disappeared from stream - dropping.");
prepareNext();
return;
}
DEBUG_MSG(DLVL_DONTEVEN, "Loading track %u (next=%lu), %llu ms", nxt.tid, nxtKeyNum[nxt.tid], nxt.time); DEBUG_MSG(DLVL_DONTEVEN, "Loading track %u (next=%lu), %llu ms", nxt.tid, nxtKeyNum[nxt.tid], nxt.time);
if (nxt.offset >= nProxy.curPage[nxt.tid].len){ if (nxt.offset >= nProxy.curPage[nxt.tid].len){