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 2017-06-09 21:40:18 +02:00
commit ca65576510
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/io.cpp
View file

@ -305,9 +305,6 @@ namespace Mist {
//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();
//these checks were already done in bufferSinglePacket, but we check again just to be sure //these checks were already done in bufferSinglePacket, but we check again just to be sure
if (myMeta.live && pack.getTime() > 0xFFFF0000 && !myMeta.tracks[tid].lastms){
return;//ignore bullshit timestamps
}
if (myMeta.live && 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;
@ -516,10 +513,6 @@ namespace Mist {
//For live streams, ignore packets that make no sense //For live streams, ignore packets that make no sense
//This also happens in bufferNext, with the same rules //This also happens in bufferNext, with the same rules
if (myMeta.live){ if (myMeta.live){
if (packet.getTime() > 0xFFFF0000 && !myMeta.tracks[tid].lastms){
INFO_MSG("Ignoring packet with unexpected timestamp");
return;//ignore bullshit timestamps
}
if (packet.getTime() < myMeta.tracks[tid].lastms){ if (packet.getTime() < myMeta.tracks[tid].lastms){
HIGH_MSG("Wrong order on track %lu ignored: %lu < %lu", tid, packet.getTime(), myMeta.tracks[tid].lastms); HIGH_MSG("Wrong order on track %lu ignored: %lu < %lu", tid, packet.getTime(), myMeta.tracks[tid].lastms);
return; return;