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

Add buffer/select mismatch check in Output class, tweak seek abort debug message levels to be WARN instead of INFO.

Browse source
This commit is contained in:
Thulinma 2016-06-09 12:46:33 +02:00
parent 722738ffb0
commit 903786df60
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/output/output.cpp
View file

@ -473,20 +473,20 @@ namespace Mist {
bool Output::seek(unsigned int tid, unsigned long long pos, bool getNextKey){ bool Output::seek(unsigned int tid, unsigned long long pos, bool getNextKey){
if (myMeta.tracks[tid].lastms < pos){ if (myMeta.tracks[tid].lastms < pos){
INFO_MSG("Aborting seek to %llums in track %u: past end of track (= %llums).", pos, tid, myMeta.tracks[tid].lastms); WARN_MSG("Aborting seek to %llums in track %u: past end of track (= %llums).", pos, tid, myMeta.tracks[tid].lastms);
selectedTracks.erase(tid); selectedTracks.erase(tid);
return false; return false;
} }
unsigned int keyNum = getKeyForTime(tid, pos); unsigned int keyNum = getKeyForTime(tid, pos);
if (myMeta.tracks[tid].getKey(keyNum).getTime() > pos){ if (myMeta.tracks[tid].getKey(keyNum).getTime() > pos){
if (myMeta.live){ if (myMeta.live){
INFO_MSG("Actually seeking to %d, for %d is not available any more", myMeta.tracks[tid].getKey(keyNum).getTime(), pos); WARN_MSG("Actually seeking to %d, for %d is not available any more", myMeta.tracks[tid].getKey(keyNum).getTime(), pos);
pos = myMeta.tracks[tid].getKey(keyNum).getTime(); pos = myMeta.tracks[tid].getKey(keyNum).getTime();
} }
} }
loadPageForKey(tid, keyNum + (getNextKey?1:0)); loadPageForKey(tid, keyNum + (getNextKey?1:0));
if (!nProxy.curPage.count(tid) || !nProxy.curPage[tid].mapped){ if (!nProxy.curPage.count(tid) || !nProxy.curPage[tid].mapped){
INFO_MSG("Aborting seek to %llums in track %u: not available.", pos, tid); WARN_MSG("Aborting seek to %llums in track %u: not available.", pos, tid);
selectedTracks.erase(tid); selectedTracks.erase(tid);
return false; return false;
} }
@ -709,6 +709,39 @@ namespace Mist {
INFO_MSG("Buffer completely played out"); INFO_MSG("Buffer completely played out");
return true; return true;
} }
//check if we have a next seek point for every track that is selected
if (buffer.size() != selectedTracks.size()){
std::set<uint32_t> dropTracks;
if (buffer.size() < selectedTracks.size()){
//prepare to drop any selectedTrack without buffe entry
for (std::set<unsigned long>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); ++it){
bool found = false;
for (std::set<sortedPageInfo>::iterator bi = buffer.begin(); bi != buffer.end(); ++bi){
if (bi->tid == *it){
found = true;
break;
}
}
if (!found){
dropTracks.insert(*it);
}
}
}else{
//prepare to drop any buffer entry without selectedTrack
for (std::set<sortedPageInfo>::iterator bi = buffer.begin(); bi != buffer.end(); ++bi){
if (!selectedTracks.count(bi->tid)){
dropTracks.insert(bi->tid);
}
}
}
//actually drop what we found.
//if both of the above cases occur, the next prepareNext iteration will take care of that
for (std::set<uint32_t>::iterator it = dropTracks.begin(); it != dropTracks.end(); ++it){
dropTrack(*it, "seek/select mismatch", true);
}
return false;
}
sortedPageInfo nxt = *(buffer.begin()); sortedPageInfo nxt = *(buffer.begin());
if (!myMeta.tracks.count(nxt.tid)){ if (!myMeta.tracks.count(nxt.tid)){