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

Small fixes for VoD and DTSC pull input

Browse source
This commit is contained in:
Thulinma 2016-07-23 22:55:24 +02:00
parent 6828a32db0
commit 4cef8d7cf5
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/shared_memory.cpp
View file

@ -1162,8 +1162,6 @@ namespace IPC {
} }
if ((myPage.mapped[offsetOnPage] & 0x7F) < 126) { if ((myPage.mapped[offsetOnPage] & 0x7F) < 126) {
myPage.mapped[offsetOnPage] = (countAsViewer ? 0x81 : 0x01); myPage.mapped[offsetOnPage] = (countAsViewer ? 0x81 : 0x01);
} else {
DEBUG_MSG(DLVL_WARN, "Trying to keep-alive an element that needs to timeout, ignoring");
} }
} }

2
src/io.cpp
View file

@ -256,7 +256,7 @@ namespace Mist {
static bool multiWrong = false; 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 (myMeta.live && 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); DEBUG_MSG(multiWrong?DLVL_HIGH:DLVL_WARN, "Wrong order on track %lu ignored: %lu < %lu", tid, pack.getTime(), myMeta.tracks[tid].lastms);
multiWrong = true; multiWrong = true;
return; return;