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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2016-07-23 18:27:27 +02:00
commit 10c45dad2a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/io.cpp
View file

@ -296,10 +296,12 @@ namespace Mist {
} }
void negotiationProxy::bufferNext(DTSC::Packet & pack, DTSC::Meta & myMeta) { void negotiationProxy::bufferNext(DTSC::Packet & pack, DTSC::Meta & myMeta) {
static bool multiWrong = false;
//Save the trackid of the track for easier access //Save the trackid of the track for easier access
unsigned long tid = pack.getTrackId(); unsigned long tid = pack.getTrackId();
if (pack.getTime() < myMeta.tracks[tid].lastms){ if (pack.getTime() < myMeta.tracks[tid].lastms){
INFO_MSG("Wrong order packet ignored: %lu < %lu", pack.getTime(), myMeta.tracks[tid].lastms); DEBUG_MSG(multiWrong?DLVL_HIGH:DLVL_WARN, "Wrong order on track %lu ignored: %lu < %lu", tid, pack.getTime(), myMeta.tracks[tid].lastms);
multiWrong = true;
return; return;
} }
unsigned long mapTid = trackMap[tid]; unsigned long mapTid = trackMap[tid];
@ -308,6 +310,7 @@ namespace Mist {
INFO_MSG("Trying to buffer a packet on track %lu~>%lu, but no page is initialized", tid, mapTid); INFO_MSG("Trying to buffer a packet on track %lu~>%lu, but no page is initialized", tid, mapTid);
return; return;
} }
multiWrong = false;
IPC::sharedPage & myPage = curPage[tid]; IPC::sharedPage & myPage = curPage[tid];
DTSCPageData & pageData = pagesByTrack[tid][curPageNum[tid]]; DTSCPageData & pageData = pagesByTrack[tid][curPageNum[tid]];
//Save the current write position //Save the current write position