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

Fixed TS live input

Browse source
This commit is contained in:
Thulinma 2017-05-12 17:04:03 +02:00
parent 401c323564
commit 492dcd03f5
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/ts_stream.cpp
View file

@ -229,20 +229,21 @@ namespace TS{
bool parsePes = false; bool parsePes = false;
int packNum = 1; int packNum = 1;
// Usually we append a packet at a time, so the start code is expected to show up at the end.
std::deque<Packet> &inStream = pesStreams[tid]; std::deque<Packet> &inStream = pesStreams[tid];
if (!inStream.rbegin()->getUnitStart()){ if (inStream.rbegin()->getUnitStart()){
if (threaded){globalSem.post();} parsePes = true;
return; }else{
} //But, sometimes (e.g. live) we do multiples, and need to check all of it...
std::deque<Packet>::iterator lastPack = inStream.end(); std::deque<Packet>::iterator lastPack = inStream.end();
std::deque<Packet>::iterator curPack = inStream.begin(); std::deque<Packet>::iterator curPack = inStream.begin();
curPack++;
while (curPack != lastPack && !curPack->getUnitStart()){
curPack++; curPack++;
packNum++; while (curPack != lastPack && !curPack->getUnitStart()){
curPack++;
packNum++;
}
if (curPack != lastPack){parsePes = true;}
} }
if (curPack != lastPack){parsePes = true;}
if (threaded){globalSem.post();} if (threaded){globalSem.post();}
if (parsePes){parsePES(tid);} if (parsePes){parsePES(tid);}
@ -697,7 +698,7 @@ namespace TS{
if (threaded){globalSem.post();} if (threaded){globalSem.post();}
if (!packetReady){ if (!packetReady){
ERROR_MSG("Obtaining a packet on track %lu failed", tid); ERROR_MSG("Track %lu: PES without valid packets?", tid);
return; return;
} }